Merge d9cdead into b6622d8

CJSCommonPlatform · May 7, 2019 · cd144ae · cd144ae
2 parents b6622d8 + d9cdead
commit cd144ae
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,14 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 
 ## Unreleased
 
+## [2.1.4] - 2019-05-07
+### Changed
+- microservice-framework -> 6.0.0-M22
+- common-bom -> 2.0.2
+- framework-api -> 4.0.0-M18
+- test-utils -> 1.23.0
+- utilities ->1.18.0
+
 ## [2.1.2] - 2019-02-27
 ### Chnaged
 - Updated framework-api to version 3.4.0-M1

diff --git a/...a/uk/gov/justice/services/metrics/interceptor/IndividualActionMetricsInterceptorTest.java b/...a/uk/gov/justice/services/metrics/interceptor/IndividualActionMetricsInterceptorTest.java
@@ -3,7 +3,7 @@
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static uk.gov.justice.services.core.interceptor.DefaultInterceptorContext.interceptorContextWithInput;
+import static uk.gov.justice.services.core.interceptor.InterceptorContext.interceptorContextWithInput;
 import static uk.gov.justice.services.test.utils.core.messaging.JsonEnvelopeBuilder.envelope;
 import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithDefaults;
 import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID;

diff --git a/...s-interceptor/src/test/java/uk/gov/justice/services/metrics/interceptor/it/MetricsIT.java b/...s-interceptor/src/test/java/uk/gov/justice/services/metrics/interceptor/it/MetricsIT.java
@@ -6,7 +6,7 @@
 import static org.hamcrest.Matchers.nullValue;
 import static org.junit.Assert.assertThat;
 import static uk.gov.justice.services.core.annotation.Component.EVENT_LISTENER;
-import static uk.gov.justice.services.core.interceptor.DefaultInterceptorContext.interceptorContextWithInput;
+import static uk.gov.justice.services.core.interceptor.InterceptorContext.interceptorContextWithInput;
 import static uk.gov.justice.services.test.utils.core.messaging.JsonEnvelopeBuilder.envelope;
 import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID;
 
@@ -31,12 +31,12 @@
 import uk.gov.justice.services.core.enveloper.Enveloper;
 import uk.gov.justice.services.core.extension.BeanInstantiater;
 import uk.gov.justice.services.core.extension.ServiceComponentScanner;
-import uk.gov.justice.services.core.interceptor.Interceptor;
 import uk.gov.justice.services.core.interceptor.InterceptorCache;
+import uk.gov.justice.services.core.interceptor.InterceptorChainEntry;
+import uk.gov.justice.services.core.interceptor.InterceptorChainEntryProvider;
 import uk.gov.justice.services.core.interceptor.InterceptorChainObserver;
 import uk.gov.justice.services.core.interceptor.InterceptorChainProcessor;
 import uk.gov.justice.services.core.interceptor.InterceptorChainProcessorProducer;
-import uk.gov.justice.services.core.interceptor.InterceptorChainProvider;
 import uk.gov.justice.services.core.json.JsonSchemaLoader;
 import uk.gov.justice.services.core.requester.RequesterProducer;
 import uk.gov.justice.services.core.sender.SenderProducer;
@@ -58,8 +58,6 @@
 import javax.management.ObjectName;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
 import org.apache.openejb.jee.Application;
 import org.apache.openejb.jee.WebApp;
 import org.apache.openejb.junit.ApplicationComposer;
@@ -193,18 +191,18 @@ public void handleBcd(final JsonEnvelope envelope) {
 
     }
 
-    public static class EventListenerInterceptorChainProvider implements InterceptorChainProvider {
+    public static class EventListenerInterceptorChainProvider implements InterceptorChainEntryProvider {
 
         @Override
         public String component() {
             return EVENT_LISTENER;
         }
 
         @Override
-        public List<Pair<Integer, Class<? extends Interceptor>>> interceptorChainTypes() {
-            final List<Pair<Integer, Class<? extends Interceptor>>> interceptorChainTypes = new ArrayList<>();
-            interceptorChainTypes.add(new ImmutablePair<>(1, TotalActionMetricsInterceptor.class));
-            interceptorChainTypes.add(new ImmutablePair<>(2, IndividualActionMetricsInterceptor.class));
+        public List<InterceptorChainEntry> interceptorChainTypes() {
+            final List<InterceptorChainEntry> interceptorChainTypes = new ArrayList<>();
+            interceptorChainTypes.add(new InterceptorChainEntry(1, TotalActionMetricsInterceptor.class));
+            interceptorChainTypes.add(new InterceptorChainEntry(2, IndividualActionMetricsInterceptor.class));
             return interceptorChainTypes;
         }
     }

diff --git a/pom.xml b/pom.xml
@@ -23,11 +23,11 @@
     <properties>
         <cpp.repo.name>metrics</cpp.repo.name>
 
-        <microservice-framework.version>5.3.0-M2</microservice-framework.version>
-        <common-bom.version>1.29.0</common-bom.version>
-        <framework-api.version>3.4.0-M1</framework-api.version>
-        <test-utils.version>1.22.0</test-utils.version>
-        <utilities.version>1.16.4</utilities.version>
+        <microservice-framework.version>6.0.0-M22</microservice-framework.version>
+        <common-bom.version>2.0.2</common-bom.version>
+        <framework-api.version>4.0.0-M18</framework-api.version>
+        <test-utils.version>1.23.0</test-utils.version>
+        <utilities.version>1.18.0</utilities.version>
     </properties>
 
     <scm>