refactor: cleanup 0.4.x deprecations (#4354)

eclipse-edc · Jul 11, 2024 · 0fcb727 · 0fcb727
1 parent 376ed9b
commit 0fcb727
Show file tree

Hide file tree

Showing 44 changed files with 113 additions and 762 deletions.
diff --git a/core/common/lib/http-lib/src/main/java/org/eclipse/edc/http/client/EdcHttpClientImpl.java b/core/common/lib/http-lib/src/main/java/org/eclipse/edc/http/client/EdcHttpClientImpl.java
@@ -74,11 +74,6 @@ public <T> Result<T> execute(Request request, List<FallbackFactory> fallbacks, F
         }
     }
 
-    @Override
-    public <T> CompletableFuture<T> executeAsync(Request request, Function<Response, T> mappingFunction) {
-        return executeAsync(request, emptyList(), mappingFunction);
-    }
-
     @Override
     public CompletableFuture<Response> executeAsync(Request request, List<FallbackFactory> fallbacks) {
         var call = okHttpClient.newCall(request);
@@ -89,16 +84,6 @@ public CompletableFuture<Response> executeAsync(Request request, List<FallbackFa
                 .executeAsync();
     }
 
-    @Override
-    public <T> CompletableFuture<T> executeAsync(Request request, List<FallbackFactory> fallbacks, Function<Response, T> mappingFunction) {
-        return executeAsync(request, fallbacks)
-                .thenApply(response -> {
-                    try (response) {
-                        return mappingFunction.apply(response);
-                    }
-                });
-    }
-
     @Override
     public EdcHttpClient withDns(String dnsServer) {
         var url = requireNonNull(HttpUrl.get(dnsServer));

diff --git a/...tor/controlplane/services/contractnegotiation/ContractNegotiationProtocolServiceImpl.java b/...tor/controlplane/services/contractnegotiation/ContractNegotiationProtocolServiceImpl.java
@@ -314,8 +314,6 @@ private ServiceResult<ContractNegotiation> terminatedAction(ContractNegotiationT
 
     private ServiceResult<ContractNegotiation> getAndLeaseNegotiation(String negotiationId) {
         return store.findByIdAndLease(negotiationId)
-                // recover needed to maintain backward compatibility when there was no distinction between providerPid and consumerPid
-                .recover(it -> store.findByCorrelationIdAndLease(negotiationId))
                 .flatMap(ServiceResult::from);
     }
 
@@ -326,8 +324,6 @@ private ServiceResult<ParticipantAgent> verifyRequest(TokenRepresentation tokenR
 
     private ServiceResult<ContractNegotiation> getNegotiation(String negotiationId) {
         return Optional.ofNullable(store.findById(negotiationId))
-                // recover needed to maintain backward compatibility when there was no distinction between providerPid and consumerPid
-                .or(() -> Optional.ofNullable(store.findForCorrelationId(negotiationId)))
                 .map(ServiceResult::success)
                 .orElseGet(() -> ServiceResult.notFound("No negotiation with id %s found".formatted(negotiationId)));
     }

diff --git a/...c/connector/controlplane/services/transferprocess/TransferProcessProtocolServiceImpl.java b/...c/connector/controlplane/services/transferprocess/TransferProcessProtocolServiceImpl.java
@@ -321,8 +321,6 @@ private ServiceResult<TransferProcess> validateCounterParty(ParticipantAgent par
     private ServiceResult<TransferProcess> findAndLease(TransferRemoteMessage remoteMessage) {
         return transferProcessStore
                 .findByIdAndLease(remoteMessage.getProcessId())
-                // recover needed to maintain backward compatibility when there was no distinction between providerPid and consumerPid
-                .recover(it -> transferProcessStore.findByCorrelationIdAndLease(remoteMessage.getProcessId()))
                 .flatMap(ServiceResult::from);
     }
 

diff --git a/...controlplane/services/contractnegotiation/ContractNegotiationProtocolServiceImplTest.java b/...controlplane/services/contractnegotiation/ContractNegotiationProtocolServiceImplTest.java
@@ -339,7 +339,6 @@ <M extends RemoteMessage> void notify_shouldReturnNotFound_whenNotFound(MethodCa
         when(protocolTokenValidator.verify(eq(tokenRepresentation), eq(CONTRACT_NEGOTIATION_REQUEST_SCOPE), any(), eq(message)))
                 .thenReturn(ServiceResult.success(participantAgent()));
         when(store.findByIdAndLease(any())).thenReturn(StoreResult.notFound("not found"));
-        when(store.findByCorrelationIdAndLease(any())).thenReturn(StoreResult.notFound("not found"));
 
         // currently ContractRequestMessage cannot happen on an already existing negotiation
         if (!(message instanceof ContractRequestMessage)) {
@@ -708,7 +707,6 @@ void shouldReturnNotFound_whenOfferNotFound() {
             when(protocolTokenValidator.verify(eq(tokenRepresentation), eq(CONTRACT_NEGOTIATION_REQUEST_SCOPE), any(), eq(message)))
                     .thenReturn(ServiceResult.success(participantAgent()));
             when(store.findByIdAndLease(any())).thenReturn(StoreResult.notFound("not found"));
-            when(store.findByCorrelationIdAndLease(any())).thenReturn(StoreResult.notFound("not found"));
 
             var result = service.notifyOffered(message, tokenRepresentation);
 

diff --git a/...nnector/controlplane/services/transferprocess/TransferProcessProtocolServiceImplTest.java b/...nnector/controlplane/services/transferprocess/TransferProcessProtocolServiceImplTest.java
@@ -469,7 +469,6 @@ <M extends RemoteMessage> void notify_shouldFail_whenTransferProcessNotFound(Met
 
         when(protocolTokenValidator.verify(eq(tokenRepresentation), eq(TRANSFER_PROCESS_REQUEST_SCOPE), any())).thenReturn(ServiceResult.success(participantAgent));
         when(store.findByIdAndLease(any())).thenReturn(StoreResult.notFound("not found"));
-        when(store.findByCorrelationIdAndLease(any())).thenReturn(StoreResult.notFound("not found"));
 
         var result = methodCall.call(service, message, tokenRepresentation);
 

diff --git a/...e/edc/connector/controlplane/contract/negotiation/ContractNegotiationIntegrationTest.java b/...e/edc/connector/controlplane/contract/negotiation/ContractNegotiationIntegrationTest.java
@@ -15,7 +15,6 @@
 
 package org.eclipse.edc.connector.controlplane.contract.negotiation;
 
-import org.eclipse.edc.connector.controlplane.contract.observe.ContractNegotiationObservableImpl;
 import org.eclipse.edc.connector.controlplane.contract.spi.ContractOfferId;
 import org.eclipse.edc.connector.controlplane.contract.spi.offer.ConsumerOfferResolver;
 import org.eclipse.edc.connector.controlplane.contract.spi.types.agreement.ContractAgreement;
@@ -35,7 +34,6 @@
 import org.eclipse.edc.connector.controlplane.contract.spi.validation.ValidatableConsumerOffer;
 import org.eclipse.edc.connector.controlplane.contract.spi.validation.ValidatedConsumerOffer;
 import org.eclipse.edc.connector.controlplane.defaults.storage.contractnegotiation.InMemoryContractNegotiationStore;
-import org.eclipse.edc.connector.controlplane.policy.spi.store.PolicyDefinitionStore;
 import org.eclipse.edc.connector.controlplane.services.contractnegotiation.ContractNegotiationProtocolServiceImpl;
 import org.eclipse.edc.connector.controlplane.services.spi.contractnegotiation.ContractNegotiationProtocolService;
 import org.eclipse.edc.connector.controlplane.services.spi.protocol.ProtocolTokenValidator;
@@ -75,6 +73,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Stream;
 
 import static java.util.UUID.randomUUID;
@@ -122,6 +121,8 @@ class ContractNegotiationIntegrationTest {
     protected ParticipantAgent participantAgent = new ParticipantAgent(Collections.emptyMap(), Collections.emptyMap());
     protected TokenRepresentation tokenRepresentation = TokenRepresentation.Builder.newInstance().build();
     private String consumerNegotiationId;
+    private final AtomicReference<String> providerNegotiationId = new AtomicReference<>(null);
+    private final NoopTransactionContext transactionContext = new NoopTransactionContext();
 
     private ProviderContractNegotiationManagerImpl providerManager;
     private ConsumerContractNegotiationManagerImpl consumerManager;
@@ -137,25 +138,25 @@ void init() {
                 .dispatcherRegistry(providerDispatcherRegistry)
                 .monitor(monitor)
                 .waitStrategy(() -> 1000)
-                .observable(new ContractNegotiationObservableImpl())
+                .observable(mock())
                 .store(providerStore)
-                .policyStore(mock(PolicyDefinitionStore.class))
+                .policyStore(mock())
                 .protocolWebhook(protocolWebhook)
                 .build();
 
         consumerManager = ConsumerContractNegotiationManagerImpl.Builder.newInstance()
                 .participantId(CONSUMER_ID)
                 .dispatcherRegistry(consumerDispatcherRegistry)
                 .monitor(monitor).waitStrategy(() -> 1000)
-                .observable(new ContractNegotiationObservableImpl())
+                .observable(mock())
                 .store(consumerStore)
-                .policyStore(mock(PolicyDefinitionStore.class))
+                .policyStore(mock())
                 .protocolWebhook(protocolWebhook)
                 .build();
 
         when(protocolTokenValidator.verify(eq(tokenRepresentation), any(), any(), any())).thenReturn(ServiceResult.success(participantAgent));
-        consumerService = new ContractNegotiationProtocolServiceImpl(consumerStore, new NoopTransactionContext(), validationService, offerResolver, protocolTokenValidator, new ContractNegotiationObservableImpl(), monitor, mock());
-        providerService = new ContractNegotiationProtocolServiceImpl(providerStore, new NoopTransactionContext(), validationService, offerResolver, protocolTokenValidator, new ContractNegotiationObservableImpl(), monitor, mock());
+        consumerService = new ContractNegotiationProtocolServiceImpl(consumerStore, transactionContext, validationService, offerResolver, protocolTokenValidator, mock(), monitor, mock());
+        providerService = new ContractNegotiationProtocolServiceImpl(providerStore, transactionContext, validationService, offerResolver, protocolTokenValidator, mock(), monitor, mock());
     }
 
     @AfterEach
@@ -197,9 +198,10 @@ void testNegotiation_initialOfferAccepted() {
         await().atMost(DEFAULT_TEST_TIMEOUT).pollInterval(DEFAULT_POLL_INTERVAL).untilAsserted(() -> {
             assertThat(consumerNegotiationId).isNotNull();
             var consumerNegotiation = consumerStore.findById(consumerNegotiationId);
-            var providerNegotiation = providerStore.findForCorrelationId(consumerNegotiationId);
+            var maybeProviderNegotiation = providerStore.findAll().filter(it -> it.getCorrelationId().equals(consumerNegotiationId)).findAny();
             assertThat(consumerNegotiation).isNotNull();
-            assertThat(providerNegotiation).isNotNull();
+            assertThat(maybeProviderNegotiation).isPresent();
+            var providerNegotiation = maybeProviderNegotiation.get();
 
             // Assert that the consumer has the callbacks
             assertThat(consumerNegotiation.getCallbackAddresses()).hasSize(1);
@@ -279,9 +281,10 @@ void testNegotiation_agreementDeclined() {
         await().atMost(DEFAULT_TEST_TIMEOUT).pollInterval(DEFAULT_POLL_INTERVAL).untilAsserted(() -> {
             assertThat(consumerNegotiationId).isNotNull();
             var consumerNegotiation = consumerStore.findById(consumerNegotiationId);
-            var providerNegotiation = providerStore.findForCorrelationId(consumerNegotiationId);
+            var maybeProviderNegotiation = providerStore.findAll().filter(it -> it.getCorrelationId().equals(consumerNegotiationId)).findAny();
             assertThat(consumerNegotiation).isNotNull();
-            assertThat(providerNegotiation).isNotNull();
+            assertThat(maybeProviderNegotiation).isPresent();
+            var providerNegotiation = maybeProviderNegotiation.get();
 
             // Assert that the consumer has the callbacks
             assertThat(consumerNegotiation.getCallbackAddresses()).hasSize(1);
@@ -323,6 +326,7 @@ private Answer<Object> onConsumerSentTermination() {
     private Answer<Object> onProviderSentAgreementRequest() {
         return i -> {
             ContractAgreementMessage request = i.getArgument(1);
+            providerNegotiationId.set(request.getProviderPid());
             var result = consumerService.notifyAgreed(request, tokenRepresentation);
             return toFuture(result, "Success!");
         };
@@ -341,6 +345,7 @@ private Answer<Object> onProviderSentNegotiationEventMessage() {
     private Answer<Object> onConsumerSentAgreementVerification() {
         return i -> {
             ContractAgreementVerificationMessage request = i.getArgument(1);
+            request.setProcessId(providerNegotiationId.get());
             var result = providerService.notifyVerified(request, tokenRepresentation);
             return toFuture(result, "Success!");
         };

diff --git a/...r/controlplane/defaults/storage/contractnegotiation/InMemoryContractNegotiationStore.java b/...r/controlplane/defaults/storage/contractnegotiation/InMemoryContractNegotiationStore.java
@@ -21,7 +21,6 @@
 import org.eclipse.edc.spi.query.CriterionOperatorRegistry;
 import org.eclipse.edc.spi.query.QueryResolver;
 import org.eclipse.edc.spi.query.QuerySpec;
-import org.eclipse.edc.spi.result.StoreResult;
 import org.eclipse.edc.store.InMemoryStatefulEntityStore;
 import org.eclipse.edc.store.ReflectionBasedQueryResolver;
 import org.jetbrains.annotations.NotNull;
@@ -86,16 +85,6 @@ public void delete(String negotiationId) {
         return agreementQueryResolver.query(getAgreements(), querySpec);
     }
 
-    @Override
-    public StoreResult<ContractNegotiation> findByCorrelationIdAndLease(String correlationId) {
-        var negotiation = findForCorrelationId(correlationId);
-        if (negotiation == null) {
-            return StoreResult.notFound(format("ContractNegotiation with correlationId %s not found", correlationId));
-        }
-
-        return findByIdAndLease(negotiation.getId());
-    }
-
     @NotNull
     private Stream<ContractAgreement> getAgreements() {
         return super.findAll()

diff --git a/...connector/controlplane/defaults/storage/transferprocess/InMemoryTransferProcessStore.java b/...connector/controlplane/defaults/storage/transferprocess/InMemoryTransferProcessStore.java
@@ -18,15 +18,13 @@
 import org.eclipse.edc.connector.controlplane.transfer.spi.types.TransferProcess;
 import org.eclipse.edc.spi.query.CriterionOperatorRegistry;
 import org.eclipse.edc.spi.query.QuerySpec;
-import org.eclipse.edc.spi.result.StoreResult;
 import org.eclipse.edc.store.InMemoryStatefulEntityStore;
 import org.jetbrains.annotations.Nullable;
 
 import java.time.Clock;
 import java.util.UUID;
 import java.util.stream.Stream;
 
-import static java.lang.String.format;
 import static org.eclipse.edc.spi.query.Criterion.criterion;
 
 /**
@@ -59,14 +57,4 @@ public Stream<TransferProcess> findAll(QuerySpec querySpec) {
         return super.findAll(querySpec);
     }
 
-    @Override
-    public StoreResult<TransferProcess> findByCorrelationIdAndLease(String correlationId) {
-        var transferProcess = findForCorrelationId(correlationId);
-        if (transferProcess == null) {
-            return StoreResult.notFound(format("TransferProcess with correlationId %s not found", correlationId));
-        }
-
-        return findByIdAndLease(transferProcess.getId());
-    }
-
 }
diff --git a/...rotocol/dsp/negotiation/transform/to/JsonObjectToContractAgreementMessageTransformer.java b/...rotocol/dsp/negotiation/transform/to/JsonObjectToContractAgreementMessageTransformer.java
@@ -35,7 +35,6 @@
 import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_TIMESTAMP;
 import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE;
 import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID;
-import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID;
 import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID;
 
 /**
@@ -52,30 +51,21 @@ public JsonObjectToContractAgreementMessageTransformer() {
     @Override
     public @Nullable ContractAgreementMessage transform(@NotNull JsonObject object, @NotNull TransformerContext context) {
         var messageBuilder = ContractAgreementMessage.Builder.newInstance();
-        var processId = object.get(DSPACE_PROPERTY_PROCESS_ID);
         if (!transformMandatoryString(object.get(DSPACE_PROPERTY_CONSUMER_PID), messageBuilder::consumerPid, context)) {
-            if (processId == null) {
-                context.problem()
-                        .missingProperty()
-                        .type(DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE)
-                        .property(DSPACE_PROPERTY_CONSUMER_PID)
-                        .report();
-                return null;
-            } else {
-                messageBuilder.consumerPid(transformString(processId, context));
-            }
+            context.problem()
+                    .missingProperty()
+                    .type(DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE)
+                    .property(DSPACE_PROPERTY_CONSUMER_PID)
+                    .report();
+            return null;
         }
         if (!transformMandatoryString(object.get(DSPACE_PROPERTY_PROVIDER_PID), messageBuilder::providerPid, context)) {
-            if (processId == null) {
-                context.problem()
-                        .missingProperty()
-                        .type(DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE)
-                        .property(DSPACE_PROPERTY_PROVIDER_PID)
-                        .report();
-                return null;
-            } else {
-                messageBuilder.providerPid(transformString(processId, context));
-            }
+            context.problem()
+                    .missingProperty()
+                    .type(DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE)
+                    .property(DSPACE_PROPERTY_PROVIDER_PID)
+                    .report();
+            return null;
         }
 
         var jsonAgreement = returnMandatoryJsonObject(object.get(DSPACE_PROPERTY_AGREEMENT), context, DSPACE_PROPERTY_AGREEMENT);

diff --git a/.../protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationAckTransformer.java b/.../protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationAckTransformer.java
@@ -22,7 +22,6 @@
 import org.jetbrains.annotations.Nullable;
 
 import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID;
-import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID;
 import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID;
 import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_STATE;
 
@@ -38,14 +37,9 @@ public JsonObjectToContractNegotiationAckTransformer() {
     @Override
     public @Nullable ContractNegotiationAck transform(@NotNull JsonObject jsonObject, @NotNull TransformerContext context) {
         var builder = ContractNegotiationAck.Builder.newInstance();
-        var processId = transformString(jsonObject.get(DSPACE_PROPERTY_PROCESS_ID), context);
-        if (!transformMandatoryString(jsonObject.get(DSPACE_PROPERTY_CONSUMER_PID), builder::consumerPid, context)) {
-            builder.consumerPid(processId);
-        }
-
-        if (!transformMandatoryString(jsonObject.get(DSPACE_PROPERTY_PROVIDER_PID), builder::providerPid, context)) {
-            builder.providerPid(processId);
-        }
+
+        transformMandatoryString(jsonObject.get(DSPACE_PROPERTY_CONSUMER_PID), builder::consumerPid, context);
+        transformMandatoryString(jsonObject.get(DSPACE_PROPERTY_PROVIDER_PID), builder::providerPid, context);
 
         return builder
                 .state(transformString(jsonObject.get(DSPACE_PROPERTY_STATE), context))