Merge d21a20c into 014cecf

CJSCommonPlatform · Jan 16, 2023 · 1aa3b9a · 1aa3b9a
2 parents 014cecf + d21a20c
commit 1aa3b9a
Show file tree

Hide file tree

Showing 330 changed files with 713 additions and 498 deletions.
diff --git a/aggregate/pom.xml b/aggregate/pom.xml
@@ -38,7 +38,7 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
+            <artifactId>hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/...ate/src/test/java/uk/gov/justice/services/core/aggregate/DefaultAggregateServiceTest.java b/...ate/src/test/java/uk/gov/justice/services/core/aggregate/DefaultAggregateServiceTest.java
@@ -29,7 +29,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.slf4j.Logger;
 
 /**
@@ -170,8 +170,6 @@ public void shouldThrowExceptionForUnregisteredEvent() {
         when(eventStream.getId()).thenReturn(STREAM_ID);
 
         JsonObject eventPayloadA = mock(JsonObject.class);
-        EventA eventA = mock(EventA.class);
-        when(jsonObjectToObjectConverter.convert(eventPayloadA, EventA.class)).thenReturn(eventA);
         when(eventStream.read()).thenReturn(Stream.of(envelopeFrom(metadataBuilder()
                 .withStreamId(STREAM_ID)
                 .withId(randomUUID())
@@ -182,13 +180,6 @@ public void shouldThrowExceptionForUnregisteredEvent() {
 
     @Test(expected = RuntimeException.class)
     public void shouldThrowExceptionForNonInstantiatableEvent() {
-        JsonObject eventPayloadA = mock(JsonObject.class);
-        EventA eventA = mock(EventA.class);
-        when(jsonObjectToObjectConverter.convert(eventPayloadA, EventA.class)).thenReturn(eventA);
-        when(eventStream.read()).thenReturn(Stream.of(envelopeFrom(metadataBuilder()
-                .withStreamId(STREAM_ID)
-                .withId(randomUUID())
-                .withName("eventA"), eventPayloadA)));
 
         registerEvent(EventA.class, "eventA");
 

diff --git a/...rest/src/test/java/uk/gov/justice/services/common/rest/BadRequestExceptionMapperTest.java b/...rest/src/test/java/uk/gov/justice/services/common/rest/BadRequestExceptionMapperTest.java
@@ -21,7 +21,7 @@
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.slf4j.Logger;
 
 @RunWith(MockitoJUnitRunner.class)

diff --git a/...rc/test/java/uk/gov/justice/services/common/rest/ForbiddenRequestExceptionMapperTest.java b/...rc/test/java/uk/gov/justice/services/common/rest/ForbiddenRequestExceptionMapperTest.java
@@ -14,7 +14,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class ForbiddenRequestExceptionMapperTest {

diff --git a/common/pom.xml b/common/pom.xml
@@ -38,7 +38,7 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-all</artifactId>
+            <artifactId>hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/...n/src/test/java/uk/gov/justice/services/common/annotation/ComponentNameExtractorTest.java b/...n/src/test/java/uk/gov/justice/services/common/annotation/ComponentNameExtractorTest.java
@@ -19,7 +19,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class ComponentNameExtractorTest {

diff --git a/common/src/test/java/uk/gov/justice/services/common/http/DefaultServerPortProviderTest.java b/common/src/test/java/uk/gov/justice/services/common/http/DefaultServerPortProviderTest.java
@@ -10,7 +10,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 
 @RunWith(MockitoJUnitRunner.class)

diff --git a/core/pom.xml b/core/pom.xml
@@ -89,7 +89,7 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
+            <artifactId>hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/.../uk/gov/justice/services/core/accesscontrol/AccessControlFailureMessageGeneratorTest.java b/.../uk/gov/justice/services/core/accesscontrol/AccessControlFailureMessageGeneratorTest.java
@@ -14,7 +14,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class AccessControlFailureMessageGeneratorTest {

diff --git a/...src/test/java/uk/gov/justice/services/core/accesscontrol/AllowAllPolicyEvaluatorTest.java b/...src/test/java/uk/gov/justice/services/core/accesscontrol/AllowAllPolicyEvaluatorTest.java
@@ -9,7 +9,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class AllowAllPolicyEvaluatorTest {

diff --git a/...test/java/uk/gov/justice/services/core/accesscontrol/DefaultAccessControlServiceTest.java b/...test/java/uk/gov/justice/services/core/accesscontrol/DefaultAccessControlServiceTest.java
@@ -7,7 +7,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 import static uk.gov.justice.services.core.accesscontrol.DefaultAccessControlService.ACCESS_CONTROL_DISABLED_PROPERTY;
 
@@ -22,7 +22,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.slf4j.Logger;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -80,7 +80,7 @@ public void shouldIgnoreAccessControlIfTheAccessControlDisabledPropertyIsTrue()
 
         assertThat(accessControlViolation.isPresent(), is(false));
 
-        verifyZeroInteractions(policyEvaluator);
+        verifyNoInteractions(policyEvaluator);
 
         verify(logger).trace("Skipping access control due to configuration");
     }

diff --git a/...st/java/uk/gov/justice/services/core/accesscontrol/LocalAccessControlInterceptorTest.java b/...st/java/uk/gov/justice/services/core/accesscontrol/LocalAccessControlInterceptorTest.java
@@ -28,7 +28,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class LocalAccessControlInterceptorTest {

diff --git a/core/src/test/java/uk/gov/justice/services/core/audit/DefaultAuditServiceTest.java b/core/src/test/java/uk/gov/justice/services/core/audit/DefaultAuditServiceTest.java
@@ -13,7 +13,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.slf4j.Logger;
 
 @RunWith(MockitoJUnitRunner.class)

diff --git a/core/src/test/java/uk/gov/justice/services/core/audit/LocalAuditInterceptorTest.java b/core/src/test/java/uk/gov/justice/services/core/audit/LocalAuditInterceptorTest.java
@@ -23,7 +23,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class LocalAuditInterceptorTest {

diff --git a/core/src/test/java/uk/gov/justice/services/core/audit/SimpleAuditClientTest.java b/core/src/test/java/uk/gov/justice/services/core/audit/SimpleAuditClientTest.java
@@ -15,7 +15,7 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.slf4j.Logger;
 
 @RunWith(MockitoJUnitRunner.class)

diff --git a/core/src/test/java/uk/gov/justice/services/core/dispatcher/DispatcherCacheTest.java b/core/src/test/java/uk/gov/justice/services/core/dispatcher/DispatcherCacheTest.java
@@ -26,7 +26,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Spy;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class DispatcherCacheTest {

diff --git a/core/src/test/java/uk/gov/justice/services/core/dispatcher/DispatcherConfigurationTest.java b/core/src/test/java/uk/gov/justice/services/core/dispatcher/DispatcherConfigurationTest.java
@@ -7,7 +7,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class DispatcherConfigurationTest {

diff --git a/core/src/test/java/uk/gov/justice/services/core/dispatcher/DispatcherDelegateTest.java b/core/src/test/java/uk/gov/justice/services/core/dispatcher/DispatcherDelegateTest.java
@@ -19,7 +19,7 @@
 import org.mockito.InOrder;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class DispatcherDelegateTest {

diff --git a/core/src/test/java/uk/gov/justice/services/core/dispatcher/DispatcherFactoryTest.java b/core/src/test/java/uk/gov/justice/services/core/dispatcher/DispatcherFactoryTest.java
@@ -17,7 +17,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class DispatcherFactoryTest {

diff --git a/core/src/test/java/uk/gov/justice/services/core/dispatcher/DispatcherTest.java b/core/src/test/java/uk/gov/justice/services/core/dispatcher/DispatcherTest.java
@@ -33,7 +33,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.slf4j.Logger;
 
 @RunWith(MockitoJUnitRunner.class)

diff --git a/core/src/test/java/uk/gov/justice/services/core/dispatcher/EmptySystemUserProviderTest.java b/core/src/test/java/uk/gov/justice/services/core/dispatcher/EmptySystemUserProviderTest.java
@@ -11,7 +11,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.slf4j.Logger;
 
 @RunWith(MockitoJUnitRunner.class)

diff --git a/core/src/test/java/uk/gov/justice/services/core/dispatcher/JsonEnvelopeRepackerTest.java b/core/src/test/java/uk/gov/justice/services/core/dispatcher/JsonEnvelopeRepackerTest.java
@@ -14,7 +14,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class JsonEnvelopeRepackerTest {

diff --git a/core/src/test/java/uk/gov/justice/services/core/dispatcher/ServiceComponentObserverTest.java b/core/src/test/java/uk/gov/justice/services/core/dispatcher/ServiceComponentObserverTest.java
@@ -14,7 +14,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class ServiceComponentObserverTest {

diff --git a/core/src/test/java/uk/gov/justice/services/core/dispatcher/SystemUserUtilTest.java b/core/src/test/java/uk/gov/justice/services/core/dispatcher/SystemUserUtilTest.java
@@ -19,7 +19,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 
 @RunWith(MockitoJUnitRunner.class)

diff --git a/core/src/test/java/uk/gov/justice/services/core/envelope/EnvelopeInspectorTest.java b/core/src/test/java/uk/gov/justice/services/core/envelope/EnvelopeInspectorTest.java
@@ -12,7 +12,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class EnvelopeInspectorTest {

diff --git a/...uk/gov/justice/services/core/envelope/EnvelopeValidationExceptionHandlerProducerTest.java b/...uk/gov/justice/services/core/envelope/EnvelopeValidationExceptionHandlerProducerTest.java
@@ -8,7 +8,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class EnvelopeValidationExceptionHandlerProducerTest {

diff --git a/core/src/test/java/uk/gov/justice/services/core/envelope/EnvelopeValidatorTest.java b/core/src/test/java/uk/gov/justice/services/core/envelope/EnvelopeValidatorTest.java
@@ -7,7 +7,7 @@
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 import uk.gov.justice.services.core.json.JsonSchemaValidationException;
@@ -30,7 +30,7 @@
 import org.mockito.Captor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class EnvelopeValidatorTest {
@@ -84,8 +84,8 @@ public void shouldDoNothingIfTheEnvelopePayloadIsNull() throws Exception {
 
         envelopeValidator.validate(jsonEnvelope, actionName, mediaType);
 
-        verifyZeroInteractions(objectMapper);
-        verifyZeroInteractions(jsonSchemaValidator);
+        verifyNoInteractions(objectMapper);
+        verifyNoInteractions(jsonSchemaValidator);
     }
 
     @Test
@@ -111,7 +111,7 @@ public void shouldHandleAJsonProcessingException() throws Exception {
         assertThat(envelopeValidationException.getMessage(), is("Error serialising json."));
         assertThat(envelopeValidationException.getCause(), is(jsonProcessingException));
 
-        verifyZeroInteractions(jsonSchemaValidator);
+        verifyNoInteractions(jsonSchemaValidator);
     }
 
     @Test
@@ -191,7 +191,6 @@ public void shouldHandleAEnvelopeValidationException() throws Exception {
 
         when(jsonEnvelope.payload()).thenReturn(payload);
         when(objectMapper.writeValueAsString(payload)).thenReturn(payloadJson);
-        when(jsonEnvelope.toObfuscatedDebugString()).thenReturn("debug-json");
 
         doThrow(envelopeValidationException).when(jsonSchemaValidator).validate(
                 payloadJson,

diff --git a/...est/java/uk/gov/justice/services/core/envelope/LoggingValidationExceptionHandlerTest.java b/...est/java/uk/gov/justice/services/core/envelope/LoggingValidationExceptionHandlerTest.java
@@ -6,7 +6,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.slf4j.Logger;
 
 @RunWith(MockitoJUnitRunner.class)

diff --git a/core/src/test/java/uk/gov/justice/services/core/envelope/MediaTypeProviderTest.java b/core/src/test/java/uk/gov/justice/services/core/envelope/MediaTypeProviderTest.java
@@ -15,7 +15,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 
 @RunWith(MockitoJUnitRunner.class)

diff --git a/...test/java/uk/gov/justice/services/core/envelope/RequestResponseEnvelopeValidatorTest.java b/...test/java/uk/gov/justice/services/core/envelope/RequestResponseEnvelopeValidatorTest.java
@@ -18,7 +18,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class RequestResponseEnvelopeValidatorTest {
@@ -82,8 +82,6 @@ public void shouldNoValidateResponseEnvelopeIfValidationDisabled() throws Except
         final JsonEnvelope jsonEnvelope = mock(JsonEnvelope.class);
         final Optional<MediaType> mediaType = of(mock(MediaType.class));
 
-        when(envelopeInspector.getActionNameFor(jsonEnvelope)).thenReturn(actionName);
-        when(mediaTypeProvider.getResponseMediaType(actionName)).thenReturn(mediaType);
         when(dispatcherConfiguration.shouldValidateRestResponseJson()).thenReturn(false);
 
         requestResponseEnvelopeValidator.validateResponse(jsonEnvelope);

diff --git a/core/src/test/java/uk/gov/justice/services/core/enveloper/DefaultEnveloperTest.java b/core/src/test/java/uk/gov/justice/services/core/enveloper/DefaultEnveloperTest.java
@@ -27,7 +27,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class DefaultEnveloperTest {

diff --git a/core/src/test/java/uk/gov/justice/services/core/extension/BeanInstantiaterTest.java b/core/src/test/java/uk/gov/justice/services/core/extension/BeanInstantiaterTest.java
@@ -14,7 +14,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class BeanInstantiaterTest {

diff --git a/core/src/test/java/uk/gov/justice/services/core/extension/EventFoundEventTest.java b/core/src/test/java/uk/gov/justice/services/core/extension/EventFoundEventTest.java
@@ -6,7 +6,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 /**
  * Unit tests for the {@link EventFoundEvent} class.