* Refactor package name to match naming conventions

Author: MartinWheelerMT

service/build.gradle

@@ -103,7 +103,7 @@ sourceSets {
 }
 
 task(interoperabilityTestingToolJsonToXml, dependsOn: 'classes', type: JavaExec) {
-	mainClass.set('uk.nhs.adaptors.gp2gp.transformjsontoxmltool.TransformJsonToXml')
+	mainClass.set('uk.nhs.adaptors.gp2gp.transformJsonToXmlTool.TransformJsonToXml')
 	classpath = sourceSets.main.runtimeClasspath
 }
 

service/src/main/java/uk/nhs/adaptors/gp2gp/transformJsonToXmlTool/TransformJsonToXml.java

@@ -1,4 +1,4 @@
-package uk.nhs.adaptors.gp2gp.transformjsontoxmltool;
+package uk.nhs.adaptors.gp2gp.transformJsonToXmlTool;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -56,7 +56,7 @@ public class TransformJsonToXml implements CommandLineRunner {
     private final MessageContext messageContext;
     private final OutputMessageWrapperMapper outputMessageWrapperMapper;
     private final EhrExtractMapper ehrExtractMapper;
-    private final uk.nhs.adaptors.gp2gp.transformjsontoxmltool.XmlSchemaValidator xmlSchemaValidator;
+    private final XmlSchemaValidator xmlSchemaValidator;
 
     public static void main(String[] args) {
         SpringApplication.run(TransformJsonToXml.class, args).close();

service/src/main/java/uk/nhs/adaptors/gp2gp/transformJsonToXmlTool/XmlSchemaValidator.java

@@ -1,4 +1,4 @@
-package uk.nhs.adaptors.gp2gp.transformjsontoxmltool;
+package uk.nhs.adaptors.gp2gp.transformJsonToXmlTool;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -34,7 +34,7 @@ public class XmlSchemaValidator {
     public void validateOutputToXmlSchema(String filename, String xmlResult) {
         LOGGER.info("Validating {} against {} schema", filename, RedactionsContext.REDACTION_INTERACTION_ID);
 
-        var xsdErrorHandler = new uk.nhs.adaptors.gp2gp.transformjsontoxmltool.XsdErrorHandler();
+        var xsdErrorHandler = new XsdErrorHandler();
         Validator xmlValidator;
 
         try {
@@ -66,10 +66,7 @@ public void validateOutputToXmlSchema(String filename, String xmlResult) {
         LOGGER.info("Successfully validated {} against {} schema", filename, RedactionsContext.REDACTION_INTERACTION_ID);
     }
 
-    private void writeValidationExceptionsToFile(
-        uk.nhs.adaptors.gp2gp.transformjsontoxmltool.XsdErrorHandler xsdErrorHandler,
-        String fileName
-    ) {
+    private void writeValidationExceptionsToFile(XsdErrorHandler xsdErrorHandler, String fileName) {
         String outputFileName = FilenameUtils.removeExtension(fileName) + ".validation-errors.log";
         try (BufferedWriter writer = new BufferedWriter(new FileWriter(OUTPUT_PATH + outputFileName, StandardCharsets.UTF_8))) {
             for (SAXParseException e : xsdErrorHandler.getExceptions()) {
@@ -83,7 +80,7 @@ private void writeValidationExceptionsToFile(
         }
     }
 
-    private Validator getXmlValidator(uk.nhs.adaptors.gp2gp.transformjsontoxmltool.XsdErrorHandler xsdErrorHandler) throws SAXException {
+    private Validator getXmlValidator(XsdErrorHandler xsdErrorHandler) throws SAXException {
         var schemaPath = RedactionsContext.REDACTION_INTERACTION_ID.equals(redactionsContext.ehrExtractInteractionId())
             ? RCMR_IN030000UK07_SCHEMA_PATH
             : RCMR_IN030000UK06_SCHEMA_PATH;

service/src/main/java/uk/nhs/adaptors/gp2gp/transformJsonToXmlTool/XsdErrorHandler.java

@@ -1,4 +1,4 @@
-package uk.nhs.adaptors.gp2gp.transformjsontoxmltool;
+package uk.nhs.adaptors.gp2gp.transformJsonToXmlTool;
 
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;