Rename DispatchEvent to ForwardedEventHandler
The class listening to events is called EventHandler and it uses the
Forwarder to send event to the other node. ForwardedEventHandler for the
name of the class that must handle the forwarded event is more clear
than DispatchEvent which could be confused with core EventDispatcher.
Change-Id: I9841dee2d204b882b1e116900624a7329c79a968
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/DispatchEvent.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedEventHandler.java
similarity index 90%
rename from src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/DispatchEvent.java
rename to src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedEventHandler.java
index bdaf5fe..db1d558 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/DispatchEvent.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedEventHandler.java
@@ -28,13 +28,13 @@
* causing an infinite forwarding loop between the 2 nodes.
*/
@Singleton
-public class DispatchEvent {
- private static final Logger logger = LoggerFactory.getLogger(DispatchEvent.class);
+public class ForwardedEventHandler {
+ private static final Logger logger = LoggerFactory.getLogger(ForwardedEventHandler.class);
private final EventDispatcher dispatcher;
@Inject
- public DispatchEvent(EventDispatcher dispatcher) {
+ public ForwardedEventHandler(EventDispatcher dispatcher) {
this.dispatcher = dispatcher;
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/EventRestApiServlet.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/EventRestApiServlet.java
index 0a688c6..c6c1e5b 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/EventRestApiServlet.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/EventRestApiServlet.java
@@ -20,7 +20,7 @@
import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
import static javax.servlet.http.HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE;
-import com.ericsson.gerrit.plugins.highavailability.forwarder.DispatchEvent;
+import com.ericsson.gerrit.plugins.highavailability.forwarder.ForwardedEventHandler;
import com.google.common.base.Supplier;
import com.google.common.io.CharStreams;
import com.google.common.net.MediaType;
@@ -44,11 +44,11 @@
private static final long serialVersionUID = -1L;
private static final Logger logger = LoggerFactory.getLogger(EventRestApiServlet.class);
- private final DispatchEvent dispatchEvent;
+ private final ForwardedEventHandler forwardedEventHandler;
@Inject
- EventRestApiServlet(DispatchEvent dispatchEvent) {
- this.dispatchEvent = dispatchEvent;
+ EventRestApiServlet(ForwardedEventHandler forwardedEventHandler) {
+ this.forwardedEventHandler = forwardedEventHandler;
}
@Override
@@ -61,7 +61,7 @@
rsp, SC_UNSUPPORTED_MEDIA_TYPE, "Expecting " + JSON_UTF_8.toString() + " content type");
return;
}
- dispatchEvent.dispatch(getEventFromRequest(req));
+ forwardedEventHandler.dispatch(getEventFromRequest(req));
rsp.setStatus(SC_NO_CONTENT);
} catch (OrmException e) {
logger.debug("Error trying to find a change ", e);
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/DispatchEventTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedEventHandlerTest.java
similarity index 92%
rename from src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/DispatchEventTest.java
rename to src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedEventHandlerTest.java
index eae0353..0589bb1 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/DispatchEventTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedEventHandlerTest.java
@@ -33,21 +33,21 @@
import org.mockito.stubbing.Answer;
@RunWith(MockitoJUnitRunner.class)
-public class DispatchEventTest {
+public class ForwardedEventHandlerTest {
@Rule public ExpectedException exception = ExpectedException.none();
@Mock private EventDispatcher dispatcherMock;
- private DispatchEvent dispatchEvent;
+ private ForwardedEventHandler handler;
@Before
public void setUp() throws Exception {
- dispatchEvent = new DispatchEvent(dispatcherMock);
+ handler = new ForwardedEventHandler(dispatcherMock);
}
@Test
public void testSuccessfulDispatching() throws Exception {
Event event = new ProjectCreatedEvent();
- dispatchEvent.dispatch(event);
+ handler.dispatch(event);
verify(dispatcherMock).postEvent(event);
}
@@ -66,7 +66,7 @@
.postEvent(event);
assertThat(Context.isForwardedEvent()).isFalse();
- dispatchEvent.dispatch(event);
+ handler.dispatch(event);
assertThat(Context.isForwardedEvent()).isFalse();
verify(dispatcherMock).postEvent(event);
@@ -86,7 +86,7 @@
assertThat(Context.isForwardedEvent()).isFalse();
try {
- dispatchEvent.dispatch(event);
+ handler.dispatch(event);
fail("should have throw an OrmException");
} catch (OrmException e) {
assertThat(e.getMessage()).isEqualTo("someMessage");
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/EventRestApiServletTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/EventRestApiServletTest.java
index dc677b1..3774059 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/EventRestApiServletTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/EventRestApiServletTest.java
@@ -24,7 +24,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import com.ericsson.gerrit.plugins.highavailability.forwarder.DispatchEvent;
+import com.ericsson.gerrit.plugins.highavailability.forwarder.ForwardedEventHandler;
import com.google.common.net.MediaType;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.events.EventTypes;
@@ -48,7 +48,7 @@
public class EventRestApiServletTest {
private static final String ERR_MSG = "some Error";
- @Mock private DispatchEvent dispatchEventMock;
+ @Mock private ForwardedEventHandler forwardedEventHandlerMock;
@Mock private HttpServletRequest requestMock;
@Mock private HttpServletResponse responseMock;
private EventRestApiServlet eventRestApiServlet;
@@ -61,7 +61,7 @@
@Before
public void createEventsRestApiServlet() throws Exception {
- eventRestApiServlet = new EventRestApiServlet(dispatchEventMock);
+ eventRestApiServlet = new EventRestApiServlet(forwardedEventHandlerMock);
when(requestMock.getContentType()).thenReturn(MediaType.JSON_UTF_8.toString());
}
@@ -75,7 +75,7 @@
eventRestApiServlet.doPost(requestMock, responseMock);
- verify(dispatchEventMock).dispatch(any(RefReplicationDoneEvent.class));
+ verify(forwardedEventHandlerMock).dispatch(any(RefReplicationDoneEvent.class));
verify(responseMock).setStatus(SC_NO_CONTENT);
}
@@ -87,7 +87,7 @@
+ "\"ref-replication-done\",\"eventCreatedOn\":1451415011}";
when(requestMock.getReader()).thenReturn(new BufferedReader(new StringReader(event)));
doThrow(new OrmException(ERR_MSG))
- .when(dispatchEventMock)
+ .when(forwardedEventHandlerMock)
.dispatch(any(RefReplicationDoneEvent.class));
eventRestApiServlet.doPost(requestMock, responseMock);
verify(responseMock).sendError(SC_NOT_FOUND, "Change not found\n");
