fix: use the getStringProperty method of the DataAddress (#56)

* fix: use the getStringProperty method of the DataAddress * DEPENDENCIES
eclipse-edc · Aug 18, 2023 · 19ca63b · 19ca63b
1 parent 62c3123
commit 19ca63b
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 23 deletions.
diff --git a/DEPENDENCIES b/DEPENDENCIES
@@ -46,9 +46,9 @@ maven/mavencentral/io.netty/netty-resolver/4.1.94.Final, Apache-2.0 AND BSD-3-Cl
 maven/mavencentral/io.netty/netty-transport-classes-epoll/4.1.94.Final, Apache-2.0, approved, #6366
 maven/mavencentral/io.netty/netty-transport-native-unix-common/4.1.94.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
 maven/mavencentral/io.netty/netty-transport/4.1.94.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.opentelemetry.instrumentation/opentelemetry-instrumentation-annotations/1.28.0, Apache-2.0, approved, #9662
-maven/mavencentral/io.opentelemetry/opentelemetry-api/1.28.0, Apache-2.0, approved, #9661
-maven/mavencentral/io.opentelemetry/opentelemetry-context/1.28.0, Apache-2.0, approved, #9663
+maven/mavencentral/io.opentelemetry.instrumentation/opentelemetry-instrumentation-annotations/1.29.0, , restricted, clearlydefined
+maven/mavencentral/io.opentelemetry/opentelemetry-api/1.29.0, , restricted, clearlydefined
+maven/mavencentral/io.opentelemetry/opentelemetry-context/1.29.0, , restricted, clearlydefined
 maven/mavencentral/jakarta.activation/jakarta.activation-api/2.1.0, EPL-2.0 OR BSD-3-Clause OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jaf
 maven/mavencentral/jakarta.annotation/jakarta.annotation-api/2.1.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.ca
 maven/mavencentral/jakarta.inject/jakarta.inject-api/2.0.1, Apache-2.0, approved, clearlydefined

diff --git a/...src/main/java/org/eclipse/edc/connector/provision/aws/s3/S3BucketProvisionedResource.java b/...src/main/java/org/eclipse/edc/connector/provision/aws/s3/S3BucketProvisionedResource.java
@@ -34,16 +34,16 @@ public class S3BucketProvisionedResource extends ProvisionedDataDestinationResou
     private String role;
 
     public String getRegion() {
-        return getDataAddress().getProperty(REGION);
+        return getDataAddress().getStringProperty(REGION);
     }
 
     public String getBucketName() {
-        return getDataAddress().getProperty(BUCKET_NAME);
+        return getDataAddress().getStringProperty(BUCKET_NAME);
     }
 
     @Override
     public String getResourceName() {
-        return dataAddress.getProperty(BUCKET_NAME);
+        return dataAddress.getStringProperty(BUCKET_NAME);
     }
 
     public String getRole() {

diff --git a/...ava/org/eclipse/edc/connector/provision/aws/s3/S3ConsumerResourceDefinitionGenerator.java b/...ava/org/eclipse/edc/connector/provision/aws/s3/S3ConsumerResourceDefinitionGenerator.java
@@ -32,14 +32,14 @@ public class S3ConsumerResourceDefinitionGenerator implements ConsumerResourceDe
 
     @Override
     public ResourceDefinition generate(DataRequest dataRequest, Policy policy) {
-        if (dataRequest.getDataDestination().getProperty(S3BucketSchema.REGION) == null) {
+        if (dataRequest.getDataDestination().getStringProperty(S3BucketSchema.REGION) == null) {
             // FIXME generate region from policy engine
-            return S3BucketResourceDefinition.Builder.newInstance().id(randomUUID().toString()).bucketName(dataRequest.getDataDestination().getProperty(S3BucketSchema.BUCKET_NAME)).regionId(Region.US_EAST_1.id()).build();
+            return S3BucketResourceDefinition.Builder.newInstance().id(randomUUID().toString()).bucketName(dataRequest.getDataDestination().getStringProperty(S3BucketSchema.BUCKET_NAME)).regionId(Region.US_EAST_1.id()).build();
         }
         var destination = dataRequest.getDataDestination();
         var id = randomUUID().toString();
 
-        return S3BucketResourceDefinition.Builder.newInstance().id(id).bucketName(destination.getProperty(S3BucketSchema.BUCKET_NAME)).regionId(destination.getProperty(S3BucketSchema.REGION)).build();
+        return S3BucketResourceDefinition.Builder.newInstance().id(id).bucketName(destination.getStringProperty(S3BucketSchema.BUCKET_NAME)).regionId(destination.getStringProperty(S3BucketSchema.REGION)).build();
     }
 
     @Override

diff --git a/...sion-aws-s3/src/main/java/org/eclipse/edc/connector/provision/aws/s3/S3StatusChecker.java b/...sion-aws-s3/src/main/java/org/eclipse/edc/connector/provision/aws/s3/S3StatusChecker.java
@@ -44,8 +44,8 @@ public S3StatusChecker(AwsClientProvider clientProvider, RetryPolicy<Object> ret
     public boolean isComplete(TransferProcess transferProcess, List<ProvisionedResource> resources) {
         if (resources.isEmpty()) {
             var destination = transferProcess.getDataRequest().getDataDestination();
-            var bucketName = destination.getProperty(S3BucketSchema.BUCKET_NAME);
-            var region = destination.getProperty(S3BucketSchema.REGION);
+            var bucketName = destination.getStringProperty(S3BucketSchema.BUCKET_NAME);
+            var region = destination.getStringProperty(S3BucketSchema.REGION);
             return checkBucket(bucketName, region);
         } else {
             for (var resource : resources) {

diff --git a/...ne-aws-s3/src/main/java/org/eclipse/edc/connector/dataplane/aws/s3/S3DataSinkFactory.java b/...ne-aws-s3/src/main/java/org/eclipse/edc/connector/dataplane/aws/s3/S3DataSinkFactory.java
@@ -85,16 +85,16 @@ public DataSink createSink(DataFlowRequest request) {
         var secret = vault.resolveSecret(destination.getKeyName());
         if (secret != null) {
             var secretToken = typeManager.readValue(secret, AwsTemporarySecretToken.class);
-            client = clientProvider.s3Client(destination.getProperty(REGION), secretToken);
+            client = clientProvider.s3Client(destination.getStringProperty(REGION), secretToken);
         } else if (credentialsValidation.apply(destination).succeeded()) {
-            var secretToken = new AwsSecretToken(destination.getProperty(ACCESS_KEY_ID), destination.getProperty(SECRET_ACCESS_KEY));
-            client = clientProvider.s3Client(destination.getProperty(REGION), secretToken);
+            var secretToken = new AwsSecretToken(destination.getStringProperty(ACCESS_KEY_ID), destination.getStringProperty(SECRET_ACCESS_KEY));
+            client = clientProvider.s3Client(destination.getStringProperty(REGION), secretToken);
         } else {
-            client = clientProvider.s3Client(destination.getProperty(REGION));
+            client = clientProvider.s3Client(destination.getStringProperty(REGION));
         }
 
         return S3DataSink.Builder.newInstance()
-                .bucketName(destination.getProperty(BUCKET_NAME))
+                .bucketName(destination.getStringProperty(BUCKET_NAME))
                 .keyName(destination.getKeyName())
                 .requestId(request.getId())
                 .executorService(executorService)

diff --git a/...-aws-s3/src/main/java/org/eclipse/edc/connector/dataplane/aws/s3/S3DataSourceFactory.java b/...-aws-s3/src/main/java/org/eclipse/edc/connector/dataplane/aws/s3/S3DataSourceFactory.java
@@ -76,16 +76,16 @@ public DataSource createSource(DataFlowRequest request) {
         var secret = vault.resolveSecret(source.getKeyName());
         if (secret != null) {
             var secretToken = typeManager.readValue(secret, AwsSecretToken.class);
-            client = clientProvider.s3Client(source.getProperty(REGION), secretToken);
+            client = clientProvider.s3Client(source.getStringProperty(REGION), secretToken);
         } else if (credentialsValidation.apply(source).succeeded()) {
-            var secretToken = new AwsSecretToken(source.getProperty(ACCESS_KEY_ID), source.getProperty(SECRET_ACCESS_KEY));
-            client = clientProvider.s3Client(source.getProperty(REGION), secretToken);
+            var secretToken = new AwsSecretToken(source.getStringProperty(ACCESS_KEY_ID), source.getStringProperty(SECRET_ACCESS_KEY));
+            client = clientProvider.s3Client(source.getStringProperty(REGION), secretToken);
         } else {
-            client = clientProvider.s3Client(source.getProperty(REGION));
+            client = clientProvider.s3Client(source.getStringProperty(REGION));
         }
 
         return S3DataSource.Builder.newInstance()
-                .bucketName(source.getProperty(BUCKET_NAME))
+                .bucketName(source.getStringProperty(BUCKET_NAME))
                 .keyName(source.getKeyName())
                 .client(client)
                 .build();

diff --git a/...pse/edc/connector/dataplane/aws/s3/validation/S3DataAddressCredentialsValidationRule.java b/...pse/edc/connector/dataplane/aws/s3/validation/S3DataAddressCredentialsValidationRule.java
@@ -36,6 +36,6 @@ public Result<Void> apply(DataAddress dataAddress) {
                 )
         );
 
-        return composite.apply(dataAddress.getProperties());
+        return composite.apply(dataAddress);
     }
 }
diff --git a/...va/org/eclipse/edc/connector/dataplane/aws/s3/validation/S3DataAddressValidationRule.java b/...va/org/eclipse/edc/connector/dataplane/aws/s3/validation/S3DataAddressValidationRule.java
@@ -36,6 +36,6 @@ public Result<Void> apply(DataAddress dataAddress) {
                 )
         );
 
-        return composite.apply(dataAddress.getProperties());
+        return composite.apply(dataAddress);
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,6 +36,6 @@ public Result<Void> apply(DataAddress dataAddress) { @@
                     )
             );
-            return composite.apply(dataAddress.getProperties());
+            return composite.apply(dataAddress);
         }
     }