Refactoring updates

ISAITB · Jan 7, 2025 · db95221 · db95221
1 parent 7809ccb
commit db95221
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/csvvalidator-service/src/main/java/eu/europa/ec/itb/csv/gitb/ValidationServiceImpl.java b/csvvalidator-service/src/main/java/eu/europa/ec/itb/csv/gitb/ValidationServiceImpl.java
@@ -164,7 +164,7 @@ public ValidationResponse validate(@WebParam(name = "ValidateRequest", targetNam
         try {
             // Validation of the input data
             ValueEmbeddingEnumeration contentEmbeddingMethod = inputHelper.validateContentEmbeddingMethod(validateRequest, ValidationConstants.INPUT_EMBEDDING_METHOD);
-            File contentToValidate = inputHelper.validateContentToValidate(validateRequest, ValidationConstants.INPUT_CONTENT, contentEmbeddingMethod, null, tempFolderPath, domainConfig.getHttpVersion());
+            File contentToValidate = inputHelper.validateContentToValidate(validateRequest, ValidationConstants.INPUT_CONTENT, contentEmbeddingMethod, null, tempFolderPath, domainConfig.getHttpVersion()).getFile();
             String validationType = inputHelper.validateValidationType(domainConfig, validateRequest, ValidationConstants.INPUT_VALIDATION_TYPE);
             List<FileInfo> externalSchemas = inputHelper.validateExternalArtifacts(domainConfig, validateRequest, ValidationConstants.INPUT_EXTERNAL_SCHEMA, ValidationConstants.INPUT_EXTERNAL_SCHEMA_CONTENT, ValidationConstants.INPUT_EMBEDDING_METHOD, validationType, null, tempFolderPath);
             boolean addInputToReport = getInputAsBoolean(validateRequest, ValidationConstants.INPUT_ADD_INPUT_TO_REPORT, true);

diff --git a/csvvalidator-service/src/main/java/eu/europa/ec/itb/csv/rest/RestValidationController.java b/csvvalidator-service/src/main/java/eu/europa/ec/itb/csv/rest/RestValidationController.java
@@ -153,7 +153,7 @@ private TAR executeValidationProcess(Input in, DomainConfig domainConfig) {
             var addInputToReport = Objects.requireNonNullElse(in.getAddInputToReport(), false);
             var contentEmbeddingMethod = inputHelper.getEmbeddingMethod(in.getEmbeddingMethod());
             var externalSchemas = getExternalSchemas(domainConfig, in.getExternalSchemas(), validationType, null, parentFolder);
-            var contentToValidate = inputHelper.validateContentToValidate(in.getContentToValidate(), contentEmbeddingMethod, null, parentFolder, domainConfig.getHttpVersion());
+            var contentToValidate = inputHelper.validateContentToValidate(in.getContentToValidate(), contentEmbeddingMethod, null, parentFolder, domainConfig.getHttpVersion()).getFile();
             // CSV settings.
             Boolean inputHeaders = validateAndGetSyntaxInput(in.getHasHeaders(), ValidationConstants.INPUT_HAS_HEADERS, domainConfig.getCsvOptions().getUserInputForHeader().get(validationType), Boolean::valueOf);
             String inputDelimiter = validateAndGetSyntaxInput(in.getDelimiter(), ValidationConstants.INPUT_DELIMITER, domainConfig.getCsvOptions().getUserInputForDelimiter().get(validationType), s -> s);