diff --git a/DEPENDENCIES b/DEPENDENCIES index a87a120..f340d5c 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -91,7 +91,7 @@ maven/mavencentral/io.grpc/grpc-auth/1.56.1, Apache-2.0, approved, clearlydefine maven/mavencentral/io.grpc/grpc-context/1.27.2, Apache-2.0, approved, clearlydefined maven/mavencentral/io.grpc/grpc-context/1.56.1, Apache-2.0, approved, clearlydefined maven/mavencentral/io.grpc/grpc-core/1.56.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.grpc/grpc-googleapis/1.56.1, , restricted, clearlydefined +maven/mavencentral/io.grpc/grpc-googleapis/1.56.1, Apache-2.0, approved, clearlydefined maven/mavencentral/io.grpc/grpc-grpclb/1.56.1, Apache-2.0, approved, clearlydefined maven/mavencentral/io.grpc/grpc-netty-shaded/1.56.1, Apache-2.0, restricted, clearlydefined maven/mavencentral/io.grpc/grpc-protobuf-lite/1.56.1, Apache-2.0, approved, clearlydefined @@ -103,9 +103,9 @@ maven/mavencentral/io.grpc/grpc-xds/1.56.1, Apache-2.0, approved, clearlydefined maven/mavencentral/io.opencensus/opencensus-api/0.31.1, Apache-2.0, approved, clearlydefined maven/mavencentral/io.opencensus/opencensus-contrib-http-util/0.31.1, Apache-2.0, approved, clearlydefined maven/mavencentral/io.opencensus/opencensus-proto/0.2.0, Apache-2.0, approved, clearlydefined -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/io.perfmark/perfmark-api/0.26.0, Apache-2.0, approved, 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 diff --git a/extensions/control-plane/provision/provision-gcs/src/main/java/org/eclipse/edc/connector/provision/gcp/GcsConsumerResourceDefinitionGenerator.java b/extensions/control-plane/provision/provision-gcs/src/main/java/org/eclipse/edc/connector/provision/gcp/GcsConsumerResourceDefinitionGenerator.java index 8b4efa2..c897928 100644 --- a/extensions/control-plane/provision/provision-gcs/src/main/java/org/eclipse/edc/connector/provision/gcp/GcsConsumerResourceDefinitionGenerator.java +++ b/extensions/control-plane/provision/provision-gcs/src/main/java/org/eclipse/edc/connector/provision/gcp/GcsConsumerResourceDefinitionGenerator.java @@ -32,8 +32,8 @@ public class GcsConsumerResourceDefinitionGenerator implements ConsumerResourceD ResourceDefinition generate(DataRequest dataRequest, Policy policy) { var destination = dataRequest.getDataDestination(); var id = randomUUID().toString(); - var location = destination.getProperty(GcsStoreSchema.LOCATION); - var storageClass = destination.getProperty(GcsStoreSchema.STORAGE_CLASS); + var location = destination.getStringProperty(GcsStoreSchema.LOCATION); + var storageClass = destination.getStringProperty(GcsStoreSchema.STORAGE_CLASS); return GcsResourceDefinition.Builder.newInstance().id(id).location(location) .storageClass(storageClass).build(); diff --git a/extensions/control-plane/provision/provision-gcs/src/main/java/org/eclipse/edc/connector/provision/gcp/GcsProvisionedResource.java b/extensions/control-plane/provision/provision-gcs/src/main/java/org/eclipse/edc/connector/provision/gcp/GcsProvisionedResource.java index 88c6739..8a5344b 100644 --- a/extensions/control-plane/provision/provision-gcs/src/main/java/org/eclipse/edc/connector/provision/gcp/GcsProvisionedResource.java +++ b/extensions/control-plane/provision/provision-gcs/src/main/java/org/eclipse/edc/connector/provision/gcp/GcsProvisionedResource.java @@ -35,23 +35,23 @@ private GcsProvisionedResource() { } public String getBucketName() { - return getDataAddress().getProperty(BUCKET_NAME); + return getDataAddress().getStringProperty(BUCKET_NAME); } public String getLocation() { - return getDataAddress().getProperty(LOCATION); + return getDataAddress().getStringProperty(LOCATION); } public String getStorageClass() { - return getDataAddress().getProperty(STORAGE_CLASS); + return getDataAddress().getStringProperty(STORAGE_CLASS); } public String getServiceAccountName() { - return getDataAddress().getProperty(SERVICE_ACCOUNT_NAME); + return getDataAddress().getStringProperty(SERVICE_ACCOUNT_NAME); } public String getServiceAccountEmail() { - return getDataAddress().getProperty(SERVICE_ACCOUNT_EMAIL); + return getDataAddress().getStringProperty(SERVICE_ACCOUNT_EMAIL); } @JsonPOJOBuilder(withPrefix = "") diff --git a/extensions/data-plane/data-plane-google-storage/src/main/java/org/eclipse/edc/connector/dataplane/gcp/storage/GcsDataSinkFactory.java b/extensions/data-plane/data-plane-google-storage/src/main/java/org/eclipse/edc/connector/dataplane/gcp/storage/GcsDataSinkFactory.java index 899b27f..0262e11 100644 --- a/extensions/data-plane/data-plane-google-storage/src/main/java/org/eclipse/edc/connector/dataplane/gcp/storage/GcsDataSinkFactory.java +++ b/extensions/data-plane/data-plane-google-storage/src/main/java/org/eclipse/edc/connector/dataplane/gcp/storage/GcsDataSinkFactory.java @@ -79,8 +79,8 @@ public DataSink createSink(DataFlowRequest request) { return GcsDataSink.Builder.newInstance() .storageClient(storageClient) - .bucketName(destination.getProperty(GcsStoreSchema.BUCKET_NAME)) - .blobName(destination.getProperty(GcsStoreSchema.BLOB_NAME)) + .bucketName(destination.getStringProperty(GcsStoreSchema.BUCKET_NAME)) + .blobName(destination.getStringProperty(GcsStoreSchema.BLOB_NAME)) .requestId(request.getId()) .executorService(executorService) .monitor(monitor) diff --git a/extensions/data-plane/data-plane-google-storage/src/main/java/org/eclipse/edc/connector/dataplane/gcp/storage/GcsDataSourceFactory.java b/extensions/data-plane/data-plane-google-storage/src/main/java/org/eclipse/edc/connector/dataplane/gcp/storage/GcsDataSourceFactory.java index 678e1c8..69aed3f 100644 --- a/extensions/data-plane/data-plane-google-storage/src/main/java/org/eclipse/edc/connector/dataplane/gcp/storage/GcsDataSourceFactory.java +++ b/extensions/data-plane/data-plane-google-storage/src/main/java/org/eclipse/edc/connector/dataplane/gcp/storage/GcsDataSourceFactory.java @@ -61,8 +61,8 @@ public DataSource createSource(DataFlowRequest request) { return GcsDataSource.Builder.newInstance() .storageClient(storageClient) - .bucketName(source.getProperty(GcsStoreSchema.BUCKET_NAME)) - .blobName(source.getProperty(GcsStoreSchema.BLOB_NAME)) + .bucketName(source.getStringProperty(GcsStoreSchema.BUCKET_NAME)) + .blobName(source.getStringProperty(GcsStoreSchema.BLOB_NAME)) .monitor(monitor) .build(); diff --git a/extensions/data-plane/data-plane-google-storage/src/main/java/org/eclipse/edc/connector/dataplane/gcp/storage/validation/GcsSinkDataAddressValidationRule.java b/extensions/data-plane/data-plane-google-storage/src/main/java/org/eclipse/edc/connector/dataplane/gcp/storage/validation/GcsSinkDataAddressValidationRule.java index 9c83d4e..70c6b5f 100644 --- a/extensions/data-plane/data-plane-google-storage/src/main/java/org/eclipse/edc/connector/dataplane/gcp/storage/validation/GcsSinkDataAddressValidationRule.java +++ b/extensions/data-plane/data-plane-google-storage/src/main/java/org/eclipse/edc/connector/dataplane/gcp/storage/validation/GcsSinkDataAddressValidationRule.java @@ -21,12 +21,11 @@ import org.eclipse.edc.spi.types.domain.DataAddress; import java.util.List; -import java.util.Map; import static org.eclipse.edc.gcp.storage.GcsStoreSchema.BUCKET_NAME; public class GcsSinkDataAddressValidationRule implements ValidationRule { - private final CompositeValidationRule> mandatoryPropertyValidationRule = new CompositeValidationRule<>( + private final CompositeValidationRule mandatoryPropertyValidationRule = new CompositeValidationRule<>( List.of( new EmptyValueValidationRule(BUCKET_NAME) ) @@ -34,6 +33,6 @@ public class GcsSinkDataAddressValidationRule implements ValidationRule apply(DataAddress dataAddress) { - return mandatoryPropertyValidationRule.apply(dataAddress.getProperties()); + return mandatoryPropertyValidationRule.apply(dataAddress); } } diff --git a/extensions/data-plane/data-plane-google-storage/src/main/java/org/eclipse/edc/connector/dataplane/gcp/storage/validation/GcsSourceDataAddressValidationRule.java b/extensions/data-plane/data-plane-google-storage/src/main/java/org/eclipse/edc/connector/dataplane/gcp/storage/validation/GcsSourceDataAddressValidationRule.java index 09c380d..9792dc5 100644 --- a/extensions/data-plane/data-plane-google-storage/src/main/java/org/eclipse/edc/connector/dataplane/gcp/storage/validation/GcsSourceDataAddressValidationRule.java +++ b/extensions/data-plane/data-plane-google-storage/src/main/java/org/eclipse/edc/connector/dataplane/gcp/storage/validation/GcsSourceDataAddressValidationRule.java @@ -21,14 +21,13 @@ import org.eclipse.edc.spi.types.domain.DataAddress; import java.util.List; -import java.util.Map; import static org.eclipse.edc.gcp.storage.GcsStoreSchema.BLOB_NAME; import static org.eclipse.edc.gcp.storage.GcsStoreSchema.BUCKET_NAME; public class GcsSourceDataAddressValidationRule implements ValidationRule { - private final CompositeValidationRule> mandatoryPropertyValidationRule = new CompositeValidationRule<>( + private final CompositeValidationRule mandatoryPropertyValidationRule = new CompositeValidationRule<>( List.of( new EmptyValueValidationRule(BLOB_NAME), new EmptyValueValidationRule(BUCKET_NAME) @@ -37,6 +36,6 @@ public class GcsSourceDataAddressValidationRule implements ValidationRule apply(DataAddress dataAddress) { - return mandatoryPropertyValidationRule.apply(dataAddress.getProperties()); + return mandatoryPropertyValidationRule.apply(dataAddress); } }