Rename EventForwarder to Forwarder
Now that there is an "event" package to handle stream events, remove
"event" word from Forwarder to reduce chance of confusion.
Change-Id: I691f06840ae47f014fae98666d1eecfe6b0f8149
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/HttpModule.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/HttpModule.java
index b221f67..4a83e92 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/HttpModule.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/HttpModule.java
@@ -16,11 +16,11 @@
import com.google.gerrit.httpd.plugins.HttpPluginModule;
-import com.ericsson.gerrit.plugins.highavailability.forwarder.rest.EventForwarderServletModule;
+import com.ericsson.gerrit.plugins.highavailability.forwarder.rest.RestForwarderServletModule;
class HttpModule extends HttpPluginModule {
@Override
protected void configureServlets() {
- install(new EventForwarderServletModule());
+ install(new RestForwarderServletModule());
}
}
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 fe22da2..6eb961c 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/Module.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/Module.java
@@ -18,7 +18,7 @@
import com.google.inject.Scopes;
import com.ericsson.gerrit.plugins.highavailability.event.EventModule;
-import com.ericsson.gerrit.plugins.highavailability.forwarder.rest.RestEventForwarderModule;
+import com.ericsson.gerrit.plugins.highavailability.forwarder.rest.RestForwarderModule;
import com.ericsson.gerrit.plugins.highavailability.index.IndexModule;
class Module extends LifecycleModule {
@@ -26,7 +26,7 @@
@Override
protected void configure() {
bind(Configuration.class).in(Scopes.SINGLETON);
- install(new RestEventForwarderModule());
+ install(new RestForwarderModule());
install(new EventModule());
install(new IndexModule());
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/event/EventHandler.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/event/EventHandler.java
index fb7b2f4..c4716d3 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/event/EventHandler.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/event/EventHandler.java
@@ -21,20 +21,20 @@
import com.google.inject.Inject;
import com.ericsson.gerrit.plugins.highavailability.forwarder.Context;
-import com.ericsson.gerrit.plugins.highavailability.forwarder.EventForwarder;
+import com.ericsson.gerrit.plugins.highavailability.forwarder.Forwarder;
import java.util.concurrent.ScheduledThreadPoolExecutor;
class EventHandler implements EventListener {
private final ScheduledThreadPoolExecutor executor;
- private final EventForwarder eventForwarder;
+ private final Forwarder forwarder;
private final String pluginName;
@Inject
- EventHandler(EventForwarder eventForwarder,
+ EventHandler(Forwarder forwarder,
@EventExecutor ScheduledThreadPoolExecutor executor,
@PluginName String pluginName) {
- this.eventForwarder = eventForwarder;
+ this.forwarder = forwarder;
this.executor = executor;
this.pluginName = pluginName;
}
@@ -55,7 +55,7 @@
@Override
public void run() {
- eventForwarder.send(event);
+ forwarder.send(event);
}
@Override
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/EventForwarder.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/Forwarder.java
similarity index 90%
rename from src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/EventForwarder.java
rename to src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/Forwarder.java
index 75c76ef..c75d439 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/EventForwarder.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/Forwarder.java
@@ -17,9 +17,9 @@
import com.google.gerrit.server.events.Event;
/**
- * Forward event to the other master
+ * Forward indexing and stream events to the other master
*/
-public interface EventForwarder {
+public interface Forwarder {
/**
* Forward a change indexing event to the other master.
@@ -38,7 +38,7 @@
boolean deleteChangeFromIndex(int changeId);
/**
- * Forward an event to the other master.
+ * Forward a stream event to the other master.
*
* @param event the event to forward.
* @return true if successful, otherwise false.
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestEventForwarder.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarder.java
similarity index 92%
rename from src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestEventForwarder.java
rename to src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarder.java
index d81b9fe..8a81eb8 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestEventForwarder.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarder.java
@@ -22,7 +22,7 @@
import com.google.gson.GsonBuilder;
import com.google.inject.Inject;
-import com.ericsson.gerrit.plugins.highavailability.forwarder.EventForwarder;
+import com.ericsson.gerrit.plugins.highavailability.forwarder.Forwarder;
import com.ericsson.gerrit.plugins.highavailability.forwarder.rest.HttpResponseHandler.HttpResult;
import org.slf4j.Logger;
@@ -30,15 +30,15 @@
import java.io.IOException;
-class RestEventForwarder implements EventForwarder {
+class RestForwarder implements Forwarder {
private static final Logger log =
- LoggerFactory.getLogger(RestEventForwarder.class);
+ LoggerFactory.getLogger(RestForwarder.class);
private final HttpSession httpSession;
private final String pluginName;
@Inject
- RestEventForwarder(HttpSession httpClient,
+ RestForwarder(HttpSession httpClient,
@PluginName String pluginName) {
this.httpSession = httpClient;
this.pluginName = pluginName;
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestEventForwarderModule.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderModule.java
similarity index 85%
rename from src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestEventForwarderModule.java
rename to src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderModule.java
index e47ab8d..e9a57f9 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestEventForwarderModule.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderModule.java
@@ -19,18 +19,18 @@
import com.google.inject.Scopes;
import com.ericsson.gerrit.plugins.highavailability.Configuration;
-import com.ericsson.gerrit.plugins.highavailability.forwarder.EventForwarder;
+import com.ericsson.gerrit.plugins.highavailability.forwarder.Forwarder;
import org.apache.http.impl.client.CloseableHttpClient;
-public class RestEventForwarderModule extends LifecycleModule {
+public class RestForwarderModule extends LifecycleModule {
@Override
protected void configure() {
bind(CloseableHttpClient.class).toProvider(HttpClientProvider.class)
.in(Scopes.SINGLETON);
bind(HttpSession.class);
- bind(EventForwarder.class).to(RestEventForwarder.class);
+ bind(Forwarder.class).to(RestForwarder.class);
}
@Provides
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/EventForwarderServletModule.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderServletModule.java
similarity index 92%
rename from src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/EventForwarderServletModule.java
rename to src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderServletModule.java
index ffc9d0e..f9832e5 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/EventForwarderServletModule.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderServletModule.java
@@ -16,7 +16,7 @@
import com.google.gerrit.httpd.plugins.HttpPluginModule;
-public class EventForwarderServletModule extends HttpPluginModule {
+public class RestForwarderServletModule extends HttpPluginModule {
@Override
protected void configureServlets() {
serveRegex("/index/\\d+$").with(IndexRestApiServlet.class);
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventHandler.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventHandler.java
index 566e81a..36a5c82 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventHandler.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventHandler.java
@@ -20,7 +20,7 @@
import com.google.inject.Inject;
import com.ericsson.gerrit.plugins.highavailability.forwarder.Context;
-import com.ericsson.gerrit.plugins.highavailability.forwarder.EventForwarder;
+import com.ericsson.gerrit.plugins.highavailability.forwarder.Forwarder;
import java.util.Collections;
import java.util.Set;
@@ -29,7 +29,7 @@
class IndexEventHandler implements ChangeIndexedListener {
private final Executor executor;
- private final EventForwarder eventForwarder;
+ private final Forwarder forwarder;
private final String pluginName;
private final Set<IndexTask> queuedTasks = Collections
.newSetFromMap(new ConcurrentHashMap<IndexTask, Boolean>());
@@ -37,8 +37,8 @@
@Inject
IndexEventHandler(@IndexExecutor Executor executor,
@PluginName String pluginName,
- EventForwarder eventForwarder) {
- this.eventForwarder = eventForwarder;
+ Forwarder forwarder) {
+ this.forwarder = forwarder;
this.executor = executor;
this.pluginName = pluginName;
}
@@ -75,9 +75,9 @@
public void run() {
queuedTasks.remove(this);
if (deleted) {
- eventForwarder.deleteChangeFromIndex(changeId);
+ forwarder.deleteChangeFromIndex(changeId);
} else {
- eventForwarder.indexChange(changeId);
+ forwarder.indexChange(changeId);
}
}
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/event/EventHandlerTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/event/EventHandlerTest.java
index 91b20eb..baee7d6 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/event/EventHandlerTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/event/EventHandlerTest.java
@@ -22,9 +22,8 @@
import com.google.gerrit.server.events.Event;
import com.google.gerrit.server.events.RefEvent;
-import com.ericsson.gerrit.plugins.highavailability.event.EventHandler;
import com.ericsson.gerrit.plugins.highavailability.forwarder.Context;
-import com.ericsson.gerrit.plugins.highavailability.forwarder.EventForwarder;
+import com.ericsson.gerrit.plugins.highavailability.forwarder.Forwarder;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -40,13 +39,13 @@
private Event event;
private EventHandler eventHandler;
@Mock
- private EventForwarder eventForwarder;
+ private Forwarder forwarder;
@Test
public void testRightEventAndNotForwarded() throws Exception {
setUpMocks(true);
eventHandler.onEvent(event);
- verify(eventForwarder).send(event);
+ verify(forwarder).send(event);
}
@Test
@@ -55,14 +54,14 @@
Context.setForwardedEvent(true);
eventHandler.onEvent(event);
Context.unsetForwardedEvent();
- verifyZeroInteractions(eventForwarder);
+ verifyZeroInteractions(forwarder);
}
@Test
public void testBadEventAndNotForwarded() throws Exception {
setUpMocks(false);
eventHandler.onEvent(event);
- verifyZeroInteractions(eventForwarder);
+ verifyZeroInteractions(forwarder);
}
@Test
@@ -71,7 +70,7 @@
Context.setForwardedEvent(true);
eventHandler.onEvent(event);
Context.unsetForwardedEvent();
- verifyZeroInteractions(eventForwarder);
+ verifyZeroInteractions(forwarder);
}
private void setUpMocks(boolean rightEvent) {
@@ -81,7 +80,7 @@
} else {
event = mock(Event.class);
}
- eventHandler = new EventHandler(eventForwarder, pool, PLUGIN_NAME);
+ eventHandler = new EventHandler(forwarder, pool, PLUGIN_NAME);
}
private class PoolMock extends ScheduledThreadPoolExecutor {
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/ModuleTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderModuleTest.java
similarity index 91%
rename from src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/ModuleTest.java
rename to src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderModuleTest.java
index be6ddc7..ceedd2f 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/ModuleTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderModuleTest.java
@@ -22,14 +22,14 @@
import org.junit.Test;
-public class ModuleTest {
+public class RestForwarderModuleTest {
@Test
public void testForwardUrlProvider() {
Configuration configMock = mock(Configuration.class);
String expected = "someUrl";
when(configMock.getUrl()).thenReturn(expected);
- RestEventForwarderModule module = new RestEventForwarderModule();
+ RestForwarderModule module = new RestForwarderModule();
assertThat(module.forwardUrl(configMock)).isEqualTo(expected);
}
}
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestEventForwarderTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderTest.java
similarity index 82%
rename from src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestEventForwarderTest.java
rename to src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderTest.java
index 6228380..5b01c5a 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestEventForwarderTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderTest.java
@@ -29,7 +29,7 @@
import java.io.IOException;
-public class RestEventForwarderTest {
+public class RestForwarderTest {
private static final int CHANGE_NUMBER = 1;
private static final String DELETE_OP = "delete";
private static final String INDEX_OP = "index";
@@ -42,47 +42,48 @@
private static final boolean DO_NOT_THROW_EXCEPTION = false;
private static final boolean THROW_EXCEPTION = true;
- private RestEventForwarder eventForwarder;
+ private RestForwarder restForwarder;
@Test
public void testIndexChangeOK() throws Exception {
setUpMocksForIndex(INDEX_OP, SUCCESSFUL, EMPTY_MSG, DO_NOT_THROW_EXCEPTION);
- assertThat(eventForwarder.indexChange(CHANGE_NUMBER)).isTrue();
+ assertThat(restForwarder.indexChange(CHANGE_NUMBER)).isTrue();
}
@Test
public void testIndexChangeFailed() throws Exception {
setUpMocksForIndex(INDEX_OP, FAILED, ERROR_MSG, DO_NOT_THROW_EXCEPTION);
- assertThat(eventForwarder.indexChange(CHANGE_NUMBER)).isFalse();
+ assertThat(restForwarder.indexChange(CHANGE_NUMBER)).isFalse();
}
@Test
public void testIndexChangeThrowsException() throws Exception {
setUpMocksForIndex(INDEX_OP, FAILED, EXCEPTION_MSG, THROW_EXCEPTION);
- assertThat(eventForwarder.indexChange(CHANGE_NUMBER)).isFalse();
+ assertThat(restForwarder.indexChange(CHANGE_NUMBER)).isFalse();
}
@Test
public void testChangeDeletedFromIndexOK() throws Exception {
setUpMocksForIndex(DELETE_OP, SUCCESSFUL, EMPTY_MSG,
DO_NOT_THROW_EXCEPTION);
- assertThat(eventForwarder.deleteChangeFromIndex(CHANGE_NUMBER)).isTrue();
+ assertThat(restForwarder.deleteChangeFromIndex(CHANGE_NUMBER)).isTrue();
}
@Test
public void testChangeDeletedFromIndexFailed() throws Exception {
setUpMocksForIndex(DELETE_OP, FAILED, ERROR_MSG, DO_NOT_THROW_EXCEPTION);
- assertThat(eventForwarder.deleteChangeFromIndex(CHANGE_NUMBER)).isFalse();
+ assertThat(restForwarder.deleteChangeFromIndex(CHANGE_NUMBER)).isFalse();
}
@Test
public void testChangeDeletedFromThrowsException() throws Exception {
setUpMocksForIndex(DELETE_OP, FAILED, EXCEPTION_MSG, THROW_EXCEPTION);
- assertThat(eventForwarder.deleteChangeFromIndex(CHANGE_NUMBER)).isFalse();
+ assertThat(restForwarder.deleteChangeFromIndex(CHANGE_NUMBER)).isFalse();
}
- private void setUpMocksForIndex(String operation, boolean isOperationSuccessful,
- String msg, boolean exception) throws Exception {
+ private void setUpMocksForIndex(String operation,
+ boolean isOperationSuccessful, String msg, boolean exception)
+ throws Exception {
String request =
Joiner.on("/").join("/plugins", PLUGIN_NAME, INDEX_OP, CHANGE_NUMBER);
HttpSession httpSession = mock(HttpSession.class);
@@ -100,25 +101,25 @@
when(httpSession.delete(request)).thenReturn(result);
}
}
- eventForwarder = new RestEventForwarder(httpSession, PLUGIN_NAME);
+ restForwarder = new RestForwarder(httpSession, PLUGIN_NAME);
}
@Test
public void testEventSentOK() throws Exception {
Event event = setUpMocksForEvent(true, "", false);
- assertThat(eventForwarder.send(event)).isTrue();
+ assertThat(restForwarder.send(event)).isTrue();
}
@Test
public void testEventSentFailed() throws Exception {
Event event = setUpMocksForEvent(false, "Error", false);
- assertThat(eventForwarder.send(event)).isFalse();
+ assertThat(restForwarder.send(event)).isFalse();
}
@Test
public void testEventSentThrowsException() throws Exception {
Event event = setUpMocksForEvent(false, "Exception", true);
- assertThat(eventForwarder.send(event)).isFalse();
+ assertThat(restForwarder.send(event)).isFalse();
}
private Event setUpMocksForEvent(boolean isOperationSuccessful, String msg,
@@ -133,7 +134,7 @@
HttpResult result = new HttpResult(isOperationSuccessful, msg);
when(httpSession.post(request, content)).thenReturn(result);
}
- eventForwarder = new RestEventForwarder(httpSession, PLUGIN_NAME);
+ restForwarder = new RestForwarder(httpSession, PLUGIN_NAME);
return event;
}
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventHandlerTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventHandlerTest.java
index da3d669..aa4c365 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventHandlerTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventHandlerTest.java
@@ -27,7 +27,7 @@
import com.google.gwtorm.server.StandardKeyEncoder;
import com.ericsson.gerrit.plugins.highavailability.forwarder.Context;
-import com.ericsson.gerrit.plugins.highavailability.forwarder.EventForwarder;
+import com.ericsson.gerrit.plugins.highavailability.forwarder.Forwarder;
import com.ericsson.gerrit.plugins.highavailability.index.IndexEventHandler.IndexTask;
import org.junit.Before;
@@ -44,7 +44,7 @@
private IndexEventHandler indexEventHandler;
@Mock
- private EventForwarder eventForwarder;
+ private Forwarder forwarder;
private Change.Id id;
@BeforeClass
@@ -56,20 +56,20 @@
public void setUpMocks() {
id = Change.Id.parse(Integer.toString(CHANGE_ID));
indexEventHandler = new IndexEventHandler(MoreExecutors.directExecutor(),
- PLUGIN_NAME, eventForwarder);
+ PLUGIN_NAME, forwarder);
}
@Test
public void shouldIndexInRemoteOnChangeIndexedEvent() throws Exception {
indexEventHandler.onChangeIndexed(id.get());
- verify(eventForwarder).indexChange(CHANGE_ID);
+ verify(forwarder).indexChange(CHANGE_ID);
}
@Test
public void shouldDeleteFromIndexInRemoteOnChangeDeletedEvent()
throws Exception {
indexEventHandler.onChangeDeleted(id.get());
- verify(eventForwarder).deleteChangeFromIndex(CHANGE_ID);
+ verify(forwarder).deleteChangeFromIndex(CHANGE_ID);
}
@Test
@@ -78,14 +78,14 @@
indexEventHandler.onChangeIndexed(id.get());
indexEventHandler.onChangeDeleted(id.get());
Context.unsetForwardedEvent();
- verifyZeroInteractions(eventForwarder);
+ verifyZeroInteractions(forwarder);
}
@Test
public void duplicateEventOfAQueuedEventShouldGetDiscarded() {
Executor poolMock = mock(Executor.class);
indexEventHandler =
- new IndexEventHandler(poolMock, PLUGIN_NAME, eventForwarder);
+ new IndexEventHandler(poolMock, PLUGIN_NAME, forwarder);
indexEventHandler.onChangeIndexed(id.get());
indexEventHandler.onChangeIndexed(id.get());
verify(poolMock, times(1))