IllogicalMessageComponentTest cleanup (#1423)

Author: chiaramapellimt

service/src/intTest/java/uk/nhs/adaptors/gp2gp/ehr/IllogicalMessageComponentTest.java

@@ -42,7 +42,7 @@
 @SpringBootTest
 @DirtiesContext
 public class IllogicalMessageComponentTest {
-    private static final XPathService SERVICE = new XPathService();
+    private static final XPathService XPathService = new XPathService();
 
     @Mock
     private TaskDispatcher taskDispatcher;
@@ -118,12 +118,15 @@ public void When_DuplicateEhrRequestReceived_Expect_SkippedNoDatabaseUpdated() {
         ehrExtractStatusRepository.save(ehrExtractStatus);
         inboundMessageHandler.handle(message);
 
-        var firstEhrStatus =
-                ehrExtractStatusRepository.findByConversationId(ehrExtractStatus.getConversationId()).get();
+        var firstEhrStatus = ehrExtractStatusRepository
+                .findByConversationId(ehrExtractStatus.getConversationId())
+                .orElseThrow();
+
         inboundMessageHandler.handle(message);
 
-        var secondEhrStatus =
-                ehrExtractStatusRepository.findByConversationId(ehrExtractStatus.getConversationId()).get();
+        var secondEhrStatus = ehrExtractStatusRepository
+                .findByConversationId(ehrExtractStatus.getConversationId())
+                .orElseThrow();
 
         assertThat(firstEhrStatus.getUpdatedAt()).isEqualTo(secondEhrStatus.getUpdatedAt());
         verify(taskDispatcher, never()).createTask(any());
@@ -136,14 +139,14 @@ public void When_DuplicateContinueReceived_Expect_SkippedNoDatabaseUpdated() {
         ehrExtractStatus.setEhrContinue(EhrExtractStatus.EhrContinue.builder().build());
         ehrExtractStatusRepository.save(ehrExtractStatus);
 
-        String continueEbxml = asString(continueResponseEbxml);
+        String continueEbXml = asString(continueResponseEbxml);
 
-        mockIncomingMessage(continueEbxml);
+        mockIncomingMessage(continueEbXml);
 
         inboundMessageHandler.handle(message);
-        var firstEhrStatus = ehrExtractStatusRepository.findByConversationId(ehrExtractStatus.getConversationId()).get();
+        var firstEhrStatus = ehrExtractStatusRepository.findByConversationId(ehrExtractStatus.getConversationId()).orElseThrow();
         inboundMessageHandler.handle(message);
-        var secondEhrStatus = ehrExtractStatusRepository.findByConversationId(ehrExtractStatus.getConversationId()).get();
+        var secondEhrStatus = ehrExtractStatusRepository.findByConversationId(ehrExtractStatus.getConversationId()).orElseThrow();
 
         assertThat(firstEhrStatus.getUpdatedAt()).isEqualTo(secondEhrStatus.getUpdatedAt());
         verify(taskDispatcher, never()).createTask(any());
@@ -161,9 +164,9 @@ public void When_DuplicateAcknowledgementSentTwice_Expect_SkippedNoDatabaseUpdat
         mockAcknowledgementMessage(acknowledgementEbxml);
 
         inboundMessageHandler.handle(message);
-        var firstEhrStatus = ehrExtractStatusRepository.findByConversationId(ehrExtractStatus.getConversationId()).get();
+        var firstEhrStatus = ehrExtractStatusRepository.findByConversationId(ehrExtractStatus.getConversationId()).orElseThrow();
         inboundMessageHandler.handle(message);
-        var secondEhrStatus = ehrExtractStatusRepository.findByConversationId(ehrExtractStatus.getConversationId()).get();
+        var secondEhrStatus = ehrExtractStatusRepository.findByConversationId(ehrExtractStatus.getConversationId()).orElseThrow();
 
         assertThat(firstEhrStatus.getUpdatedAt()).isEqualTo(secondEhrStatus.getUpdatedAt());
         verify(taskDispatcher, never()).createTask(any());
@@ -187,7 +190,7 @@ private static String asString(Resource resource) {
 
     @SneakyThrows
     private void mockIncomingMessage(String ebxml) {
-        SERVICE.parseDocumentFromXml(ebxml);
+        XPathService.parseDocumentFromXml(ebxml);
     }
 
     @SneakyThrows