Quality fixes

Author: costas80

xmlvalidator-common/src/main/java/eu/europa/ec/itb/xml/validation/DocumentNamespaceContext.java

@@ -25,7 +25,7 @@
 
 /**
  * A namespace context to lookup and map namespaces based on prefix and URI.
- *
+ * <p>
  * Implementation based on source found <a href="http://www.ibm.com/developerworks/library/x-nmspccontext/">here</a>.
  */
 public class DocumentNamespaceContext implements NamespaceContext {

xmlvalidator-common/src/main/java/eu/europa/ec/itb/xml/validation/XSDFileResolver.java

@@ -124,7 +124,7 @@ public LSInput resolveResource(String type, String namespaceURI, String publicId
         try {
             return new LSInputImpl(publicId, systemId, baseURI, new InputStreamReader(new FileInputStream(referencedSchemaFile)));
         } catch (FileNotFoundException e) {
-            LOG.error("The referenced schema with system ID ["+systemId+"] could not be located at ["+referencedSchemaFile.getAbsolutePath()+"].", e);
+            LOG.error("The referenced schema with system ID [{}] could not be located at [{}].", systemId, referencedSchemaFile.getAbsolutePath(), e);
             throw new IllegalStateException("The referenced schema with system ID ["+systemId+"] could not be located.", e);
         }
     }

xmlvalidator-common/src/main/java/eu/europa/ec/itb/xml/validation/XSDReportHandler.java

@@ -56,8 +56,7 @@ public XSDReportHandler() {
     @Override
     public void warning(SAXParseException exception) throws SAXException {
         if (logger.isDebugEnabled()) {
-            logger.debug("warning: <"+exception.getLineNumber() + "," +
-                    exception.getColumnNumber() + ">" + exception.getMessage());
+            logger.debug("warning: <{},{}>{}", exception.getLineNumber(), exception.getColumnNumber(), exception.getMessage());
         }
         BAR warning = new BAR();
         warning.setDescription( exception.getMessage());
@@ -75,8 +74,7 @@ public void warning(SAXParseException exception) throws SAXException {
     @Override
     public void error(SAXParseException exception) throws SAXException {
         if (logger.isDebugEnabled()) {
-            logger.debug("error: <" + exception.getLineNumber() + "," +
-                    exception.getColumnNumber() + ">" + exception.getMessage());
+            logger.debug("error: <{},{}>{}", exception.getLineNumber(), exception.getColumnNumber(), exception.getMessage());
         }
         report.setResult(TestResultType.FAILURE);
         BAR error = new BAR();
@@ -95,8 +93,7 @@ public void error(SAXParseException exception) throws SAXException {
     @Override
     public void fatalError(SAXParseException exception) throws SAXException {
         if (logger.isDebugEnabled()) {
-            logger.debug("fatal error: <" + exception.getLineNumber() + "," +
-                    exception.getColumnNumber() + ">" + exception.getMessage());
+            logger.debug("fatal error: <{},{}>{}", exception.getLineNumber(), exception.getColumnNumber(), exception.getMessage());
         }
         report.setResult(TestResultType.FAILURE);
         BAR error = new BAR();

xmlvalidator-common/src/test/java/eu/europa/ec/itb/xml/util/UtilsTest.java

@@ -8,7 +8,6 @@
 import static eu.europa.ec.itb.xml.util.Utils.secureSchemaValidation;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 class UtilsTest {

xmlvalidator-jar/src/main/java/eu/europa/ec/itb/xml/standalone/ValidationRunner.java

@@ -218,12 +218,12 @@ protected void bootstrapInternal(String[] args, File parentFolder) {
                     }
                 } catch (ValidatorException e) {
                     LOGGER_FEEDBACK.info("\nAn error occurred while executing the validation: {}", e.getMessageForDisplay(localiser));
-                    LOGGER.error(String.format("An error occurred while executing the validation: %s", e.getMessageForLog()), e);
+                    LOGGER.error("An error occurred while executing the validation: {}", e.getMessageForLog(), e);
                     break;
 
                 } catch (Exception e) {
                     LOGGER_FEEDBACK.info("\nAn error occurred while executing the validation.");
-                    LOGGER.error(String.format("An error occurred while executing the validation: %s", e.getMessage()), e);
+                    LOGGER.error("An error occurred while executing the validation: {}", e.getMessage(), e);
                     break;
                 }
                 i++;

xmlvalidator-web/src/main/java/eu/europa/ec/itb/xml/upload/UploadController.java

@@ -262,7 +262,7 @@ public UploadResult<Translations> handleUpload(@PathVariable("domain") String do
                         result.setMessage(localisationHelper.localise("validator.label.exception.providedInputNotXML"));
                     }
                 } catch (IOException e) {
-                    logger.error("Error while reading uploaded file [" + e.getMessage() + "]", e);
+                    logger.error("Error while reading uploaded file [{}]", e.getMessage(), e);
                     result.setMessage(localisationHelper.localise("validator.label.exception.errorInUpload", e.getMessage()));
                     proceedToValidate = false;
                 }
@@ -277,7 +277,7 @@ public UploadResult<Translations> handleUpload(@PathVariable("domain") String do
                     } catch (ValidatorException e) {
                         throw e;
                     } catch (Exception e) {
-                        logger.error("Error while reading uploaded file [" + e.getMessage() + "]", e);
+                        logger.error("Error while reading uploaded file [{}]", e.getMessage(), e);
                         result.setMessage(localisationHelper.localise("validator.label.exception.errorInUpload", e.getMessage()));
                         proceedToValidate = false;
                     }
@@ -317,7 +317,7 @@ public UploadResult<Translations> handleUpload(@PathVariable("domain") String do
                                     fileName, report, aggregateReport,
                                     new Translations(localisationHelper, report, config));
                         } catch (IOException e) {
-                            logger.error("Error generating detailed report [" + e.getMessage() + "]", e);
+                            logger.error("Error generating detailed report [{}]", e.getMessage(), e);
                             result.setMessage(localisationHelper.localise("validator.label.exception.errorGeneratingDetailedReport", e.getMessage()));
                         }
                     }
@@ -326,7 +326,7 @@ public UploadResult<Translations> handleUpload(@PathVariable("domain") String do
                 logger.error(e.getMessageForLog(), e);
                 result.setMessage(e.getMessageForDisplay(localisationHelper));
             } catch (Exception e) {
-                logger.error("An error occurred during the validation [" + e.getMessage() + "]", e);
+                logger.error("An error occurred during the validation [{}]", e.getMessage(), e);
                 if (e.getMessage() != null) {
                     result.setMessage(localisationHelper.localise("validator.label.exception.unexpectedErrorDuringValidationWithParams", e.getMessage()));
                 } else {

xmlvalidator-ws/src/main/java/eu/europa/ec/itb/xml/ws/ValidationServiceConfig.java

@@ -15,11 +15,13 @@
 
 package eu.europa.ec.itb.xml.ws;
 
+import eu.europa.ec.itb.validation.commons.ValidatorChannel;
 import eu.europa.ec.itb.xml.ApplicationConfig;
 import eu.europa.ec.itb.xml.DomainConfig;
 import eu.europa.ec.itb.xml.DomainConfigCache;
-import eu.europa.ec.itb.validation.commons.ValidatorChannel;
+import jakarta.annotation.PostConstruct;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.apache.cxf.Bus;
 import org.apache.cxf.jaxws.EndpointImpl;
 import org.apache.cxf.transport.servlet.CXFServlet;
@@ -29,7 +31,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import jakarta.annotation.PostConstruct;
 import javax.xml.namespace.QName;
 
 /**
@@ -72,7 +73,7 @@ public void publishValidationServices() {
                 endpoint.setEndpointName(new QName("http://www.gitb.com/vs/v1/", "ValidationServicePort"));
                 endpoint.setServiceName(new QName("http://www.gitb.com/vs/v1/", "ValidationService"));
                 if (StringUtils.isNotBlank(config.getBaseSoapEndpointUrl())) {
-                    var url = StringUtils.appendIfMissing(config.getBaseSoapEndpointUrl(), "/");
+                    var url = Strings.CS.appendIfMissing(config.getBaseSoapEndpointUrl(), "/");
                     endpoint.setPublishedEndpointUrl(url+domainConfig.getDomainName()+"/validation");
                 }
                 endpoint.publish("/"+domainConfig.getDomainName()+"/validation");