Merge branch 'stable-3.11' into stable-3.12
* stable-3.11:
Fix GJF 1.24.0 issues
Change-Id: Ibe1c94d1edfc8ded4f9a0613948d681458343bac
diff --git a/src/main/java/com/googlesource/gerrit/plugins/validation/dfsrefdb/zookeeper/ZkInit.java b/src/main/java/com/googlesource/gerrit/plugins/validation/dfsrefdb/zookeeper/ZkInit.java
index c62bbf5..af38218 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/validation/dfsrefdb/zookeeper/ZkInit.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/validation/dfsrefdb/zookeeper/ZkInit.java
@@ -28,6 +28,7 @@
import com.google.inject.Injector;
import com.google.inject.Singleton;
import com.googlesource.gerrit.plugins.validation.dfsrefdb.zookeeper.migration.ZkMigrations;
+import javax.annotation.Nullable;
import org.apache.curator.framework.CuratorFramework;
import org.eclipse.jgit.lib.Config;
@@ -36,13 +37,8 @@
private final ConsoleUI ui;
private final Config config;
-
- @Inject(optional = true)
- private NoteDbSchemaVersionManager versionManager;
-
- @Inject(optional = true)
- private ZkMigrations zkMigrations;
-
+ private final NoteDbSchemaVersionManager versionManager;
+ private final ZkMigrations zkMigrations;
private final String pluginName;
private final Injector initInjector;
private final SecureStore secureStore;
@@ -53,12 +49,16 @@
@PluginName String pluginName,
Injector initInjector,
SecureStore secureStore,
- GlobalPluginConfigProvider pluginConfigProvider) {
+ GlobalPluginConfigProvider pluginConfigProvider,
+ @Nullable NoteDbSchemaVersionManager versionManager,
+ @Nullable ZkMigrations zkMigrations) {
this.ui = ui;
this.pluginName = pluginName;
this.initInjector = initInjector;
this.secureStore = secureStore;
this.config = new ZkMergedConfig(pluginConfigProvider.get(pluginName));
+ this.versionManager = versionManager;
+ this.zkMigrations = zkMigrations;
}
@Override
