Move HttpClientProvider to the ReplicationModule The HttpClientProvider was bound in each per-destination child injector. However, there is nothing destination specific in the HttpClientProvider, so move it to the parent injector. Change-Id: Ic89fabbcb1787896aff08035093a7f208eac88e1
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 400d6ff..151e584 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java +++ b/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java
@@ -57,7 +57,6 @@ import com.google.inject.Injector; import com.google.inject.Provider; import com.google.inject.Provides; -import com.google.inject.Scopes; import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.FactoryModuleBuilder; import com.google.inject.servlet.RequestScoped; @@ -80,7 +79,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.function.Function; -import org.apache.http.impl.client.CloseableHttpClient; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Repository; @@ -192,9 +190,6 @@ .to(AdminApiFactory.DefaultAdminApiFactory.class); install(new FactoryModuleBuilder().build(GerritRestApi.Factory.class)); - bind(CloseableHttpClient.class) - .toProvider(HttpClientProvider.class) - .in(Scopes.SINGLETON); } @Provides
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 75fa5b3..39650cb 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationModule.java +++ b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationModule.java
@@ -44,6 +44,7 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; +import org.apache.http.impl.client.CloseableHttpClient; import org.eclipse.jgit.errors.ConfigInvalidException; import org.eclipse.jgit.storage.file.FileBasedConfig; import org.eclipse.jgit.transport.SshSessionFactory; @@ -122,6 +123,7 @@ bind(SshSessionFactory.class).toProvider(ReplicationSshSessionFactoryProvider.class); bind(TransportFactory.class).to(TransportFactoryImpl.class).in(Scopes.SINGLETON); + bind(CloseableHttpClient.class).toProvider(HttpClientProvider.class).in(Scopes.SINGLETON); } private FileBasedConfig getReplicationConfig() {