Pull request #126: Use content negotiation when reading resources fro…

…m remote URIs Merge in ITB/json-validator from development to master * commit '3119c2d9ba69adc03da43c15dc170ebd2938a869': Use content negotiation when reading resources from remote URIs
ISAITB · Jul 30, 2024 · 6d48c43 · 6d48c43
2 parents 46d797e + 3119c2d
commit 6d48c43
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
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
@@ -126,7 +126,7 @@ public ValidationResponse validate(@WebParam(name = "ValidateRequest", targetNam
 			ValueEmbeddingEnumeration contentEmbeddingMethod = inputHelper.validateContentEmbeddingMethod(validateRequest, ValidationConstants.INPUT_EMBEDDING_METHOD);
 			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, tempFolderPath);
+            File contentToValidate = inputHelper.validateContentToValidate(validateRequest, ValidationConstants.INPUT_CONTENT, contentEmbeddingMethod, null, tempFolderPath);
             String validationType = inputHelper.validateValidationType(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);

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
@@ -157,7 +157,7 @@ private TAR executeValidationProcess(Input in, DomainConfig domainConfig) {
             var contentEmbeddingMethod = inputHelper.getEmbeddingMethod(in.getEmbeddingMethod());
             var externalSchemaCombinationApproach = inputHelper.getValidationArtifactCombinationApproach(domainConfig, validationType, in.getExternalSchemaCombinationApproach());
             var externalSchemas = getExternalSchemas(domainConfig, in.getExternalSchemas(), validationType, null, parentFolder);
-            var contentToValidate = inputHelper.validateContentToValidate(in.getContentToValidate(), contentEmbeddingMethod, parentFolder);
+            var contentToValidate = inputHelper.validateContentToValidate(in.getContentToValidate(), contentEmbeddingMethod, null, parentFolder);
             var builder = ValidationSpecs.builder(contentToValidate, localiser, domainConfig)
                     .withValidationType(validationType)
                     .withExternalSchemas(externalSchemas, externalSchemaCombinationApproach);

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
@@ -459,7 +459,7 @@ private File getInputFile(String contentType, MultipartFile inputFile, String in
     private InputStream getInputStream(String contentType, InputStream inputStream, String uri, String string) {
         return switch (contentType) {
             case CONTENT_TYPE_FILE -> inputStream;
-            case CONTENT_TYPE_URI -> this.fileManager.getInputStreamFromURL(uri);
+            case CONTENT_TYPE_URI -> this.fileManager.getInputStreamFromURL(uri, null).stream();
             case CONTENT_TYPE_STRING -> new ByteArrayInputStream(string.getBytes());
             default -> null;
         };