| commit | 88efdc57266b579534dc97edac8a909f7e7b6e5e | [log] [tgz] |
|---|---|---|
| author | Dariusz Luksza <dariusz.luksza@gmail.com> | Sat May 04 23:16:24 2024 +0100 |
| committer | Dariusz Luksza <dariusz.luksza@gmail.com> | Sun May 05 19:30:38 2024 +0100 |
| tree | e2b7ba0e4a57ee462fe405a9646a69d1cd8df21b | |
| parent | eaeaf1d0ab94743b7d843849994a48de9bd7ccf2 [diff] |
Fix bindings in ReplicationConfigModule Fix conflicting bindings in `pull-replication` plugin by moving them from `ReplicationConfigModule` to the main `ReplicationModule`. This way both plugins will be loaded successfully. Change-Id: I56890f980022f2605bcfc3fe381251514f6c0e19
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationConfigModule.java b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationConfigModule.java index 6a97432..ec9cf50 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationConfigModule.java +++ b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationConfigModule.java
@@ -61,9 +61,7 @@ } bind(ReplicationQueue.class).in(Scopes.SINGLETON); - bind(ObservableQueue.class).to(ReplicationQueue.class); bind(ReplicationDestinations.class).to(DestinationsCollection.class); - bind(ConfigParser.class).to(DestinationConfigParser.class).in(Scopes.SINGLETON); install(new FactoryModuleBuilder().build(Destination.Factory.class)); install(new FactoryModuleBuilder().build(ProjectDeletionState.Factory.class));
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationModule.java b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationModule.java index 5f59bf8..5df832e 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationModule.java +++ b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationModule.java
@@ -52,6 +52,7 @@ @Override protected void configure() { install(configModule); + bind(ObservableQueue.class).to(ReplicationQueue.class); bind(LifecycleListener.class) .annotatedWith(UniqueAnnotations.create()) .to(ReplicationQueue.class);