removing excessive code (#1349)

Author: ORybak5

e2e-tests/src/test/java/uk/nhs/adaptors/gp2gp/e2e/EhrExtractTest.java

@@ -6,10 +6,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class ObjectMapperBeanTest {
+class ObjectMapperBeanTest {
 
     @Test
-    public void createsObjectMapperWithUnlimitedStringLengthConstraint() {
+    void createsObjectMapperWithUnlimitedStringLengthConstraint() {
         // The way we use JSON to store serialized XML and base64 encoded attachments means that the size of individual
         // strings can get very large. We've set the max string size below to be 2GB.
         // Ideal solution would be to avoid using JSON to store very large strings of data in the first place,

service/src/test/java/uk/nhs/adaptors/gp2gp/common/configuration/ObjectMapperBeanTest.java

@@ -9,10 +9,10 @@
 import static uk.nhs.adaptors.gp2gp.common.configuration.RedactionsContext.NON_REDACTION_INTERACTION_ID;
 import static uk.nhs.adaptors.gp2gp.common.configuration.RedactionsContext.REDACTION_INTERACTION_ID;
 
-public class RedactionsContextTest {
+class RedactionsContextTest {
 
     @Test
-    public void When_IsRedactionMessageAndInteractionIdIsRCMRIN030000UK07_Expect_IsRedactionMessage() {
+    void When_IsRedactionMessageAndInteractionIdIsRCMRIN030000UK07_Expect_IsRedactionMessage() {
         final var redactionsContext = new RedactionsContext(REDACTION_INTERACTION_ID);
 
         final var isRedactionMessage = redactionsContext.isRedactionMessage();
@@ -23,7 +23,7 @@ public void When_IsRedactionMessageAndInteractionIdIsRCMRIN030000UK07_Expect_IsR
     @ParameterizedTest
     @ValueSource(strings = { NON_REDACTION_INTERACTION_ID })
     @NullAndEmptySource
-    public void When_IsRedactionMessageAndInteractionIdIsNotRCMRIN030000UK07_Expect_IsNotRedactionMessage(
+    void When_IsRedactionMessageAndInteractionIdIsNotRCMRIN030000UK07_Expect_IsNotRedactionMessage(
         String interactionId
     ) {
         final var redactionsContext = new RedactionsContext(interactionId);

service/src/test/java/uk/nhs/adaptors/gp2gp/common/configuration/RedactionsContextTest.java

@@ -23,7 +23,7 @@
 import static uk.nhs.adaptors.gp2gp.common.configuration.RedactionsContext.REDACTION_INTERACTION_ID;
 
 @ExtendWith(MockitoExtension.class)
-public class ConfidentialityServiceTest {
+class ConfidentialityServiceTest {
     private static final Meta META_WITH_NO_SECURITY = new Meta();
     private static final Meta META_WITH_NOPAT_SECURITY = new Meta()
         .addSecurity(
@@ -49,7 +49,7 @@ private static Stream<Arguments> When_GenerateAndIsNotRedactionMessage_Expect_Em
     @ParameterizedTest
     @MethodSource
     @NullSource
-    public void When_GenerateAndIsNotRedactionMessage_Expect_EmptyOptional(Meta meta) {
+    void When_GenerateAndIsNotRedactionMessage_Expect_EmptyOptional(Meta meta) {
         var confidentialityService = new ConfidentialityService(
             new RedactionsContext(NON_REDACTION_INTERACTION_ID)
         );
@@ -62,7 +62,7 @@ public void When_GenerateAndIsNotRedactionMessage_Expect_EmptyOptional(Meta meta
     }
 
     @Test
-    public void When_GenerateAndIsRedactionMessageAndNoMetaSecurityIsPresent_Expect_EmptyOptional() {
+    void When_GenerateAndIsRedactionMessageAndNoMetaSecurityIsPresent_Expect_EmptyOptional() {
         var confidentialityService = new ConfidentialityService(
             new RedactionsContext(REDACTION_INTERACTION_ID)
         );
@@ -75,7 +75,7 @@ public void When_GenerateAndIsRedactionMessageAndNoMetaSecurityIsPresent_Expect_
     }
 
     @Test
-    public void When_GenerateAndIsRedactionMessageAndNonNOPATMetaSecurityIsPresent_Expect_EmptyOptional() {
+    void When_GenerateAndIsRedactionMessageAndNonNOPATMetaSecurityIsPresent_Expect_EmptyOptional() {
         var confidentialityService = new ConfidentialityService(
             new RedactionsContext(REDACTION_INTERACTION_ID)
         );
@@ -88,7 +88,7 @@ public void When_GenerateAndIsRedactionMessageAndNonNOPATMetaSecurityIsPresent_E
     }
 
     @Test
-    public void When_GenerateAndIsRedactionMessageAndNOPATMetaSecurityIsPresent_Expect_ConfidentialityCode() {
+    void When_GenerateAndIsRedactionMessageAndNOPATMetaSecurityIsPresent_Expect_ConfidentialityCode() {
         var confidentialityService = new ConfidentialityService(
             new RedactionsContext(REDACTION_INTERACTION_ID)
         );

service/src/test/java/uk/nhs/adaptors/gp2gp/common/service/ConfidentialityServiceTest.java

@@ -21,7 +21,7 @@
 import static org.mockito.Mockito.verifyNoInteractions;
 
 @ExtendWith(MockitoExtension.class)
-public class ProcessFailureHandlingServiceTest {
+class ProcessFailureHandlingServiceTest {
 
     @Mock
     private EhrExtractStatusRepository ehrExtractStatusRepository;
@@ -42,7 +42,7 @@ public class ProcessFailureHandlingServiceTest {
     private ProcessFailureHandlingService processFailureHandlingService;
 
     @Test
-    public void When_EhrExtractStatusExistsInDB_Expect_FailProcessToReturnTrue() {
+    void When_EhrExtractStatusExistsInDB_Expect_FailProcessToReturnTrue() {
         var conversationId = "conversationId1";
         var errorCode = "errorCode1";
         var errorMessage = "errorMessage1";
@@ -59,7 +59,7 @@ public void When_EhrExtractStatusExistsInDB_Expect_FailProcessToReturnTrue() {
     }
 
     @Test
-    public void When_EhrExtractStatusNotInDB_Expect_FailProcessToReturnFalse() {
+    void When_EhrExtractStatusNotInDB_Expect_FailProcessToReturnFalse() {
         doReturn(Optional.empty()).when(ehrExtractStatusRepository).findByConversationId(any());
 
         var result = processFailureHandlingService.failProcess("convId1", "errorCode1", "errorMsg1", "taskType1");
@@ -69,7 +69,7 @@ public void When_EhrExtractStatusNotInDB_Expect_FailProcessToReturnFalse() {
     }
 
     @Test
-    public void When_ExceptionIsThrown_Expect_FailProcessToReturnFalse() {
+    void When_ExceptionIsThrown_Expect_FailProcessToReturnFalse() {
         doThrow(new RuntimeException("test exception")).when(ehrExtractStatusRepository).findByConversationId(any());
 
         var result = processFailureHandlingService.failProcess("convId1", "errorCode1", "errorMsg1", "taskType1");
@@ -78,7 +78,7 @@ public void When_ExceptionIsThrown_Expect_FailProcessToReturnFalse() {
     }
 
     @Test
-    public void When_EhrExtractStatusNotInDB_Expect_HasProcessFailedToReturnFalse() {
+    void When_EhrExtractStatusNotInDB_Expect_HasProcessFailedToReturnFalse() {
         doReturn(Optional.of(ehrExtractStatus)).when(ehrExtractStatusRepository).findByConversationId(any());
 
         var result = processFailureHandlingService.hasProcessFailed("conversationId1");
@@ -87,7 +87,7 @@ public void When_EhrExtractStatusNotInDB_Expect_HasProcessFailedToReturnFalse()
     }
 
     @Test
-    public void When_ErrorInEhrExtractStatusIsMissing_Expect_HasProcessFailedToReturnFalse() {
+    void When_ErrorInEhrExtractStatusIsMissing_Expect_HasProcessFailedToReturnFalse() {
         doReturn(null).when(ehrExtractStatus).getError();
         doReturn(Optional.of(ehrExtractStatus)).when(ehrExtractStatusRepository).findByConversationId(any());
 
@@ -97,7 +97,7 @@ public void When_ErrorInEhrExtractStatusIsMissing_Expect_HasProcessFailedToRetur
     }
 
     @Test
-    public void When_ErrorInEhrExtractStatusIsPresent_Expect_HasProcessFailedToReturnTrue() {
+    void When_ErrorInEhrExtractStatusIsPresent_Expect_HasProcessFailedToReturnTrue() {
         doReturn(ehrExtractStatusError).when(ehrExtractStatus).getError();
         doReturn(Optional.of(ehrExtractStatus)).when(ehrExtractStatusRepository).findByConversationId(any());
 
@@ -107,7 +107,7 @@ public void When_ErrorInEhrExtractStatusIsPresent_Expect_HasProcessFailedToRetur
     }
 
     @Test
-    public void When_EhrExtractStatusRepositoryFails_Expect_HasProcessFailedToThrowException() {
+    void When_EhrExtractStatusRepositoryFails_Expect_HasProcessFailedToThrowException() {
         var expectedException = new RuntimeException("test exception");
         doThrow(expectedException).when(ehrExtractStatusRepository).findByConversationId(any());
 

service/src/test/java/uk/nhs/adaptors/gp2gp/common/service/ProcessFailureHandlingServiceTest.java

@@ -7,12 +7,12 @@
 
 import org.junit.jupiter.api.Test;
 
-public class RandomIdGeneratorServiceTest {
+class RandomIdGeneratorServiceTest {
 
     private static final String UUID_UPPERCASE_REGEXP = "[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}";
 
     @Test
-    public void When_CreatingNewId_Expect_GeneratedIdIsRandomUUID() {
+    void When_CreatingNewId_Expect_GeneratedIdIsRandomUUID() {
         String id1 = new RandomIdGeneratorService().createNewId();
         String id2 = new RandomIdGeneratorService().createNewId();
 
@@ -24,7 +24,7 @@ public void When_CreatingNewId_Expect_GeneratedIdIsRandomUUID() {
     }
 
     @Test
-    public void When_GeneratingIdFromExistingId_And_IdIsAValidUUID_Expect_ThatUUIDIsUsed() {
+    void When_GeneratingIdFromExistingId_And_IdIsAValidUUID_Expect_ThatUUIDIsUsed() {
         var uuidString = UUID.randomUUID().toString();
 
         var generatedUUID = new RandomIdGeneratorService().createNewOrUseExistingUUID(uuidString);
@@ -33,7 +33,7 @@ public void When_GeneratingIdFromExistingId_And_IdIsAValidUUID_Expect_ThatUUIDIs
     }
 
     @Test
-    public void When_GeneratingIdFromExistingId_And_IdIsNotAValidUUID_Expect_NewUUIDIsGenerated() {
+    void When_GeneratingIdFromExistingId_And_IdIsNotAValidUUID_Expect_NewUUIDIsGenerated() {
         var idString = "THIS-IS-NOT-A-VALID-GUID";
 
         var generatedUUID = new RandomIdGeneratorService().createNewOrUseExistingUUID(idString);

service/src/test/java/uk/nhs/adaptors/gp2gp/common/service/RandomIdGeneratorServiceTest.java

@@ -7,12 +7,12 @@
 
 import org.junit.jupiter.api.Test;
 
-public class TimestampServiceTest {
+class TimestampServiceTest {
 
     private static final int MILLIS_PER_MICRO = 1000;
 
     @Test
-    public void When_TimestampIsCreated_Expect_TruncatedToMilliseconds() {
+    void When_TimestampIsCreated_Expect_TruncatedToMilliseconds() {
         Instant now = new TimestampService().now();
         assertThat(now.getLong(ChronoField.MICRO_OF_SECOND) % MILLIS_PER_MICRO).isZero();
     }

service/src/test/java/uk/nhs/adaptors/gp2gp/common/service/TimestampServiceTest.java

@@ -10,33 +10,33 @@
 
 import lombok.SneakyThrows;
 
-public class XPathServiceTest {
+class XPathServiceTest {
 
     @Test
     @SneakyThrows
-    public void When_ValidXmlIsParsed_Expect_DocumentIsReturned() {
+    void When_ValidXmlIsParsed_Expect_DocumentIsReturned() {
         var document = new XPathService().parseDocumentFromXml("<root/>");
         assertThat(document.getChildNodes().item(0).getNodeName()).isEqualTo("root");
     }
 
     @Test
     @SneakyThrows
-    public void When_InvalidXmlIsParsed_Expect_SAXExceptionIsThrown() {
+    void When_InvalidXmlIsParsed_Expect_SAXExceptionIsThrown() {
         assertThatExceptionOfType(SAXException.class)
             .isThrownBy(() -> new XPathService().parseDocumentFromXml("NOT XML"));
     }
 
     @Test
     @SneakyThrows
-    public void When_GetNodeValueWithValidXPath_Expect_TheValueIsReturned() {
+    void When_GetNodeValueWithValidXPath_Expect_TheValueIsReturned() {
         var document = new XPathService().parseDocumentFromXml("<element>value</element>");
         assertThat(new XPathService().getNodeValue(document, "/element"))
             .isEqualTo("value");
     }
 
     @Test
     @SneakyThrows
-    public void When_GetNodeValueWithInvalidXPath_Expect_ThrowsRuntimeException() {
+    void When_GetNodeValueWithInvalidXPath_Expect_ThrowsRuntimeException() {
         var document = new XPathService().parseDocumentFromXml("<element>value</element>");
         assertThatExceptionOfType(IllegalArgumentException.class)
             .isThrownBy(() -> new XPathService().getNodeValue(document, "!!!NOT XPATH"))
@@ -45,7 +45,7 @@ public void When_GetNodeValueWithInvalidXPath_Expect_ThrowsRuntimeException() {
 
     @Test
     @SneakyThrows
-    public void When_GetNodesWithValidXPath_Expect_NodeListReturned() {
+    void When_GetNodesWithValidXPath_Expect_NodeListReturned() {
         var document = new XPathService().parseDocumentFromXml("<elements><element>value</element><element>value2</element></elements>");
         NodeList nodes = new XPathService().getNodes(document, "//element");
         assertAll(

service/src/test/java/uk/nhs/adaptors/gp2gp/common/service/XPathServiceTest.java

@@ -22,7 +22,7 @@
 import lombok.SneakyThrows;
 
 @ExtendWith(MockitoExtension.class)
-public class StorageConnectorServiceTest {
+class StorageConnectorServiceTest {
     private static final String TEST_ID = "SOME_ID";
     private static final long EXPECTED_STREAM_LENGTH = 8;
 
@@ -40,7 +40,7 @@ public class StorageConnectorServiceTest {
 
     @Test
     @SneakyThrows
-    public void When_ValidStorageDataWrapperIsPass_Expect_UploadStorageParamsHaveCorrectValues() {
+    void When_ValidStorageDataWrapperIsPass_Expect_UploadStorageParamsHaveCorrectValues() {
         when(objectMapper.writeValueAsString(anyStorageDataWrapper)).thenReturn("response");
 
         String filename = TEST_ID.concat("/").concat(TEST_ID).concat("_gpc_structured.json");

service/src/test/java/uk/nhs/adaptors/gp2gp/common/storage/StorageConnectorServiceTest.java

@@ -22,7 +22,7 @@
 import uk.nhs.adaptors.gp2gp.mhs.exception.MhsConnectionException;
 
 @ExtendWith(MockitoExtension.class)
-public class TaskConsumerTest {
+class TaskConsumerTest {
 
     @Mock
     private TaskHandler taskHandler;
@@ -41,7 +41,7 @@ public class TaskConsumerTest {
 
     @Test
     @SneakyThrows
-    public void When_TaskHandlerReturnsTrue_Expect_MessageAcknowledged() {
+    void When_TaskHandlerReturnsTrue_Expect_MessageAcknowledged() {
         when(taskHandler.handle(any())).thenReturn(true);
 
         taskConsumer.receive(message, session);
@@ -52,7 +52,7 @@ public void When_TaskHandlerReturnsTrue_Expect_MessageAcknowledged() {
 
     @Test
     @SneakyThrows
-    public void When_TaskHandlerReturnsFalse_Expect_MessageNotAcknowledged() {
+    void When_TaskHandlerReturnsFalse_Expect_MessageNotAcknowledged() {
         when(taskHandler.handle(any())).thenReturn(false);
 
         taskConsumer.receive(message, session);
@@ -63,7 +63,7 @@ public void When_TaskHandlerReturnsFalse_Expect_MessageNotAcknowledged() {
 
     @Test
     @SneakyThrows
-    public void When_TaskHandlerReturnsFalse_Expect_SessionRolledBack() {
+    void When_TaskHandlerReturnsFalse_Expect_SessionRolledBack() {
         when(taskHandler.handle(any())).thenReturn(false);
 
         taskConsumer.receive(message, session);
@@ -74,7 +74,7 @@ public void When_TaskHandlerReturnsFalse_Expect_SessionRolledBack() {
 
     @Test
     @SneakyThrows
-    public void When_TaskHandlerThrowsException_Expect_MessageNotAcknowledged() {
+    void When_TaskHandlerThrowsException_Expect_MessageNotAcknowledged() {
         doThrow(RuntimeException.class).when(taskHandler).handle(message);
 
         taskConsumer.receive(message, session);
@@ -85,7 +85,7 @@ public void When_TaskHandlerThrowsException_Expect_MessageNotAcknowledged() {
 
     @Test
     @SneakyThrows
-    public void When_TaskHandlerThrowsException_Expect_SessionRolledBack() {
+    void When_TaskHandlerThrowsException_Expect_SessionRolledBack() {
         doThrow(RuntimeException.class).when(taskHandler).handle(message);
 
         taskConsumer.receive(message, session);
@@ -96,7 +96,7 @@ public void When_TaskHandlerThrowsException_Expect_SessionRolledBack() {
 
     @Test
     @SneakyThrows
-    public void When_TaskHandlerThrowsDataResourceAccessFailureException_Expect_ExceptionIsThrown() {
+    void When_TaskHandlerThrowsDataResourceAccessFailureException_Expect_ExceptionIsThrown() {
         doThrow(DataAccessResourceFailureException.class).when(taskHandler).handle(message);
 
         assertThatExceptionOfType(DataAccessResourceFailureException.class)
@@ -108,7 +108,7 @@ public void When_TaskHandlerThrowsDataResourceAccessFailureException_Expect_Exce
 
     @Test
     @SneakyThrows
-    public void When_TaskHandlerThrowsMhsConnectionException_Expect_ExceptionIsThrown() {
+    void When_TaskHandlerThrowsMhsConnectionException_Expect_ExceptionIsThrown() {
         doThrow(MhsConnectionException.class).when(taskHandler).handle(message);
 
         assertThatExceptionOfType(MhsConnectionException.class)