Merge branch 'stable-3.9' into stable-3.10
* stable-3.9:
Add missing binding of ProjectDeletedListener
Fix the Docker-based setup for the HA test environment
Verify high-availability formatting using GJF 1.7
Change-Id: I7c31eac3b8926d70db3e2ecd6f66ca4ba572b2b1
diff --git a/Jenkinsfile b/Jenkinsfile
index 503cf93..98183a5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,4 +1,3 @@
pluginPipeline(formatCheckId: 'gerritforge:plugins-high-availability-code-style',
buildCheckId: 'gerritforge:plugins-high-availability-build-test',
- gjfVersion: '1.7',
extraModules: ['global-refdb'])
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/Module.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/Module.java
index d9d5c50..170a79a 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/Module.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/Module.java
@@ -22,6 +22,9 @@
import com.ericsson.gerrit.plugins.highavailability.forwarder.rest.RestForwarderModule;
import com.ericsson.gerrit.plugins.highavailability.index.IndexModule;
import com.ericsson.gerrit.plugins.highavailability.peers.PeerInfoModule;
+import com.gerritforge.gerrit.globalrefdb.validation.ProjectDeletedSharedDbCleanup;
+import com.google.gerrit.extensions.events.ProjectDeletedListener;
+import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.lifecycle.LifecycleModule;
import com.google.inject.Inject;
import com.google.inject.Provides;
@@ -70,6 +73,8 @@
if (config.sharedRefDb().getSharedRefDb().isEnabled()) {
listener().to(PluginStartup.class);
+ DynamicSet.bind(binder(), ProjectDeletedListener.class)
+ .to(ProjectDeletedSharedDbCleanup.class);
}
}
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/jgroups/CommandDeserializerTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/jgroups/CommandDeserializerTest.java
index 033e6de..2f5c5b7 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/jgroups/CommandDeserializerTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/jgroups/CommandDeserializerTest.java
@@ -101,7 +101,8 @@
public void postEvent() {
Command cmd =
gson.fromJson(
- "{event: {projectName : 'foo', headName : 'refs/heads/master', type : 'project-created', eventCreatedOn:1505898779}, type : 'post-event'}",
+ "{event: {projectName : 'foo', headName : 'refs/heads/master', type :"
+ + " 'project-created', eventCreatedOn:1505898779}, type : 'post-event'}",
Command.class);
assertThat(cmd).isInstanceOf(PostEvent.class);
Event e = ((PostEvent) cmd).getEvent();
