Merge branch 'bugfix/asset_validation' into 'master'

hotfix/asset_validation

See merge request upm-inesdata/inesdata-connector!46

Author: ralconada-gmv

extensions/asset-validator/src/main/java/org/upm/inesdata/validator/InesdataAssetValidator.java

@@ -47,6 +47,10 @@ public class InesdataAssetValidator {
     public static final String PROPERTY_ASSET_TYPE = EDC_NAMESPACE + "assetType";
     public static final String PROPERTY_KEYWORD = DCAT_SCHEMA + "keyword";
     public static final String PROPERTY_AMAZONS3_REGION = EDC_NAMESPACE + "region";
+    public static final String PROPERTY_AMAZONS3_BUCKET_NAME = EDC_NAMESPACE + "bucketName";
+    public static final String PROPERTY_AMAZONS3_ACCESS_KEY_ID = EDC_NAMESPACE + "accessKeyId";
+    public static final String PROPERTY_AMAZONS3_SECRET_ACCESS_KEY = EDC_NAMESPACE + "secretAccessKey";
+    public static final String PROPERTY_AMAZONS3_ENDPOINT_OVERRIDE = EDC_NAMESPACE + "endpointOverride";
     public static final String PROPERTY_HTTP_DATA_BASE_URL = EDC_NAMESPACE + "baseUrl";
     public static final String PROPERTY_ASSET_DATA = EDC_NAMESPACE + "assetData";
 
@@ -184,6 +188,34 @@ private ValidationResult validateAmazonS3(JsonObject dataAddress) {
                 ));
             }
 
+            if (extractValueFromJsonArray(dataAddress, PROPERTY_AMAZONS3_BUCKET_NAME) == null) {
+                violations.add(violation(
+                        "Field 'https://w3id.org/edc/v0.0.1/ns/bucketName' is required for AmazonS3 DataAddress type",
+                        PROPERTY_AMAZONS3_BUCKET_NAME
+                ));
+            }
+
+            if (extractValueFromJsonArray(dataAddress, PROPERTY_AMAZONS3_ACCESS_KEY_ID) == null) {
+                violations.add(violation(
+                        "Field 'https://w3id.org/edc/v0.0.1/ns/accessKeyId' is required for AmazonS3 DataAddress type",
+                        PROPERTY_AMAZONS3_ACCESS_KEY_ID
+                ));
+            }
+
+            if (extractValueFromJsonArray(dataAddress, PROPERTY_AMAZONS3_SECRET_ACCESS_KEY) == null) {
+                violations.add(violation(
+                        "Field 'https://w3id.org/edc/v0.0.1/ns/secretAccessKey' is required for AmazonS3 DataAddress type",
+                        PROPERTY_AMAZONS3_SECRET_ACCESS_KEY
+                ));
+            }
+
+            if (extractValueFromJsonArray(dataAddress, PROPERTY_AMAZONS3_ENDPOINT_OVERRIDE) == null) {
+                violations.add(violation(
+                        "Field 'https://w3id.org/edc/v0.0.1/ns/endpointOverride' is required for AmazonS3 DataAddress type",
+                        PROPERTY_AMAZONS3_ENDPOINT_OVERRIDE
+                ));
+            }
+
             return violations.isEmpty() ? ValidationResult.success() : ValidationResult.failure(violations);
         }
 

gradle.properties

@@ -2,4 +2,4 @@
 # externally before calling the sonar task
 # Included here to avoid annoying warnings in all tasks (happens in configure stage)
 systemProp.sonar.gradle.skipCompile=true
-version=0.9.0
+version=0.9.1