fix: compilation (#164)

Author: ndr-brt

extensions/common/azure/azure-eventgrid/src/main/java/org/eclipse/edc/azure/event/AzureEventGridPublisher.java

@@ -30,7 +30,6 @@ class AzureEventGridPublisher implements TransferProcessListener {
     private final Monitor monitor;
     private final EventGridPublisherAsyncClient<EventGridEvent> client;
     private final String eventTypeTransferprocess = "dataspaceconnector/transfer/transferprocess";
-    private final String eventTypeMetadata = "dataspaceconnector/metadata/store";
     private final String connectorId;
 
     AzureEventGridPublisher(String connectorId, Monitor monitor, EventGridPublisherAsyncClient<EventGridEvent> client) {
@@ -68,7 +67,7 @@ public void preTerminated(TransferProcess process) {
     }
 
     private Mono<Void> sendEvent(String what, String where, Object payload) {
-        BinaryData data = BinaryData.fromObject(payload);
+        var data = BinaryData.fromObject(payload);
         var evt = new EventGridEvent(what, where, data, "0.1");
         return client.sendEvent(evt);
     }
@@ -78,7 +77,7 @@ private TransferProcessDto createTransferProcessDto(TransferProcess process) {
         return TransferProcessDto.Builder.newInstance()
                 .connector(connectorId)
                 .state(TransferProcessStates.from(process.getState()))
-                .requestId(process.getDataRequest().getId())
+                .requestId(process.getCorrelationId())
                 .type(process.getType())
                 .build();
     }

extensions/control-plane/provision/provision-blob/src/test/java/org/eclipse/edc/connector/provision/azure/blob/ObjectStorageConsumerResourceDefinitionGeneratorTest.java

@@ -17,7 +17,6 @@
 package org.eclipse.edc.connector.provision.azure.blob;
 
 import org.eclipse.edc.azure.blob.AzureBlobStoreSchema;
-import org.eclipse.edc.connector.transfer.spi.types.DataRequest;
 import org.eclipse.edc.connector.transfer.spi.types.TransferProcess;
 import org.eclipse.edc.policy.model.Policy;
 import org.eclipse.edc.spi.types.domain.DataAddress;
@@ -41,8 +40,7 @@ void generate_withContainerName() {
                 .property(AzureBlobStoreSchema.ACCOUNT_NAME, "test-account")
                 .build();
         var asset = Asset.Builder.newInstance().build();
-        var dr = DataRequest.Builder.newInstance().dataDestination(destination).assetId(asset.getId()).build();
-        var transferProcess = TransferProcess.Builder.newInstance().dataRequest(dr).build();
+        var transferProcess = TransferProcess.Builder.newInstance().dataDestination(destination).assetId(asset.getId()).build();
         var policy = Policy.Builder.newInstance().build();
 
         var definition = generator.generate(transferProcess, policy);
@@ -66,8 +64,7 @@ void generate_withoutContainerName() {
                 .property(AzureBlobStoreSchema.ACCOUNT_NAME, "test-account")
                 .build();
         var asset = Asset.Builder.newInstance().build();
-        var dr = DataRequest.Builder.newInstance().dataDestination(destination).assetId(asset.getId()).build();
-        var transferProcess = TransferProcess.Builder.newInstance().dataRequest(dr).build();
+        var transferProcess = TransferProcess.Builder.newInstance().dataDestination(destination).assetId(asset.getId()).build();
         var policy = Policy.Builder.newInstance().build();
 
         var definition = generator.generate(transferProcess, policy);
@@ -85,8 +82,7 @@ void canGenerate() {
                 .property(AzureBlobStoreSchema.ACCOUNT_NAME, "test-account")
                 .build();
         var asset = Asset.Builder.newInstance().build();
-        var dataRequest = DataRequest.Builder.newInstance().dataDestination(destination).assetId(asset.getId()).build();
-        var transferProcess = TransferProcess.Builder.newInstance().dataRequest(dataRequest).build();
+        var transferProcess = TransferProcess.Builder.newInstance().dataDestination(destination).assetId(asset.getId()).build();
         var policy = Policy.Builder.newInstance().build();
 
         var definition = generator.canGenerate(transferProcess, policy);
@@ -100,8 +96,7 @@ void canGenerate_isNotTypeAzureBlobStoreSchema() {
                 .property(AzureBlobStoreSchema.ACCOUNT_NAME, "test-account")
                 .build();
         var asset = Asset.Builder.newInstance().build();
-        var dataRequest = DataRequest.Builder.newInstance().dataDestination(destination).assetId(asset.getId()).build();
-        var transferProcess = TransferProcess.Builder.newInstance().dataRequest(dataRequest).build();
+        var transferProcess = TransferProcess.Builder.newInstance().dataDestination(destination).assetId(asset.getId()).build();
         var policy = Policy.Builder.newInstance().build();
 
         var definition = generator.canGenerate(transferProcess, policy);

extensions/control-plane/store/transfer-process-store-cosmos/src/test/java/org/eclipse/edc/connector/store/azure/cosmos/transferprocess/CosmosTransferProcessStoreTest.java

@@ -65,7 +65,6 @@ void setUp(DataSourceRegistry reg, TransactionContext transactionContext, QueryE
         }, STATEMENTS, clock);
 
         helper.truncateTable(STATEMENTS.getTransferProcessTableName());
-        helper.truncateTable(STATEMENTS.getDataRequestTable());
         helper.truncateTable(STATEMENTS.getLeaseTableName());
     }
 
@@ -92,7 +91,6 @@ static void createDatabase(CosmosPostgresTestExtension.SqlHelper helper) {
     @AfterAll
     static void dropTables(CosmosPostgresTestExtension.SqlHelper helper) {
         helper.dropTable(STATEMENTS.getTransferProcessTableName());
-        helper.dropTable(STATEMENTS.getDataRequestTable());
         helper.dropTable(STATEMENTS.getLeaseTableName());
     }