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 1462c13..e650ed9 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 @@ -17,8 +17,8 @@ package org.eclipse.edc.connector.provision.gcp; import org.eclipse.edc.connector.transfer.spi.provision.ConsumerResourceDefinitionGenerator; -import org.eclipse.edc.connector.transfer.spi.types.DataRequest; import org.eclipse.edc.connector.transfer.spi.types.ResourceDefinition; +import org.eclipse.edc.connector.transfer.spi.types.TransferProcess; import org.eclipse.edc.gcp.storage.GcsStoreSchema; import org.eclipse.edc.policy.model.Policy; import org.jetbrains.annotations.Nullable; @@ -29,8 +29,8 @@ public class GcsConsumerResourceDefinitionGenerator implements ConsumerResourceD @Override public @Nullable - ResourceDefinition generate(DataRequest dataRequest, Policy policy) { - var destination = dataRequest.getDataDestination(); + ResourceDefinition generate(TransferProcess transferProcess, Policy policy) { + var destination = transferProcess.getDataDestination(); var id = randomUUID().toString(); var location = destination.getStringProperty(GcsStoreSchema.LOCATION); var storageClass = destination.getStringProperty(GcsStoreSchema.STORAGE_CLASS); @@ -42,7 +42,7 @@ ResourceDefinition generate(DataRequest dataRequest, Policy policy) { } @Override - public boolean canGenerate(DataRequest dataRequest, Policy policy) { - return GcsStoreSchema.TYPE.equals(dataRequest.getDestinationType()); + public boolean canGenerate(TransferProcess transferProcess, Policy policy) { + return GcsStoreSchema.TYPE.equals(transferProcess.getDestinationType()); } } diff --git a/extensions/control-plane/provision/provision-gcs/src/test/java/org/eclipse/edc/connector/provision/gcp/GcsConsumerResourceDefinitionGeneratorTest.java b/extensions/control-plane/provision/provision-gcs/src/test/java/org/eclipse/edc/connector/provision/gcp/GcsConsumerResourceDefinitionGeneratorTest.java index 0399554..2582eeb 100644 --- a/extensions/control-plane/provision/provision-gcs/src/test/java/org/eclipse/edc/connector/provision/gcp/GcsConsumerResourceDefinitionGeneratorTest.java +++ b/extensions/control-plane/provision/provision-gcs/src/test/java/org/eclipse/edc/connector/provision/gcp/GcsConsumerResourceDefinitionGeneratorTest.java @@ -16,6 +16,7 @@ package org.eclipse.edc.connector.provision.gcp; import org.eclipse.edc.connector.transfer.spi.types.DataRequest; +import org.eclipse.edc.connector.transfer.spi.types.TransferProcess; import org.eclipse.edc.gcp.storage.GcsStoreSchema; import org.eclipse.edc.policy.model.Policy; import org.eclipse.edc.spi.types.domain.DataAddress; @@ -44,10 +45,10 @@ void generate() { .property(GcsStoreSchema.STORAGE_CLASS, "test-storage-class") .build(); var asset = Asset.Builder.newInstance().build(); - var dr = DataRequest.Builder.newInstance().dataDestination(destination).assetId(asset.getId()).build(); + var dataRequest = TransferProcess.Builder.newInstance().dataRequest(DataRequest.Builder.newInstance().dataDestination(destination).assetId(asset.getId()).build()).build(); var policy = Policy.Builder.newInstance().build(); - var definition = generator.generate(dr, policy); + var definition = generator.generate(dataRequest, policy); assertThat(definition).isInstanceOf(GcsResourceDefinition.class); var objectDef = (GcsResourceDefinition) definition; @@ -68,7 +69,7 @@ void canGenerate() { .property(GcsStoreSchema.STORAGE_CLASS, "test-storage-class") .build(); var asset = Asset.Builder.newInstance().build(); - var dataRequest = DataRequest.Builder.newInstance().dataDestination(destination).assetId(asset.getId()).build(); + var dataRequest = TransferProcess.Builder.newInstance().dataRequest(DataRequest.Builder.newInstance().dataDestination(destination).assetId(asset.getId()).build()).build(); var policy = Policy.Builder.newInstance().build(); var definition = generator.canGenerate(dataRequest, policy); @@ -81,7 +82,7 @@ void canGenerate_isNotTypeGcsStream() { .property(GcsStoreSchema.STORAGE_CLASS, "test-storage-class") .build(); var asset = Asset.Builder.newInstance().build(); - var dataRequest = DataRequest.Builder.newInstance().dataDestination(destination).assetId(asset.getId()).build(); + var dataRequest = TransferProcess.Builder.newInstance().dataRequest(DataRequest.Builder.newInstance().dataDestination(destination).assetId(asset.getId()).build()).build(); var policy = Policy.Builder.newInstance().build(); var definition = generator.canGenerate(dataRequest, policy);