Merge pull request #62 from CJSCommonPlatform/update-currentOrderedEv…

…entsWith-parameters-in-EventBufferService Add component as a new parameter for method currentOrderedEventsWith in class EventBufferService
CJSCommonPlatform · Apr 29, 2019 · 7153901 · 7153901
2 parents 2279ea1 + cd7a2d2
commit 7153901
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 
 ## [Unreleased]
 
+## [4.0.0-M14] - 2019-04-29
+### Changed
+- Update parameters for method currentOrderedEventsWith in EventBufferService
+
 ## [4.0.0-M13] - 2019-04-24
 ### Deleted
 - Removed deprecated classes and methods

diff --git a/...ent-buffer/src/main/java/uk/gov/justice/services/event/buffer/api/EventBufferService.java b/...ent-buffer/src/main/java/uk/gov/justice/services/event/buffer/api/EventBufferService.java
@@ -6,5 +6,5 @@
 
 public interface EventBufferService {
 
-    Stream<JsonEnvelope> currentOrderedEventsWith(final JsonEnvelope incomingEvent);
+    Stream<JsonEnvelope> currentOrderedEventsWith(final JsonEnvelope incomingEvent, final String component);
 }
diff --git a/...gov/justice/services/components/event/listener/interceptors/EventBufferServiceCaller.java b/...gov/justice/services/components/event/listener/interceptors/EventBufferServiceCaller.java
@@ -21,7 +21,7 @@ public Stream<InterceptorContext> streamFromEventBufferFor(final InterceptorCont
 
         final JsonEnvelope inputEnvelope = interceptorContext.inputEnvelope();
 
-        return eventBufferService.currentOrderedEventsWith(inputEnvelope)
+        return eventBufferService.currentOrderedEventsWith(inputEnvelope, interceptorContext.getComponentName())
                 .map(interceptorContext::copyWithInput);
     }
 }
diff --git a/...justice/services/components/event/listener/interceptors/EventBufferServiceCallerTest.java b/...justice/services/components/event/listener/interceptors/EventBufferServiceCallerTest.java
@@ -2,29 +2,24 @@
 
 import static java.util.stream.Collectors.toList;
 import static org.hamcrest.CoreMatchers.hasItem;
-
-import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
-
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.junit.Test;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.*;
-
 import uk.gov.justice.services.core.interceptor.InterceptorContext;
 import uk.gov.justice.services.event.buffer.api.EventBufferService;
 import uk.gov.justice.services.messaging.JsonEnvelope;
 
 import java.util.List;
 import java.util.stream.Stream;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
 @RunWith(MockitoJUnitRunner.class)
 public class EventBufferServiceCallerTest {
 
@@ -46,7 +41,7 @@ public void shouldCallEventBufferAndConvertReturnedJsonEnvelopesIntoSeparateInte
         final InterceptorContext copiedInterceptorContext_2 = mock(InterceptorContext.class);
 
         when(inputInterceptorContext.inputEnvelope()).thenReturn(inputEnvelope);
-        when(eventBufferService.currentOrderedEventsWith(inputEnvelope)).thenReturn(Stream.of(orderedEvent_1, orderedEvent_2));
+        when(eventBufferService.currentOrderedEventsWith(inputEnvelope, inputInterceptorContext.getComponentName())).thenReturn(Stream.of(orderedEvent_1, orderedEvent_2));
         when(inputInterceptorContext.copyWithInput(orderedEvent_1)).thenReturn(copiedInterceptorContext_1);
         when(inputInterceptorContext.copyWithInput(orderedEvent_2)).thenReturn(copiedInterceptorContext_2);