Support for domain aliases

Author: costas80

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

@@ -155,7 +155,7 @@ protected void bootstrapInternal(String[] args, File parentFolder) {
             contextFileInfo = processContextFiles(domainConfig, validationType, contextFileInputs, parentFolder);
         } catch (ValidatorException e) {
             LOGGER_FEEDBACK.info("\nInvalid arguments provided: {}\n", e.getMessageForDisplay(new LocalisationHelper(Locale.ENGLISH)));
-            LOGGER.error(String.format("Invalid arguments provided: %s", e.getMessageForLog()), e);
+            LOGGER.error("Invalid arguments provided: {}", e.getMessageForLog(), e);
             inputs.clear();
         } catch (Exception e) {
             LOGGER_FEEDBACK.info("\nAn error occurred while processing the provided arguments.\n");

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

@@ -243,9 +243,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"));

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

@@ -164,6 +164,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.
@@ -306,6 +308,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);

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

@@ -67,7 +67,8 @@ 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())) {

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

@@ -63,6 +63,7 @@ public class ValidationServiceImpl implements com.gitb.vs.ValidationService, Web
 
     private static final Logger logger = LoggerFactory.getLogger(ValidationServiceImpl.class);
     private final DomainConfig domainConfig;
+    private final DomainConfig requestedDomainConfig;
 
     @Autowired
     InputHelper inputHelper;
@@ -73,8 +74,15 @@ public class ValidationServiceImpl implements com.gitb.vs.ValidationService, Web
     @Resource
     WebServiceContext wsContext;
 
-    public ValidationServiceImpl(DomainConfig domainConfig) {
+    /**
+     * 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, DomainConfig requestedDomainConfig) {
         this.domainConfig = domainConfig;
+        this.requestedDomainConfig = requestedDomainConfig;
     }
 
     @Override
@@ -119,7 +127,7 @@ public ValidationResponse validate(@WebParam(name = "ValidateRequest", targetNam
             boolean addInputToReport = getInputAsBoolean(validateRequest, ValidationConstants.INPUT_ADD_INPUT_TO_REPORT, true);
             boolean showLocationPaths = getInputAsBoolean(validateRequest, ValidationConstants.INPUT_SHOW_LOCATION_PATHS, domainConfig.isIncludeLocationPath());
             File contentToValidate = inputHelper.validateContentToValidate(validateRequest, ValidationConstants.INPUT_XML, contentEmbeddingMethod, null, tempFolderPath, domainConfig.getHttpVersion()).getFile();
-            String validationType = inputHelper.validateValidationType(domainConfig, validateRequest, ValidationConstants.INPUT_TYPE);
+            String validationType = inputHelper.validateValidationType(requestedDomainConfig.getDomainName(), domainConfig, validateRequest, ValidationConstants.INPUT_TYPE);
             List<FileInfo> externalSchemas = inputHelper.validateExternalArtifacts(domainConfig, validateRequest, ValidationConstants.INPUT_EXTERNAL_SCHEMA, ValidationConstants.INPUT_EXTERNAL_ARTIFACT_CONTENT, ValidationConstants.INPUT_EMBEDDING_METHOD, validationType, DomainConfig.ARTIFACT_TYPE_SCHEMA, tempFolderPath);
             List<FileInfo> externalSchematron = inputHelper.validateExternalArtifacts(domainConfig, validateRequest, ValidationConstants.INPUT_EXTERNAL_SCHEMATRON, ValidationConstants.INPUT_EXTERNAL_ARTIFACT_CONTENT, ValidationConstants.INPUT_EMBEDDING_METHOD, validationType, DomainConfig.ARTIFACT_TYPE_SCHEMATRON, tempFolderPath);
             List<ContextFileData> contextFiles = getContextFiles(domainConfig, validateRequest, validationType, tempFolderPath);

xmlvalidator-ws/src/test/java/eu/europa/ec/itb/xml/ws/ValidationServiceImplTest.java

@@ -47,7 +47,7 @@ void testGetModuleDefinition() {
                 descriptionEntryOf(ValidationConstants.INPUT_EXTERNAL_SCHEMATRON),
                 descriptionEntryOf(ValidationConstants.INPUT_LOCALE)
         )).when(domainConfig).getWebServiceDescription();
-        var service = new ValidationServiceImpl(domainConfig);
+        var service = new ValidationServiceImpl(domainConfig, domainConfig);
         service.inputHelper = inputHelper;
         var result = service.getModuleDefinition(new Void());
         assertNotNull(result);