diff options
author | Edwin Kempin <ekempin@google.com> | 2021-09-28 15:15:56 +0200 |
---|---|---|
committer | Edwin Kempin <ekempin@google.com> | 2021-09-28 15:15:56 +0200 |
commit | 639ea4b3a3b3a67c80d29a6f83130499686543d3 (patch) | |
tree | 155d98f2d0a26a03749e760a7d46d1a832697d35 | |
parent | cd17fe7f90e5a36ab84b9b7ce0aab22e60e48a70 (diff) |
Fix BadImport bug pattern issuesv3.5.0-rc2v3.5.0-rc1v3.5.0-rc0
We want to enable the BadImport bug pattern in ErrorProne. For this we
need to fix the current issues.
Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: Ib3cf1cd3bdb95583570bb0efbac45489a7f32333
-rw-r--r-- | src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java | 3 | ||||
-rw-r--r-- | src/main/java/com/googlesource/gerrit/plugins/replication/DestinationsCollection.java | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java b/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java index 8ef21d0..400d6ff 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java +++ b/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java @@ -23,7 +23,6 @@ import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.ImmutableSet.Builder; import com.google.common.collect.Lists; import com.google.common.io.Files; import com.google.gerrit.entities.AccountGroup; @@ -219,7 +218,7 @@ public class Destination { private void addRecursiveParents( AccountGroup.UUID g, - Builder<AccountGroup.UUID> builder, + ImmutableSet.Builder<AccountGroup.UUID> builder, GroupIncludeCache groupIncludeCache) { for (AccountGroup.UUID p : groupIncludeCache.parentGroupsOf(g)) { if (builder.build().contains(p)) { diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/DestinationsCollection.java b/src/main/java/com/googlesource/gerrit/plugins/replication/DestinationsCollection.java index 747c0f6..4957a64 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/replication/DestinationsCollection.java +++ b/src/main/java/com/googlesource/gerrit/plugins/replication/DestinationsCollection.java @@ -35,7 +35,6 @@ import com.google.gerrit.server.git.WorkQueue; import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; -import com.googlesource.gerrit.plugins.replication.Destination.Factory; import com.googlesource.gerrit.plugins.replication.ReplicationConfig.FilterType; import java.net.URISyntaxException; import java.util.ArrayList; @@ -50,7 +49,7 @@ import org.eclipse.jgit.transport.URIish; public class DestinationsCollection implements ReplicationDestinations { private static final FluentLogger logger = FluentLogger.forEnclosingClass(); - private final Factory destinationFactory; + private final Destination.Factory destinationFactory; private final Provider<ReplicationQueue> replicationQueue; private volatile List<Destination> destinations; private boolean shuttingDown; |