Merge branch 'stable-3.0'
* stable-3.0:
Don't import Id/Key/NameKey directly
KafkaEventSubscriber: Remove unused imports
Format java files with google-java-format
Change-Id: I49c339775a9a31be7c25e14cd04a559d00d367c0
diff --git a/src/main/java/com/googlesource/gerrit/plugins/multisite/consumer/MultiSiteConsumerRunner.java b/src/main/java/com/googlesource/gerrit/plugins/multisite/consumer/MultiSiteConsumerRunner.java
index ddaa3d4..1778961 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/multisite/consumer/MultiSiteConsumerRunner.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/multisite/consumer/MultiSiteConsumerRunner.java
@@ -19,7 +19,6 @@
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.inject.Inject;
import com.google.inject.Singleton;
-
import java.util.concurrent.ExecutorService;
@Singleton
diff --git a/src/main/java/com/googlesource/gerrit/plugins/multisite/kafka/consumer/KafkaEventSubscriber.java b/src/main/java/com/googlesource/gerrit/plugins/multisite/kafka/consumer/KafkaEventSubscriber.java
index 79a37eb..c72fa0d 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/multisite/kafka/consumer/KafkaEventSubscriber.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/multisite/kafka/consumer/KafkaEventSubscriber.java
@@ -16,19 +16,10 @@
import static java.nio.charset.StandardCharsets.UTF_8;
import com.google.common.flogger.FluentLogger;
-import com.google.gerrit.exceptions.StorageException;
-import com.google.gerrit.extensions.registration.DynamicSet;
-import com.google.gerrit.server.events.EventGson;
-import com.google.gerrit.server.permissions.PermissionBackendException;
import com.google.gerrit.server.util.ManualRequestContext;
import com.google.gerrit.server.util.OneOffRequestContext;
-import com.google.gson.Gson;
import com.google.inject.Inject;
import com.googlesource.gerrit.plugins.multisite.InstanceId;
-import com.googlesource.gerrit.plugins.multisite.MessageLogger;
-import com.googlesource.gerrit.plugins.multisite.MessageLogger.Direction;
-import com.googlesource.gerrit.plugins.multisite.forwarder.events.EventTopic;
-import com.googlesource.gerrit.plugins.multisite.forwarder.router.ForwardedEventRouter;
import com.googlesource.gerrit.plugins.multisite.consumer.SourceAwareEventWrapper;
import com.googlesource.gerrit.plugins.multisite.consumer.SubscriberMetrics;
import com.googlesource.gerrit.plugins.multisite.forwarder.events.EventTopic;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/multisite/validation/dfsrefdb/NoopSharedRefDatabase.java b/src/main/java/com/googlesource/gerrit/plugins/multisite/validation/dfsrefdb/NoopSharedRefDatabase.java
index 886eecf..c6efadf 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/multisite/validation/dfsrefdb/NoopSharedRefDatabase.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/multisite/validation/dfsrefdb/NoopSharedRefDatabase.java
@@ -17,33 +17,34 @@
import com.gerritforge.gerrit.globalrefdb.GlobalRefDatabase;
import com.gerritforge.gerrit.globalrefdb.GlobalRefDbLockException;
import com.gerritforge.gerrit.globalrefdb.GlobalRefDbSystemError;
-import com.google.gerrit.reviewdb.client.Project.NameKey;
+import com.google.gerrit.reviewdb.client.Project;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Ref;
public class NoopSharedRefDatabase implements GlobalRefDatabase {
@Override
- public boolean isUpToDate(NameKey project, Ref ref) throws GlobalRefDbLockException {
+ public boolean isUpToDate(Project.NameKey project, Ref ref) throws GlobalRefDbLockException {
return false;
}
@Override
- public boolean compareAndPut(NameKey project, Ref currRef, ObjectId newRefValue)
+ public boolean compareAndPut(Project.NameKey project, Ref currRef, ObjectId newRefValue)
throws GlobalRefDbSystemError {
return false;
}
@Override
- public AutoCloseable lockRef(NameKey project, String refName) throws GlobalRefDbLockException {
+ public AutoCloseable lockRef(Project.NameKey project, String refName)
+ throws GlobalRefDbLockException {
return () -> {};
}
@Override
- public boolean exists(NameKey project, String refName) {
+ public boolean exists(Project.NameKey project, String refName) {
return false;
}
@Override
- public void remove(NameKey project) throws GlobalRefDbSystemError {}
+ public void remove(Project.NameKey project) throws GlobalRefDbSystemError {}
}
diff --git a/src/test/java/com/googlesource/gerrit/plugins/multisite/validation/dfsrefdb/MultisiteReplicationPushFilterTest.java b/src/test/java/com/googlesource/gerrit/plugins/multisite/validation/dfsrefdb/MultisiteReplicationPushFilterTest.java
index 3315ee1..de265d851 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/multisite/validation/dfsrefdb/MultisiteReplicationPushFilterTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/multisite/validation/dfsrefdb/MultisiteReplicationPushFilterTest.java
@@ -24,7 +24,6 @@
import com.gerritforge.gerrit.globalrefdb.GlobalRefDbSystemError;
import com.google.gerrit.extensions.registration.DynamicItem;
import com.google.gerrit.reviewdb.client.Project;
-import com.google.gerrit.reviewdb.client.Project.NameKey;
import com.googlesource.gerrit.plugins.multisite.SharedRefDatabaseWrapper;
import com.googlesource.gerrit.plugins.multisite.validation.DisabledSharedRefLogger;
import com.googlesource.gerrit.plugins.multisite.validation.MultisiteReplicationPushFilter;
@@ -48,7 +47,7 @@
@Mock SharedRefDatabaseWrapper sharedRefDatabaseMock;
String project = "fooProject";
- NameKey projectName = Project.nameKey(project);
+ Project.NameKey projectName = Project.nameKey(project);
@Test
public void shouldReturnAllRefUpdatesWhenAllUpToDate() throws Exception {
@@ -113,19 +112,19 @@
}
@Override
- public boolean compareAndPut(NameKey project, Ref currRef, ObjectId newRefValue)
+ public boolean compareAndPut(Project.NameKey project, Ref currRef, ObjectId newRefValue)
throws GlobalRefDbSystemError {
return false;
}
@Override
- public AutoCloseable lockRef(NameKey project, String refName)
+ public AutoCloseable lockRef(Project.NameKey project, String refName)
throws GlobalRefDbLockException {
return null;
}
@Override
- public void remove(NameKey project) throws GlobalRefDbSystemError {}
+ public void remove(Project.NameKey project) throws GlobalRefDbSystemError {}
};
return new SharedRefDatabaseWrapper(
DynamicItem.itemOf(GlobalRefDatabase.class, sharedRefDatabase),
diff --git a/src/test/java/com/googlesource/gerrit/plugins/multisite/validation/dfsrefdb/zookeeper/ZkSharedRefDatabaseTest.java b/src/test/java/com/googlesource/gerrit/plugins/multisite/validation/dfsrefdb/zookeeper/ZkSharedRefDatabaseTest.java
index 18087e6..e61353b 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/multisite/validation/dfsrefdb/zookeeper/ZkSharedRefDatabaseTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/multisite/validation/dfsrefdb/zookeeper/ZkSharedRefDatabaseTest.java
@@ -21,7 +21,7 @@
import com.google.gerrit.extensions.api.changes.NotifyHandling;
import com.google.gerrit.extensions.events.ProjectDeletedListener;
import com.google.gerrit.extensions.registration.DynamicItem;
-import com.google.gerrit.reviewdb.client.Project.NameKey;
+import com.google.gerrit.reviewdb.client.Project;
import com.googlesource.gerrit.plugins.multisite.SharedRefDatabaseWrapper;
import com.googlesource.gerrit.plugins.multisite.validation.DisabledSharedRefLogger;
import com.googlesource.gerrit.plugins.multisite.validation.ProjectDeletedSharedDbCleanup;
@@ -78,7 +78,7 @@
public void shouldCompareAndPutSuccessfully() throws Exception {
Ref oldRef = refOf(AN_OBJECT_ID_1);
Ref newRef = refOf(AN_OBJECT_ID_2);
- NameKey projectNameKey = A_TEST_PROJECT_NAME_KEY;
+ Project.NameKey projectNameKey = A_TEST_PROJECT_NAME_KEY;
zookeeperContainer.createRefInZk(projectNameKey, oldRef);
@@ -90,7 +90,7 @@
public void shouldFetchLatestObjectIdInZk() throws Exception {
Ref oldRef = refOf(AN_OBJECT_ID_1);
Ref newRef = refOf(AN_OBJECT_ID_2);
- NameKey projectNameKey = A_TEST_PROJECT_NAME_KEY;
+ Project.NameKey projectNameKey = A_TEST_PROJECT_NAME_KEY;
zookeeperContainer.createRefInZk(projectNameKey, oldRef);
@@ -105,7 +105,7 @@
public void shouldCompareAndPutWithNullOldRefSuccessfully() throws Exception {
Ref oldRef = refOf(null);
Ref newRef = refOf(AN_OBJECT_ID_2);
- NameKey projectNameKey = A_TEST_PROJECT_NAME_KEY;
+ Project.NameKey projectNameKey = A_TEST_PROJECT_NAME_KEY;
zookeeperContainer.createRefInZk(projectNameKey, oldRef);
@@ -115,7 +115,7 @@
@Test
public void compareAndPutShouldFailIfTheObjectionHasNotTheExpectedValue() throws Exception {
- NameKey projectNameKey = A_TEST_PROJECT_NAME_KEY;
+ Project.NameKey projectNameKey = A_TEST_PROJECT_NAME_KEY;
Ref oldRef = refOf(AN_OBJECT_ID_1);
Ref expectedRef = refOf(AN_OBJECT_ID_2);
@@ -128,7 +128,7 @@
@Test
public void removeProjectShouldRemoveTheWholePathInZk() throws Exception {
- NameKey projectNameKey = A_TEST_PROJECT_NAME_KEY;
+ Project.NameKey projectNameKey = A_TEST_PROJECT_NAME_KEY;
Ref someRef = refOf(AN_OBJECT_ID_1);
zookeeperContainer.createRefInZk(projectNameKey, someRef);
@@ -146,7 +146,7 @@
@Test
public void aDeleteProjectEventShouldCleanupProjectFromZk() throws Exception {
String projectName = A_TEST_PROJECT_NAME;
- NameKey projectNameKey = A_TEST_PROJECT_NAME_KEY;
+ Project.NameKey projectNameKey = A_TEST_PROJECT_NAME_KEY;
Ref someRef = refOf(AN_OBJECT_ID_1);
ProjectDeletedSharedDbCleanup projectDeletedSharedDbCleanup =
new ProjectDeletedSharedDbCleanup(zkSharedRefDatabase, mockValidationMetrics);
