* Rename package folder from transformJsonToXmlTool to transformjsontoxmltool to address checkstyle package name issues

MartinWheelerMT · MartinWheelerMT · commit 0a4534bf09a6 · 2025-05-22T11:45:45.000+01:00
diff --git a/service/build.gradle b/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
 }
 
@@ -172,7 +172,7 @@ sonar {
 		property("sonar.host.url", "https://sonarcloud.io")
 		property("sonar.projectKey", "NHSDigital_integration-adaptor-gp2gp")
 		property("sonar.organization", "nhsdigital")
-		property("sonar.exclusions", "**/transformJsonToXmlTool/*")
+		property("sonar.exclusions", "**/transformjsontoxmltool/*")
 	}
 }
 
diff --git a/service/src/main/java/uk/nhs/adaptors/gp2gp/transformjsontoxmltool/TransformJsonToXml.java b/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;
diff --git a/service/src/main/java/uk/nhs/adaptors/gp2gp/transformjsontoxmltool/XmlSchemaValidator.java b/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;
@@ -56,17 +56,17 @@ public void validateOutputToXmlSchema(String inputJsonFilename, String xmlResult
             var xmlResultSource = new StreamSource(new StringReader(xmlResult));
             xmlValidator.validate(xmlResultSource);
         } catch (SAXParseException parseException) {
-            LOGGER.info(FAILED_TO_VALIDATE_SCHEMA_TEMPLATE, inputJsonFilename, RedactionsContext.REDACTION_INTERACTION_ID);
+            LOGGER.warn(FAILED_TO_VALIDATE_SCHEMA_TEMPLATE, inputJsonFilename, RedactionsContext.REDACTION_INTERACTION_ID);
             writeValidationExceptionsToFile(xsdErrorHandler, inputJsonFilename);
         } catch (IOException e) {
-            LOGGER.info(COULD_NOT_READ_FROM_STREAM_SOURCE_TEMPLATE, inputJsonFilename);
+            LOGGER.error(COULD_NOT_READ_FROM_STREAM_SOURCE_TEMPLATE, inputJsonFilename);
             return;
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
 
         if (!xsdErrorHandler.isValid()) {
-            LOGGER.info(FAILED_TO_VALIDATE_SCHEMA_TEMPLATE, inputJsonFilename, RedactionsContext.REDACTION_INTERACTION_ID);
+            LOGGER.warn(FAILED_TO_VALIDATE_SCHEMA_TEMPLATE, inputJsonFilename, RedactionsContext.REDACTION_INTERACTION_ID);
             writeValidationExceptionsToFile(xsdErrorHandler, inputJsonFilename);
             return;
         }
@@ -102,4 +102,4 @@ private Validator getXmlValidator(XsdErrorHandler xsdErrorHandler) throws SAXExc
 
         return validator;
     }
-}
+}
diff --git a/service/src/main/java/uk/nhs/adaptors/gp2gp/transformjsontoxmltool/XsdErrorHandler.java b/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;

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ sourceSets {`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`task(interoperabilityTestingToolJsonToXml, dependsOn: 'classes', type: JavaExec) {`
`106`		`- mainClass.set('uk.nhs.adaptors.gp2gp.transformJsonToXmlTool.TransformJsonToXml')`
	`106`	`+ mainClass.set('uk.nhs.adaptors.gp2gp.transformjsontoxmltool.TransformJsonToXml')`
`107`	`107`	`classpath = sourceSets.main.runtimeClasspath`
`108`	`108`	`}`
`109`	`109`
`@@ -172,7 +172,7 @@ sonar {`
`172`	`172`	`property("sonar.host.url", "https://sonarcloud.io")`
`173`	`173`	`property("sonar.projectKey", "NHSDigital_integration-adaptor-gp2gp")`
`174`	`174`	`property("sonar.organization", "nhsdigital")`
`175`		`- property("sonar.exclusions", "*/transformJsonToXmlTool/")`
	`175`	`+ property("sonar.exclusions", "*/transformjsontoxmltool/")`
`176`	`176`	`}`
`177`	`177`	`}`
`178`	`178`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package uk.nhs.adaptors.gp2gp.transformJsonToXmlTool;`
	`1`	`+package uk.nhs.adaptors.gp2gp.transformjsontoxmltool;`
`2`	`2`
`3`	`3`	`import java.io.BufferedWriter;`
`4`	`4`	`import java.io.File;`