Simplify the JAXB classes, by combining the 06 and 07 classes into one (

#711) This duplication was causing a bug within the COPCMessageHandler where the handler was trying to unmarshall an 07 message into an 06 class. By combining the two classes into one we remove this whole class of defect.
NHSDigital · Jul 19, 2024 · 3258109 · 3258109
1 parent 201aaa5
commit 3258109
Show file tree

Hide file tree

Showing 31 changed files with 628 additions and 1,792 deletions.
diff --git a/...rc/integrationTest/java/uk/nhs/adaptors/pss/translator/service/BundleMapperServiceIT.java b/...rc/integrationTest/java/uk/nhs/adaptors/pss/translator/service/BundleMapperServiceIT.java
@@ -15,7 +15,7 @@
 import org.hl7.fhir.dstu3.model.Practitioner;
 import org.hl7.fhir.dstu3.model.PractitionerRole;
 import org.hl7.fhir.dstu3.model.ResourceType;
-import org.hl7.v3.RCMRIN030000UK06Message;
+import org.hl7.v3.RCMRIN030000UKMessage;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.junit.jupiter.MockitoExtension;
@@ -160,8 +160,8 @@ public void When_MappingBundle_With_DocumentsAndMatchingRepresentedOrganisation_
     }
 
     @SneakyThrows
-    private RCMRIN030000UK06Message unmarshallEhrExtractFromFile(String filename) {
-        return unmarshallFile(getFile("classpath:" + XML_RESOURCES_BASE + filename), RCMRIN030000UK06Message.class);
+    private RCMRIN030000UKMessage unmarshallEhrExtractFromFile(String filename) {
+        return unmarshallFile(getFile("classpath:" + XML_RESOURCES_BASE + filename), RCMRIN030000UKMessage.class);
     }
 
     private List<Organization> extractOrganisationsFromBundle(Bundle bundle) {

diff --git a/...slator/src/main/java/uk/nhs/adaptors/pss/translator/service/AcknowledgeRecordService.java b/...slator/src/main/java/uk/nhs/adaptors/pss/translator/service/AcknowledgeRecordService.java
@@ -5,7 +5,7 @@
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.hl7.v3.RCMRIN030000UK06Message;
+import org.hl7.v3.RCMRIN030000UKMessage;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -44,7 +44,7 @@ public class AcknowledgeRecordService {
     );
 
     public boolean prepareAndSendAcknowledgementMessage(AcknowledgeRecordMessage acknowledgeRecordMessage) {
-        RCMRIN030000UK06Message message;
+        RCMRIN030000UKMessage message;
 
         try {
             message = parseOriginalMessage(acknowledgeRecordMessage);
@@ -67,12 +67,12 @@ public boolean prepareAndSendAcknowledgementMessage(AcknowledgeRecordMessage ack
         return nackAckPrepInterface.sendNackMessage(nackReason, message, conversationId);
     }
 
-    private RCMRIN030000UK06Message parseOriginalMessage(AcknowledgeRecordMessage message)
+    private RCMRIN030000UKMessage parseOriginalMessage(AcknowledgeRecordMessage message)
         throws JAXBException, JsonProcessingException {
         var payload = objectMapper.readValue(message.getOriginalMessage(), InboundMessage.class)
                 .getPayload();
 
-        return unmarshallString(payload, RCMRIN030000UK06Message.class);
+        return unmarshallString(payload, RCMRIN030000UKMessage.class);
     }
 
 }
diff --git a/...-translator/src/main/java/uk/nhs/adaptors/pss/translator/service/BundleMapperService.java b/...-translator/src/main/java/uk/nhs/adaptors/pss/translator/service/BundleMapperService.java
@@ -21,8 +21,6 @@
 import org.hl7.fhir.dstu3.model.Organization;
 import org.hl7.fhir.dstu3.model.Patient;
 import org.hl7.fhir.dstu3.model.ResourceType;
-import org.hl7.v3.RCMRIN030000UK06Message;
-import org.hl7.v3.RCMRIN030000UK07Message;
 import org.hl7.v3.RCMRIN030000UKMessage;
 import org.hl7.v3.RCMRMT030101UKComponent3;
 import org.hl7.v3.RCMRMT030101UKEhrExtract;
@@ -249,30 +247,11 @@ private Organization getPatientOrganization(List<? extends DomainResource> agent
     }
 
     private RCMRMT030101UKEhrFolder getEhrFolder(RCMRIN030000UKMessage xmlMessage) {
-        if (xmlMessage instanceof RCMRIN030000UK07Message rcmrin030000uk07message) {
-
-            return rcmrin030000uk07message.getControlActEvent()
-                                                         .getSubject()
-                                                         .getEhrExtract()
-                                                         .getComponent()
-                                                         .get(0)
-                                                         .getEhrFolder();
-        } else {
-            return ((RCMRIN030000UK06Message) xmlMessage).getControlActEvent()
-                                                         .getSubject()
-                                                         .getEhrExtract()
-                                                         .getComponent()
-                                                         .get(0)
-                                                         .getEhrFolder();
-        }
+        return getEhrExtract(xmlMessage).getComponent().get(0).getEhrFolder();
     }
 
     private RCMRMT030101UKEhrExtract getEhrExtract(RCMRIN030000UKMessage xmlMessage) {
-        if (xmlMessage instanceof RCMRIN030000UK07Message rcmrin030000uk07message) {
-            return rcmrin030000uk07message.getControlActEvent().getSubject().getEhrExtract();
-        } else {
-            return ((RCMRIN030000UK06Message) xmlMessage).getControlActEvent().getSubject().getEhrExtract();
-        }
+        return xmlMessage.getControlActEvent().getSubject().getEhrExtract();
     }
 
     private <T extends DomainResource> void addEntries(Bundle bundle, Collection<T> resources) {

diff --git a/...or/src/main/java/uk/nhs/adaptors/pss/translator/service/InboundMessageMergingService.java b/...or/src/main/java/uk/nhs/adaptors/pss/translator/service/InboundMessageMergingService.java
@@ -14,7 +14,7 @@
 import jakarta.xml.bind.ValidationException;
 import javax.xml.transform.TransformerException;
 
-import org.hl7.v3.RCMRIN030000UK06Message;
+import org.hl7.v3.RCMRIN030000UKMessage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -72,7 +72,7 @@ public void mergeAndBundleMessage(String conversationId) throws JAXBException, J
 
         PatientMigrationRequest migrationRequest = migrationRequestDao.getMigrationRequest(conversationId);
         var inboundMessage = objectMapper.readValue(migrationRequest.getInboundMessage(), InboundMessage.class);
-        RCMRIN030000UK06Message payload = unmarshallString(inboundMessage.getPayload(), RCMRIN030000UK06Message.class);
+        RCMRIN030000UKMessage payload = unmarshallString(inboundMessage.getPayload(), RCMRIN030000UKMessage.class);
 
         try {
             var attachmentLogs = getUndeletedLogsForConversation(conversationId);
@@ -102,7 +102,7 @@ public void mergeAndBundleMessage(String conversationId) throws JAXBException, J
 
             // process bundle
             inboundMessage.setPayload(newPayloadStr);
-            payload = unmarshallString(inboundMessage.getPayload(), RCMRIN030000UK06Message.class);
+            payload = unmarshallString(inboundMessage.getPayload(), RCMRIN030000UKMessage.class);
 
             var attachments = patientAttachmentLogService.findAttachmentLogs(conversationId);
 

diff --git a/...translator/src/main/java/uk/nhs/adaptors/pss/translator/service/NackAckPrepInterface.java b/...translator/src/main/java/uk/nhs/adaptors/pss/translator/service/NackAckPrepInterface.java
@@ -1,14 +1,13 @@
 package uk.nhs.adaptors.pss.translator.service;
 
 import org.hl7.v3.COPCIN000001UK01Message;
-import org.hl7.v3.RCMRIN030000UK06Message;
 import org.hl7.v3.RCMRIN030000UKMessage;
 import uk.nhs.adaptors.pss.translator.model.NACKMessageData;
 import uk.nhs.adaptors.pss.translator.model.NACKReason;
 
 public interface NackAckPrepInterface {
 
-    boolean sendAckMessage(RCMRIN030000UK06Message payload, String conversationId);
+    boolean sendAckMessage(RCMRIN030000UKMessage payload, String conversationId);
 
     boolean sendAckMessage(COPCIN000001UK01Message payload, String conversationId, String losingPracticeOdsCode);
 

diff --git a/...lator/src/main/java/uk/nhs/adaptors/pss/translator/service/NackAckPreparationService.java b/...lator/src/main/java/uk/nhs/adaptors/pss/translator/service/NackAckPreparationService.java
@@ -4,7 +4,6 @@
 import static uk.nhs.adaptors.common.enums.MigrationStatus.FINAL_ACK_SENT;
 
 import org.hl7.v3.COPCIN000001UK01Message;
-import org.hl7.v3.RCMRIN030000UK06Message;
 import org.hl7.v3.RCMRIN030000UKMessage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -28,7 +27,7 @@ public class NackAckPreparationService implements NackAckPrepInterface {
     private final SendACKMessageHandler sendACKMessageHandler;
     private final MigrationStatusLogService migrationStatusLogService;
 
-    public boolean sendAckMessage(RCMRIN030000UK06Message payload, String conversationId) {
+    public boolean sendAckMessage(RCMRIN030000UKMessage payload, String conversationId) {
 
         LOGGER.debug("Sending Final ACK message for Conversation ID: [{}]", conversationId);
 
@@ -55,8 +54,8 @@ public boolean sendAckMessage(COPCIN000001UK01Message payload, String conversati
         ));
     }
 
-    private ACKMessageData prepareAckMessageData(RCMRIN030000UK06Message payload,
-                                                String conversationId) {
+    private ACKMessageData prepareAckMessageData(RCMRIN030000UKMessage payload,
+                                                 String conversationId) {
 
         String toOdsCode = XmlParseUtilService.parseToOdsCode(payload);
         String messageRef = XmlParseUtilService.parseMessageRef(payload);

diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/task/COPCMessageHandler.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/task/COPCMessageHandler.java
@@ -18,7 +18,7 @@
 import jakarta.xml.bind.ValidationException;
 
 import org.hl7.v3.COPCIN000001UK01Message;
-import org.hl7.v3.RCMRIN030000UK06Message;
+import org.hl7.v3.RCMRIN030000UKMessage;
 import org.jdbi.v3.core.ConnectionException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -485,7 +485,7 @@ private void failMigration(String conversationId, NACKReason reason) throws Json
         PatientMigrationRequest migrationRequest = migrationRequestDao.getMigrationRequest(conversationId);
 
         InboundMessage inboundMessage = inboundMessageUtil.readMessage(migrationRequest.getInboundMessage());
-        RCMRIN030000UK06Message ehrExtract = unmarshallString(inboundMessage.getPayload(), RCMRIN030000UK06Message.class);
+        RCMRIN030000UKMessage ehrExtract = unmarshallString(inboundMessage.getPayload(), RCMRIN030000UKMessage.class);
         String ehrExtractMessageId = outboundMessageUtil.parseMessageRef(ehrExtract);
 
         NACKMessageData messageData = NACKMessageData

diff --git a/...ranslator/src/main/java/uk/nhs/adaptors/pss/translator/task/EhrExtractMessageHandler.java b/...ranslator/src/main/java/uk/nhs/adaptors/pss/translator/task/EhrExtractMessageHandler.java
@@ -7,8 +7,6 @@
 import lombok.extern.slf4j.Slf4j;
 
 import org.hl7.fhir.dstu3.model.Bundle;
-import org.hl7.v3.RCMRIN030000UK06Message;
-import org.hl7.v3.RCMRIN030000UK07Message;
 import org.hl7.v3.RCMRIN030000UKMessage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -75,7 +73,7 @@ public class EhrExtractMessageHandler {
 
     private static final String MESSAGE_ID_PATH = "/Envelope/Header/MessageHeader/MessageData/MessageId";
 
-    public void handleMessage(InboundMessage inboundMessage, String conversationId, Class<? extends RCMRIN030000UKMessage> destinationClass)
+    public void handleMessage(InboundMessage inboundMessage, String conversationId)
         throws
         JAXBException,
         JsonProcessingException,
@@ -85,7 +83,7 @@ public void handleMessage(InboundMessage inboundMessage, String conversationId,
         ParseException,
         SAXException, TransformerException {
 
-        RCMRIN030000UKMessage payload = unmarshallString(inboundMessage.getPayload(), destinationClass);
+        RCMRIN030000UKMessage payload = unmarshallString(inboundMessage.getPayload(), RCMRIN030000UKMessage.class);
         PatientMigrationRequest migrationRequest = migrationRequestDao.getMigrationRequest(conversationId);
         MigrationStatusLog migrationStatusLog = migrationStatusLogService.getLatestMigrationStatusLog(conversationId);
 
@@ -110,7 +108,7 @@ public void handleMessage(InboundMessage inboundMessage, String conversationId,
             if (!hasExternalAttachment) {
                 // If there are no external attachments, process the entire message now
                 processAndCompleteEHRMessage(inboundMessage, conversationId, skeletonCIDAttachmentLog,
-                                             migrationRequest, messageId, destinationClass);
+                                             migrationRequest, messageId);
             } else {
                 //process MID messages and send continue message if external messages exist
                 processExternalAttachmentsAndSendContinueMessage(inboundMessage,
@@ -167,7 +165,7 @@ private PatientAttachmentLog processInternalAttachmentsAndReturnSkeletonLog(Inbo
 
     private void processAndCompleteEHRMessage(InboundMessage inboundMessage,
         String conversationId, PatientAttachmentLog skeletonCIDAttachmentLog,
-        PatientMigrationRequest migrationRequest, String messageId, Class<? extends RCMRIN030000UKMessage> destinationClass)
+        PatientMigrationRequest migrationRequest, String messageId)
         throws JAXBException, TransformerException,
         SAXException, AttachmentNotFoundException, InlineAttachmentProcessingException,
         BundleMappingException, JsonProcessingException {
@@ -192,12 +190,7 @@ private void processAndCompleteEHRMessage(InboundMessage inboundMessage,
 
         // now we have the transformed payload, lets create our bundle
         Bundle bundle = null;
-        RCMRIN030000UKMessage payload = null;
-        if (destinationClass.getCanonicalName().contains("RCMRIN030000UK07Message")) {
-            payload = unmarshallString(inboundMessage.getPayload(), RCMRIN030000UK07Message.class);
-        } else {
-            payload = unmarshallString(inboundMessage.getPayload(), RCMRIN030000UK06Message.class);
-        }
+        RCMRIN030000UKMessage payload = unmarshallString(inboundMessage.getPayload(), RCMRIN030000UKMessage.class);
         bundle = bundleMapperService.mapToBundle(payload, migrationRequest.getLosingPracticeOdsCode(), attachments);
 
         // update the db migration request

diff --git a/...-translator/src/main/java/uk/nhs/adaptors/pss/translator/task/MhsQueueMessageHandler.java b/...-translator/src/main/java/uk/nhs/adaptors/pss/translator/task/MhsQueueMessageHandler.java
@@ -7,8 +7,6 @@
 import jakarta.xml.bind.JAXBException;
 import javax.xml.transform.TransformerException;
 
-import org.hl7.v3.RCMRIN030000UK06Message;
-import org.hl7.v3.RCMRIN030000UK07Message;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.w3c.dom.Document;
@@ -78,10 +76,8 @@ public boolean handleMessage(Message message) {
 
             if (ACKNOWLEDGEMENT_INTERACTION_ID.equals(interactionId)) {
                 acknowledgmentMessageHandler.handleMessage(inboundMessage, conversationId);
-            } else if (EHR_EXTRACT_INTERACTION_ID06.equals(interactionId)) {
-                ehrExtractMessageHandler.handleMessage(inboundMessage, conversationId, RCMRIN030000UK06Message.class);
-            } else if (EHR_EXTRACT_INTERACTION_ID07.equals(interactionId)) {
-                ehrExtractMessageHandler.handleMessage(inboundMessage, conversationId, RCMRIN030000UK07Message.class);
+            } else if (EHR_EXTRACT_INTERACTION_ID06.equals(interactionId) || EHR_EXTRACT_INTERACTION_ID07.equals(interactionId)) {
+                ehrExtractMessageHandler.handleMessage(inboundMessage, conversationId);
             } else if (CONTINUE_ATTACHMENT_INTERACTION_ID.equals(interactionId)) {
                 continueMessageHandler.handleMessage(inboundMessage, conversationId);
             } else {

diff --git a/...slator/src/main/java/uk/nhs/adaptors/pss/translator/task/scheduled/EHRTimeoutHandler.java b/...slator/src/main/java/uk/nhs/adaptors/pss/translator/task/scheduled/EHRTimeoutHandler.java
@@ -25,7 +25,7 @@
 
 import jakarta.xml.bind.JAXBException;
 
-import org.hl7.v3.RCMRIN030000UK06Message;
+import org.hl7.v3.RCMRIN030000UKMessage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -180,7 +180,7 @@ private void handleMigrationTimeout(PatientMigrationRequest migrationRequest, NA
 
     private void sendNackMessage(InboundMessage inboundMessage, String conversationId, NACKReason reason) throws JAXBException {
 
-        RCMRIN030000UK06Message payload = unmarshallString(inboundMessage.getPayload(), RCMRIN030000UK06Message.class);
+        RCMRIN030000UKMessage payload = unmarshallString(inboundMessage.getPayload(), RCMRIN030000UKMessage.class);
 
         NACKMessageData messageData = NACKMessageData
             .builder()

diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/util/OutboundMessageUtil.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/util/OutboundMessageUtil.java
@@ -1,11 +1,11 @@
 package uk.nhs.adaptors.pss.translator.util;
 
-import org.hl7.v3.RCMRIN030000UK06Message;
+import org.hl7.v3.RCMRIN030000UKMessage;
 import org.springframework.stereotype.Component;
 
 @Component
 public class OutboundMessageUtil {
-    public String parseFromAsid(RCMRIN030000UK06Message payload) {
+    public String parseFromAsid(RCMRIN030000UKMessage payload) {
         return payload.getCommunicationFunctionRcv()
             .get(0)
             .getDevice()
@@ -14,15 +14,15 @@ public String parseFromAsid(RCMRIN030000UK06Message payload) {
             .getExtension();
     }
 
-    public String parseToAsid(RCMRIN030000UK06Message payload) {
+    public String parseToAsid(RCMRIN030000UKMessage payload) {
         return payload.getCommunicationFunctionSnd()
             .getDevice()
             .getId()
             .get(0)
             .getExtension();
     }
 
-    public String parseToOdsCode(RCMRIN030000UK06Message payload) {
+    public String parseToOdsCode(RCMRIN030000UKMessage payload) {
         return payload.getControlActEvent()
             .getSubject()
             .getEhrExtract()
@@ -33,7 +33,7 @@ public String parseToOdsCode(RCMRIN030000UK06Message payload) {
             .getExtension();
     }
 
-    public String parseMessageRef(RCMRIN030000UK06Message payload) {
+    public String parseMessageRef(RCMRIN030000UKMessage payload) {
         return payload.getId().getRoot();
     }
 }