Rename ReplicationRemotesUpdater as ReplicationRemotesApi Updating the replication remotes implies to have access to the current configuration and amending it. Whilst the update interface was introduced, there was no way to get the current remotes. Rename the ReplicationRemotesUpdater as ReplicationRemotesApi as preparation for adding the method to access the current remotes configs. Change-Id: Ife70ed06c1cad94e056fd5503873a88196be5295
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 b711573..3d44f0a 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationModule.java +++ b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationModule.java
@@ -31,7 +31,7 @@ import com.google.inject.Scopes; import com.google.inject.assistedinject.FactoryModuleBuilder; import com.google.inject.internal.UniqueAnnotations; -import com.googlesource.gerrit.plugins.replication.api.ReplicationRemotesUpdater; +import com.googlesource.gerrit.plugins.replication.api.ReplicationRemotesApi; import com.googlesource.gerrit.plugins.replication.events.ProjectDeletionReplicationDoneEvent; import com.googlesource.gerrit.plugins.replication.events.ProjectDeletionReplicationFailedEvent; import com.googlesource.gerrit.plugins.replication.events.ProjectDeletionReplicationScheduledEvent; @@ -62,8 +62,8 @@ DynamicSet.bind(binder(), GitBatchRefUpdateListener.class).to(ReplicationQueue.class); DynamicSet.bind(binder(), ProjectDeletedListener.class).to(ReplicationQueue.class); DynamicSet.bind(binder(), HeadUpdatedListener.class).to(ReplicationQueue.class); - DynamicItem.bind(binder(), ReplicationRemotesUpdater.class) - .to(ReplicationRemotesUpdaterImpl.class); + DynamicItem.bind(binder(), ReplicationRemotesApi.class) + .to(ReplicationRemotesApiImpl.class); bind(OnStartStop.class).in(Scopes.SINGLETON); bind(LifecycleListener.class).annotatedWith(UniqueAnnotations.create()).to(OnStartStop.class);
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationRemotesUpdaterImpl.java b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationRemotesApiImpl.java similarity index 96% rename from src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationRemotesUpdaterImpl.java rename to src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationRemotesApiImpl.java index b55cbfb..dd4d5b0 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationRemotesUpdaterImpl.java +++ b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationRemotesApiImpl.java
@@ -22,20 +22,20 @@ import com.google.inject.Singleton; import com.googlesource.gerrit.plugins.replication.api.ConfigResource; import com.googlesource.gerrit.plugins.replication.api.ReplicationConfigOverrides; -import com.googlesource.gerrit.plugins.replication.api.ReplicationRemotesUpdater; +import com.googlesource.gerrit.plugins.replication.api.ReplicationRemotesApi; import java.io.IOException; import java.util.List; import org.eclipse.jgit.lib.Config; @Singleton -class ReplicationRemotesUpdaterImpl implements ReplicationRemotesUpdater { +class ReplicationRemotesApiImpl implements ReplicationRemotesApi { private final SecureStore secureStore; private final Provider<ConfigResource> baseConfigProvider; private final DynamicItem<ReplicationConfigOverrides> configOverridesItem; @Inject - ReplicationRemotesUpdaterImpl( + ReplicationRemotesApiImpl( SecureStore secureStore, Provider<ConfigResource> baseConfigProvider, @Nullable DynamicItem<ReplicationConfigOverrides> configOverridesItem) {
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/api/ApiModule.java b/src/main/java/com/googlesource/gerrit/plugins/replication/api/ApiModule.java index 45ce5ed..44ec88c 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/replication/api/ApiModule.java +++ b/src/main/java/com/googlesource/gerrit/plugins/replication/api/ApiModule.java
@@ -22,6 +22,6 @@ protected void configure() { DynamicItem.itemOf(binder(), ReplicationPushFilter.class); DynamicItem.itemOf(binder(), ReplicationConfigOverrides.class); - DynamicItem.itemOf(binder(), ReplicationRemotesUpdater.class); + DynamicItem.itemOf(binder(), ReplicationRemotesApi.class); } }
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/api/ReplicationRemotesUpdater.java b/src/main/java/com/googlesource/gerrit/plugins/replication/api/ReplicationRemotesApi.java similarity index 96% rename from src/main/java/com/googlesource/gerrit/plugins/replication/api/ReplicationRemotesUpdater.java rename to src/main/java/com/googlesource/gerrit/plugins/replication/api/ReplicationRemotesApi.java index 80949b5..fde2abc 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/replication/api/ReplicationRemotesUpdater.java +++ b/src/main/java/com/googlesource/gerrit/plugins/replication/api/ReplicationRemotesApi.java
@@ -25,7 +25,7 @@ /** Public API to update replication plugin remotes configurations programmatically. */ @UsedAt(PLUGIN_GITHUB) @DynamicItem.Final(implementedByPlugin = "replication") -public interface ReplicationRemotesUpdater { +public interface ReplicationRemotesApi { /** * Adds or updates the remote configuration for the replication plugin.
diff --git a/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationRemotesUpdaterTest.java b/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationRemotesApiTest.java similarity index 88% rename from src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationRemotesUpdaterTest.java rename to src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationRemotesApiTest.java index c3508b3..dc4f9be 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationRemotesUpdaterTest.java +++ b/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationRemotesApiTest.java
@@ -33,13 +33,13 @@ import java.nio.file.Path; import java.util.List; -import com.googlesource.gerrit.plugins.replication.api.ReplicationRemotesUpdater; +import com.googlesource.gerrit.plugins.replication.api.ReplicationRemotesApi; import org.eclipse.jgit.lib.Config; import org.junit.After; import org.junit.Before; import org.junit.Test; -public class ReplicationRemotesUpdaterTest { +public class ReplicationRemotesApiTest { private Path testSite; private SecureStore secureStoreMock; @@ -60,7 +60,7 @@ @Test public void shouldThrowWhenNoRemotesInTheUpdate() { Config update = new Config(); - ReplicationRemotesUpdater objectUnderTest = newReplicationConfigUpdater(); + ReplicationRemotesApi objectUnderTest = newReplicationConfigUpdater(); assertThrows(IllegalArgumentException.class, () -> objectUnderTest.update(update)); @@ -74,7 +74,7 @@ String url = "fake_url"; Config update = new Config(); setRemoteSite(update, "url", url); - ReplicationRemotesUpdater objectUnderTest = newReplicationConfigUpdater(); + ReplicationRemotesApi objectUnderTest = newReplicationConfigUpdater(); objectUnderTest.update(update); @@ -87,7 +87,7 @@ String url = "fake_url"; Config update = new Config(); setRemoteSite(update, "url", url); - ReplicationRemotesUpdater objectUnderTest = newReplicationConfigUpdater(testOverrides); + ReplicationRemotesApi objectUnderTest = newReplicationConfigUpdater(testOverrides); objectUnderTest.update(update); @@ -101,7 +101,7 @@ Config update = new Config(); String password = "my_secret_password"; setRemoteSite(update, "password", password); - ReplicationRemotesUpdater objectUnderTest = newReplicationConfigUpdater(testOverrides); + ReplicationRemotesApi objectUnderTest = newReplicationConfigUpdater(testOverrides); objectUnderTest.update(update); @@ -110,7 +110,7 @@ assertRemoteSite(testOverrides.getConfig(), "password").isNull(); } - private ReplicationRemotesUpdater newReplicationConfigUpdater() { + private ReplicationRemotesApi newReplicationConfigUpdater() { return newReplicationConfigUpdater(null); } @@ -122,12 +122,12 @@ return assertThat(config.getString("remote", "site", name)); } - private ReplicationRemotesUpdater newReplicationConfigUpdater( + private ReplicationRemotesApi newReplicationConfigUpdater( ReplicationConfigOverrides overrides) { DynamicItem<ReplicationConfigOverrides> dynamicItemMock = mock(DynamicItem.class); when(dynamicItemMock.get()).thenReturn(overrides); - return new ReplicationRemotesUpdaterImpl( + return new ReplicationRemotesApiImpl( secureStoreMock, Providers.of(baseConfig), dynamicItemMock); }