Skip to content

Commit

Permalink
Fix conflicting static import of ImmutableSet#of (#19513)
Browse files Browse the repository at this point in the history
There was name conflict between `ImmutableSet#of` and
`ParameterProvider#of`. Even though the compiler appears
to have coped with it, Intellij Idea was complaining
about it.
  • Loading branch information
thll committed Jun 3, 2024
1 parent 9595fbb commit 09efdf6
Showing 1 changed file with 2 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
import java.util.function.Supplier;
import java.util.stream.Collectors;

import static com.google.common.collect.ImmutableSet.of;
import static com.google.common.collect.ImmutableSet.toImmutableSet;
import static java.util.stream.Collectors.toSet;

Expand Down Expand Up @@ -154,7 +153,7 @@ private boolean hasQueriesWithoutStreams() {
public abstract Builder toBuilder();

public static Builder builder() {
return Builder.create().parameters(of()).queries(ImmutableSet.<Query>builder().build());
return Builder.create().parameters(ImmutableSet.of()).queries(ImmutableSet.<Query>builder().build());
}

public Set<String> usedStreamIds() {
Expand Down Expand Up @@ -222,7 +221,7 @@ public static Builder create() {
return new AutoValue_Search.Builder()
.requires(Collections.emptyMap())
.createdAt(DateTime.now(DateTimeZone.UTC))
.parameters(of());
.parameters(ImmutableSet.of());
}

public Search build() {
Expand Down

0 comments on commit 09efdf6

Please sign in to comment.