Made checkstyle happy

Author: chiaramapellimt

service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/AgentPersonMapperTest.java

@@ -1,6 +1,5 @@
 package uk.nhs.adaptors.gp2gp.ehr.mapper;
 
-import static org.mockito.Mockito.when;
 import static org.assertj.core.api.Assertions.assertThat;
 import java.util.stream.Stream;
 

service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/DocumentReferenceToNarrativeStatementMapperTest.java

@@ -21,7 +21,6 @@
 import uk.nhs.adaptors.gp2gp.utils.ConfidentialityCodeUtility;
 import uk.nhs.adaptors.gp2gp.utils.ResourceTestFileUtils;
 
-import java.time.Instant;
 import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -222,7 +221,7 @@ void When_MappingDocReferenceJson_Expect_NarrativeStatementXmlOutput(String inpu
 
     @ParameterizedTest
     @MethodSource("documentReferenceResourceFileParamsWhenIdNeeded")
-    void When_MappingDocReferenceJson_Expect_NarrativeStatementXmlOutput_WithIdNeeded(String inputJson, String outputXml) {
+    void When_MappingDocReferenceJson_Expect_NarrativeStatementXmlOutputWithIdNeeded(String inputJson, String outputXml) {
         when(randomIdGeneratorService.createNewId()).thenReturn(TEST_ID);
         when(redactionsContext.isRedactionMessage()).thenReturn(true);
         when(randomIdGeneratorService.createNewOrUseExistingUUID(anyString())).thenReturn(TEST_ID);
@@ -240,7 +239,7 @@ void When_MappingDocReferenceJson_Expect_NarrativeStatementXmlOutput_WithIdNeede
     }
 
     @Test
-    void When_MappingDocReferenceJson_Expect_NarrativeStatementXmlOutput_WithIdNeeded2() {
+    void When_MappingDocReferenceJson_Expect_NarrativeStatementXmlOutputWithIdAndOctetContentType() {
         when(redactionsContext.isRedactionMessage()).thenReturn(true);
         when(randomIdGeneratorService.createNewOrUseExistingUUID(anyString())).thenReturn(TEST_ID);
         when(supportedContentTypes.isContentTypeSupported(anyString()))

service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/RequestStatementMapperTest.java

@@ -12,7 +12,6 @@
 import org.hl7.fhir.dstu3.model.Bundle;
 import org.hl7.fhir.dstu3.model.CodeableConcept;
 import org.hl7.fhir.dstu3.model.IdType;
-import org.hl7.fhir.dstu3.model.Reference;
 import org.hl7.fhir.dstu3.model.ReferralRequest;
 import org.hl7.fhir.dstu3.model.ResourceType;
 import org.junit.jupiter.api.AfterEach;
@@ -282,7 +281,8 @@ void When_MappingObservationJsonWithPractitionerRequester_Expect_NarrativeStatem
                 .thenReturn("II-for-ReferralRequest-E63AF323-919F-4D5F-9A1D-BA933BC230BC");
 
         when(messageContext.getAgentDirectory()).thenReturn(agentDirectory);
-        when(agentDirectory.getAgentId(any())).thenReturn("II-for-Practitioner/6D340A1B-BC15-4D4E-93CF-BBCB5B74DF73-Organization/1F90B10F-CF14-4D6F-8C0D-585059DA4EC5");
+        when(agentDirectory.getAgentId(any()))
+                .thenReturn("II-for-Practitioner/6D340A1B-BC15-4D4E-93CF-BBCB5B74DF73-Organization/1F90B10F-CF14-4D6F-8C0D-585059DA4EC5");
 
         assertThatInputMapsToExpectedOutput(INPUT_JSON_WITH_PRACTITIONER_REQUESTER, OUTPUT_XML_WITH_PRACTITIONER_REQUESTER);
     }
@@ -384,7 +384,8 @@ void When_MappingObservationJsonWithPractitionerRequesterNoOnBehalfOf_Expect_Nar
         when(messageContext.getAgentDirectory()).thenReturn(agentDirectory);
         when(agentDirectory.getAgentId(any())).thenReturn("II-for-Practitioner/6D340A1B-BC15-4D4E-93CF-BBCB5B74DF73");
 
-        assertThatInputMapsToExpectedOutput(INPUT_JSON_WITH_PRACTITIONER_REQUESTER_NO_ONBEHALFOF, OUTPUT_XML_WITH_PRACTITIONER_REQUESTER_NO_ONBEHALFOF);
+        assertThatInputMapsToExpectedOutput(INPUT_JSON_WITH_PRACTITIONER_REQUESTER_NO_ONBEHALFOF,
+                OUTPUT_XML_WITH_PRACTITIONER_REQUESTER_NO_ONBEHALFOF);
     }
 
     @Test
@@ -441,7 +442,8 @@ void When_MappingObservationJsonWithSupportingInfoDocumentReference_Expect_Narra
         when(idMapper.getOrNew(any(), any()))
                 .thenReturn("II-for-ReferralRequest-2FB2C828-F8EC-11EB-9A03-0242AC130003");
 
-        assertThatInputMapsToExpectedOutput(INPUT_JSON_WITH_SUPPORTINGINFO_DOCUMENTREFERENCE, OUTPUT_XML_WITH_SUPPORTINGINFO_DOCUMENTREFERENCE);
+        assertThatInputMapsToExpectedOutput(INPUT_JSON_WITH_SUPPORTINGINFO_DOCUMENTREFERENCE,
+                OUTPUT_XML_WITH_SUPPORTINGINFO_DOCUMENTREFERENCE);
     }
 
     @Test
@@ -454,7 +456,8 @@ void When_MappingObservationJsonWithSupportingInfoDocumentReferenceNoDescription
         when(idMapper.getOrNew(any(), any()))
                 .thenReturn("II-for-ReferralRequest-2FB2C828-F8EC-11EB-9A03-0242AC130003");
 
-        assertThatInputMapsToExpectedOutput(INPUT_JSON_WITH_SUPPORTINGINFO_DOCUMENTREFERENCE_NO_DESCRIPTION, OUTPUT_XML_WITH_SUPPORTINGINFO_DOCUMENTREFERENCE_NO_DESCRIPTION);
+        assertThatInputMapsToExpectedOutput(INPUT_JSON_WITH_SUPPORTINGINFO_DOCUMENTREFERENCE_NO_DESCRIPTION,
+                OUTPUT_XML_WITH_SUPPORTINGINFO_DOCUMENTREFERENCE_NO_DESCRIPTION);
     }
 
     @Test
@@ -481,7 +484,8 @@ void When_MappingObservationJsonWithSupportingInfoObservation_Expect_NarrativeSt
         when(idMapper.getOrNew(any(), any()))
                 .thenReturn("II-for-ReferralRequest-2FB2C828-F8EC-11EB-9A03-0242AC130003");
 
-        assertThatInputMapsToExpectedOutput(INPUT_JSON_WITH_SUPPORTINGINFO_OBSERVATION, OUTPUT_XML_WITH_SUPPORTINGINFO_OBSERVATION);
+        assertThatInputMapsToExpectedOutput(INPUT_JSON_WITH_SUPPORTINGINFO_OBSERVATION,
+                OUTPUT_XML_WITH_SUPPORTINGINFO_OBSERVATION);
     }
 
     @Test
@@ -494,7 +498,8 @@ void When_MappingObservationJsonWithSupportingInfoObservationEffectivePeriod_Exp
         when(idMapper.getOrNew(any(), any()))
                 .thenReturn("II-for-ReferralRequest-2FB2C828-F8EC-11EB-9A03-0242AC130003");
 
-        assertThatInputMapsToExpectedOutput(INPUT_JSON_WITH_SUPPORTINGINFO_OBSERVATION_EFFECTIVEPERIOD, OUTPUT_XML_WITH_SUPPORTINGINFO_OBSERVATION);
+        assertThatInputMapsToExpectedOutput(INPUT_JSON_WITH_SUPPORTINGINFO_OBSERVATION_EFFECTIVEPERIOD,
+                OUTPUT_XML_WITH_SUPPORTINGINFO_OBSERVATION);
     }
 
     @Test
@@ -548,7 +553,8 @@ void When_MappingObservationJsonWithSupportingInfoReferralRequestNoDateNoReason_
         when(idMapper.getOrNew(any(), any()))
                 .thenReturn("II-for-ReferralRequest-2FB2C828-F8EC-11EB-9A03-0242AC130003");
 
-        assertThatInputMapsToExpectedOutput(INPUT_JSON_WITH_SUPPORTINGINFO_REFERRALREQUEST_NO_DATE_NO_REASON, OUTPUT_XML_WITH_SUPPORTINGINFO_REFERRALREQUEST_NO_DATE_NO_REASON);
+        assertThatInputMapsToExpectedOutput(INPUT_JSON_WITH_SUPPORTINGINFO_REFERRALREQUEST_NO_DATE_NO_REASON,
+                OUTPUT_XML_WITH_SUPPORTINGINFO_REFERRALREQUEST_NO_DATE_NO_REASON);
     }
 
     @Test
@@ -561,7 +567,8 @@ void When_MappingObservationJsonWithSupportingInfoDiagnosticReport_Expect_Narrat
         when(idMapper.getOrNew(any(), any()))
                 .thenReturn("II-for-ReferralRequest-2FB2C828-F8EC-11EB-9A03-0242AC130003");
 
-        assertThatInputMapsToExpectedOutput(INPUT_JSON_WITH_SUPPORTINGINFO_DIAGNOSTICREPORT, OUTPUT_XML_WITH_SUPPORTINGINFO_DIAGNOSTICREPORT);
+        assertThatInputMapsToExpectedOutput(INPUT_JSON_WITH_SUPPORTINGINFO_DIAGNOSTICREPORT,
+                OUTPUT_XML_WITH_SUPPORTINGINFO_DIAGNOSTICREPORT);
     }
 
     @Test
@@ -588,7 +595,8 @@ void When_MappingObservationJsonWithSupportingInfoMedicationRequest_Expect_Narra
         when(idMapper.getOrNew(any(), any()))
                 .thenReturn("II-for-ReferralRequest-2FB2C828-F8EC-11EB-9A03-0242AC130003");
 
-        assertThatInputMapsToExpectedOutput(INPUT_JSON_WITH_SUPPORTINGINFO_MEDICATIONREQUEST, OUTPUT_XML_WITH_SUPPORTINGINFO_MEDICATIONREQUEST);
+        assertThatInputMapsToExpectedOutput(INPUT_JSON_WITH_SUPPORTINGINFO_MEDICATIONREQUEST,
+                OUTPUT_XML_WITH_SUPPORTINGINFO_MEDICATIONREQUEST);
     }
 
     @Test