Quality fixes

Author: costas80

jsonvalidator-common/src/main/java/eu/europa/ec/itb/json/InputHelper.java

@@ -24,7 +24,7 @@
 
 /**
  * Component to facilitate the validation and preparation of inputs.
- *
+ * <p>
  * This class serves simply as a marked to include the parent component as-is.
  */
 @Component

jsonvalidator-common/src/main/java/eu/europa/ec/itb/json/validation/JSONValidator.java

@@ -35,7 +35,7 @@
 import eu.europa.ec.itb.validation.plugin.PluginManager;
 import eu.europa.ec.itb.validation.plugin.ValidationPlugin;
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.apache.commons.lang3.tuple.Pair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -376,7 +376,7 @@ private Function<ValidationMessage, String> getLocationMapper() {
     private List<Message> validateAgainstSchema(File schemaFile) {
         var schemaInfo = readSchema(schemaFile.toPath());
         var locationMapper = getLocationMapper();
-        return schemaInfo.getLeft().validate(getContentNode(schemaInfo.getRight())).stream().map(message -> new Message(StringUtils.removeStart(message.getMessage(), "[] "), locationMapper.apply(message))).toList();
+        return schemaInfo.getLeft().validate(getContentNode(schemaInfo.getRight())).stream().map(message -> new Message(Strings.CS.removeStart(message.getMessage(), "[] "), locationMapper.apply(message))).toList();
     }
 
     /**

jsonvalidator-common/src/main/java/eu/europa/ec/itb/json/validation/LocalSchemaCache.java

@@ -19,14 +19,14 @@
 import eu.europa.ec.itb.json.ApplicationConfig;
 import eu.europa.ec.itb.json.DomainConfig;
 import eu.europa.ec.itb.json.DomainConfigCache;
+import jakarta.annotation.PostConstruct;
 import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import jakarta.annotation.PostConstruct;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
@@ -139,7 +139,7 @@ private void readSchemaIdsAndPaths(DomainConfig domainConfig) throws IOException
      * @return The key to use.
      */
     private String schemaKey(DomainConfig domainConfig, String id) {
-        return StringUtils.appendIfMissing(String.format("com.gitb.domain.%s|%s", domainConfig.getDomain(), id), "#");
+        return Strings.CS.appendIfMissing(String.format("com.gitb.domain.%s|%s", domainConfig.getDomain(), id), "#");
     }
 
     /**

jsonvalidator-common/src/main/java/eu/europa/ec/itb/json/validation/LocalSchemaResolver.java

@@ -20,7 +20,7 @@
 import com.networknt.schema.resource.SchemaLoader;
 import com.networknt.schema.resource.UriSchemaLoader;
 import eu.europa.ec.itb.json.DomainConfig;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -56,7 +56,7 @@ public LocalSchemaResolver(DomainConfig domain, LocalSchemaCache localSchemaCach
      */
     @Override
     public InputStreamSource getSchema(AbsoluteIri absoluteIri) {
-        String idToCheck = StringUtils.appendIfMissing(absoluteIri.toString(), "#");
+        String idToCheck = Strings.CS.appendIfMissing(absoluteIri.toString(), "#");
         var schema = localSchemaCache.getSchemaForId(domain, idToCheck);
         if (schema.isEmpty()) {
             LOG.debug("Schema with URI {} not found locally. Looking up remotely.", absoluteIri);

jsonvalidator-common/src/main/java/eu/europa/ec/itb/json/validation/SchemaResolutionState.java

@@ -22,7 +22,7 @@
 
 /**
  * Class to record the thread-specific state when resolving a given schema.
- *
+ * <p>
  * This state is used for two reasons:
  * - To pass the domain in question.
  * - To ensure that we don't end up with cyclic dependencies that could lead to infinite lookups.

jsonvalidator-jar/src/main/java/eu/europa/ec/itb/json/standalone/ValidationRunner.java

@@ -118,11 +118,11 @@ protected void bootstrapInternal(String[] args, File parentFolder) {
             externalSchemaCombinationApproach = inputHelper.getValidationArtifactCombinationApproach(domainConfig, validationType, schemaCombinationApproachValue);
         } catch (ValidatorException e) {
             LOGGER_FEEDBACK.info("\nInvalid arguments provided: {}\n", e.getMessageForDisplay(new LocalisationHelper(domainConfig, Locale.ENGLISH)));
-            LOGGER.error(String.format("Invalid arguments provided: %s", e.getMessageForLog()), e);
+            LOGGER.error("Invalid arguments provided: {}", e.getMessageForLog(), e);
             inputs.clear();
         } catch (IllegalArgumentException e) {
             LOGGER_FEEDBACK.info("\nInvalid arguments provided: {}\n", e.getMessage());
-            LOGGER.error(String.format("Invalid arguments provided: %s", e.getMessage()), e);
+            LOGGER.error("Invalid arguments provided: {}", e.getMessage(), e);
             inputs.clear();
         } catch (Exception e) {
             LOGGER_FEEDBACK.info("\nAn error occurred while processing the provided arguments.\n");
@@ -177,12 +177,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++;

jsonvalidator-service/src/main/java/eu/europa/ec/itb/json/gitb/ValidationServiceConfig.java

@@ -21,6 +21,7 @@
 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;
@@ -77,7 +78,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");

jsonvalidator-service/src/main/java/eu/europa/ec/itb/json/gitb/ValidationServiceImpl.java

@@ -128,7 +128,7 @@ private boolean definesTypeWithExternalSchemas() {
 
     /**
      * The validate operation is called to validate the input and produce a validation report.
-     *
+     * <p>
      * The expected input is described for the service's client through the getModuleDefinition call.
      *
      * @param validateRequest The input parameters and configuration for the validation.