Pull request #152: Development

costas80 · costas80 · commit 21ddfd204888 · 2025-07-25T14:05:09.000+02:00
Merge in ITB/json-validator from development to master

* commit '34769dacabe5513f14690e8e8ddc47c4dafbda89':
  Quality fixes
  Upgrade Spring Boot to v3.5.4 and Tika to v3.2.1
  Support for domain aliases
diff --git a/NOTICE.md b/NOTICE.md
diff --git a/jsonvalidator-common/src/main/java/eu/europa/ec/itb/json/InputHelper.java b/jsonvalidator-common/src/main/java/eu/europa/ec/itb/json/InputHelper.java
@@ -19,12 +19,12 @@
 import eu.europa.ec.itb.validation.commons.BaseInputHelper;
 import eu.europa.ec.itb.validation.commons.artifact.ValidationArtifactCombinationApproach;
 import eu.europa.ec.itb.validation.commons.error.ValidatorException;
-import org.apache.tika.utils.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
 /**
  * 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
diff --git a/jsonvalidator-common/src/main/java/eu/europa/ec/itb/json/validation/JSONValidator.java b/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();
     }
 
     /**
diff --git a/jsonvalidator-common/src/main/java/eu/europa/ec/itb/json/validation/LocalSchemaCache.java b/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), "#");
     }
 
     /**
diff --git a/jsonvalidator-common/src/main/java/eu/europa/ec/itb/json/validation/LocalSchemaResolver.java b/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);
diff --git a/jsonvalidator-common/src/main/java/eu/europa/ec/itb/json/validation/SchemaResolutionState.java b/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.
diff --git a/jsonvalidator-jar/src/main/java/eu/europa/ec/itb/json/standalone/ValidationRunner.java b/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++;
diff --git a/jsonvalidator-service/src/main/java/eu/europa/ec/itb/json/gitb/ValidationServiceConfig.java b/jsonvalidator-service/src/main/java/eu/europa/ec/itb/json/gitb/ValidationServiceConfig.java
@@ -19,7 +19,9 @@
 import eu.europa.ec.itb.json.DomainConfig;
 import eu.europa.ec.itb.json.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,11 +73,12 @@ public ServletRegistrationBean<CXFServlet> servletRegistrationBean(ApplicationCo
     public void publishValidationServices() {
     	for (DomainConfig domainConfig: domainConfigCache.getAllDomainConfigurations()) {
             if (domainConfig.getChannels().contains(ValidatorChannel.SOAP_API)) {
-                EndpointImpl endpoint = new EndpointImpl(cxfBus, applicationContext.getBean(ValidationServiceImpl.class, domainConfig));
+                DomainConfig resolvedDomainConfig = domainConfigCache.getConfigForDomainName(domainConfig.getDomainName());
+                EndpointImpl endpoint = new EndpointImpl(cxfBus, applicationContext.getBean(ValidationServiceImpl.class, resolvedDomainConfig, domainConfig));
                 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");
diff --git a/jsonvalidator-service/src/main/java/eu/europa/ec/itb/json/gitb/ValidationServiceImpl.java b/jsonvalidator-service/src/main/java/eu/europa/ec/itb/json/gitb/ValidationServiceImpl.java
@@ -57,6 +57,7 @@ public class ValidationServiceImpl implements ValidationService, WebServiceConte
 
     private static final Logger logger = LoggerFactory.getLogger(ValidationServiceImpl.class);
     private final DomainConfig domainConfig;
+    private final DomainConfig requestedDomainConfig;
 
     @Autowired
     private ApplicationContext ctx = null;
@@ -71,9 +72,11 @@ public class ValidationServiceImpl implements ValidationService, WebServiceConte
      * Constructor.
      *
      * @param domainConfig The domain configuration (each domain has its own instance).
+     * @param requestedDomainConfig The resolved domain configuration (in case of aliases).
      */
-    public ValidationServiceImpl(DomainConfig domainConfig) {
+    public ValidationServiceImpl(DomainConfig domainConfig, DomainConfig requestedDomainConfig) {
         this.domainConfig = domainConfig;
+        this.requestedDomainConfig = requestedDomainConfig;
     }
     
     /**
@@ -125,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.
@@ -142,7 +145,7 @@ public ValidationResponse validate(@WebParam(name = "ValidateRequest", targetNam
 			boolean locationAsPointer = getInputAsBoolean(validateRequest, ValidationConstants.INPUT_LOCATION_AS_POINTER, false);
             boolean addInputToReport = getInputAsBoolean(validateRequest, ValidationConstants.INPUT_ADD_INPUT_TO_REPORT, true);
             File contentToValidate = inputHelper.validateContentToValidate(validateRequest, ValidationConstants.INPUT_CONTENT, contentEmbeddingMethod, null, tempFolderPath, domainConfig.getHttpVersion()).getFile();
-            String validationType = inputHelper.validateValidationType(domainConfig, validateRequest, ValidationConstants.INPUT_VALIDATION_TYPE);
+            String validationType = inputHelper.validateValidationType(requestedDomainConfig.getDomainName(), domainConfig, validateRequest, ValidationConstants.INPUT_VALIDATION_TYPE);
             List<FileInfo> externalSchemas = inputHelper.validateExternalArtifacts(domainConfig, validateRequest, ValidationConstants.INPUT_EXTERNAL_SCHEMAS, ValidationConstants.INPUT_EXTERNAL_SCHEMAS_SCHEMA, ValidationConstants.INPUT_EMBEDDING_METHOD, validationType, null, tempFolderPath);
             ValidationArtifactCombinationApproach externalSchemaCombinationApproach = validateExternalSchemaCombinationApproach(validateRequest, validationType);
             ValidationResponse result = new ValidationResponse();
diff --git a/jsonvalidator-service/src/main/java/eu/europa/ec/itb/json/rest/RestValidationController.java b/jsonvalidator-service/src/main/java/eu/europa/ec/itb/json/rest/RestValidationController.java
@@ -136,6 +136,8 @@ public ResponseEntity<StreamingResponseBody> validate(
             HttpServletRequest request
     ) {
         DomainConfig domainConfig = validateDomain(domain);
+        // Consider the case that we have a cross-domain alias and resolve the validation type accordingly.
+        in.setValidationType(inputHelper.determineValidationType(in.getValidationType(), domain, domainConfig));
         /*
          * Important: We call executeValidationProcess here and not in the return statement because the StreamingResponseBody
          * uses a separate thread. Doing so would break the ThreadLocal used in the statistics reporting.
@@ -269,6 +271,8 @@ public Output[] validateMultiple(
         var outputs = new ArrayList<Output>(inputs.length);
         for (Input input: inputs) {
             Output output = new Output();
+            // Consider the case that we have a cross-domain alias and resolve the validation type accordingly.
+            input.setValidationType(inputHelper.determineValidationType(input.getValidationType(), domain, domainConfig));
             var report = executeValidationProcess(input, domainConfig);
             try (var bos = new ByteArrayOutputStream()) {
                 var wrapReportDataInCDATA = Objects.requireNonNullElse(input.getWrapReportDataInCDATA(), false);
diff --git a/jsonvalidator-service/src/test/java/eu/europa/ec/itb/json/gitb/ValidationServiceImplTest.java b/jsonvalidator-service/src/test/java/eu/europa/ec/itb/json/gitb/ValidationServiceImplTest.java
@@ -37,7 +37,7 @@ void testGetModuleDefinition() {
                 ValidationConstants.INPUT_ADD_INPUT_TO_REPORT, "Description of INPUT_ADD_INPUT_TO_REPORT",
                 ValidationConstants.INPUT_LOCALE, "Description of INPUT_LOCALE"
         )).when(domainConfig).getWebServiceDescription();
-        var service = new ValidationServiceImpl(domainConfig);
+        var service = new ValidationServiceImpl(domainConfig, domainConfig);
         var result = service.getModuleDefinition(new Void());
         assertNotNull(result);
         assertNotNull(result.getModule());
diff --git a/jsonvalidator-web/src/main/java/eu/europa/ec/itb/json/web/UploadController.java b/jsonvalidator-web/src/main/java/eu/europa/ec/itb/json/web/UploadController.java
@@ -18,6 +18,7 @@
 import eu.europa.ec.itb.json.ApplicationConfig;
 import eu.europa.ec.itb.json.DomainConfig;
 import eu.europa.ec.itb.json.DomainConfigCache;
+import eu.europa.ec.itb.json.InputHelper;
 import eu.europa.ec.itb.json.validation.FileManager;
 import eu.europa.ec.itb.json.validation.JSONValidator;
 import eu.europa.ec.itb.json.validation.ValidationSpecs;
@@ -70,6 +71,8 @@ public class UploadController extends BaseUploadController<DomainConfig, DomainC
     @Autowired
     private FileManager fileManager = null;
     @Autowired
+    private InputHelper inputHelper = null;
+    @Autowired
     private BeanFactory beans = null;
     @Autowired
     private ApplicationConfig appConfig = null;
@@ -172,9 +175,10 @@ public UploadResult<Translations> handleUpload(@PathVariable("domain") String do
         var localisationHelper = new LocalisationHelper(config, localeResolver.resolveLocale(request, response, config, appConfig));
         var result = new UploadResult<>();
 
-        if (StringUtils.isBlank(validationType)) {
-            validationType = config.getType().get(0);
+        if (!isOwnSubmission(request)) {
+            validationType = inputHelper.determineValidationType(validationType, domain, config);
         }
+        validationType = inputHelper.validateValidationType(config, validationType);
         if (config.hasMultipleValidationTypes() && (validationType == null || !config.getType().contains(validationType))) {
             // A validation type is required.
             result.setMessage(localisationHelper.localise("validator.label.exception.providedValidationTypeNotValid"));
