feat: removes StatusChecker (#3480)

eclipse-edc · Sep 28, 2023 · bbfcbab · bbfcbab
1 parent 7dc9dde
commit bbfcbab
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 269 deletions.
diff --git a/...a/org/eclipse/edc/connector/service/transferprocess/TransferProcessEventDispatchTest.java b/...a/org/eclipse/edc/connector/service/transferprocess/TransferProcessEventDispatchTest.java
@@ -32,8 +32,6 @@
 import org.eclipse.edc.connector.transfer.spi.event.TransferProcessStarted;
 import org.eclipse.edc.connector.transfer.spi.event.TransferProcessTerminated;
 import org.eclipse.edc.connector.transfer.spi.retry.TransferWaitStrategy;
-import org.eclipse.edc.connector.transfer.spi.status.StatusCheckerRegistry;
-import org.eclipse.edc.connector.transfer.spi.types.StatusChecker;
 import org.eclipse.edc.connector.transfer.spi.types.TransferRequest;
 import org.eclipse.edc.connector.transfer.spi.types.command.TerminateTransferCommand;
 import org.eclipse.edc.connector.transfer.spi.types.protocol.TransferStartMessage;
@@ -113,7 +111,6 @@ void shouldDispatchEventsOnTransferProcessStateChanges(TransferProcessService se
                                                            TransferProcessProtocolService protocolService,
                                                            EventRouter eventRouter,
                                                            RemoteMessageDispatcherRegistry dispatcherRegistry,
-                                                           StatusCheckerRegistry statusCheckerRegistry,
                                                            PolicyArchive policyArchive,
                                                            ContractNegotiationStore negotiationStore,
                                                            ParticipantAgentService agentService) {
@@ -132,10 +129,7 @@ void shouldDispatchEventsOnTransferProcessStateChanges(TransferProcessService se
         when(negotiationStore.findContractAgreement("contractId")).thenReturn(agreement);
         when(agentService.createFor(token)).thenReturn(agent);
         eventRouter.register(TransferProcessEvent.class, eventSubscriber);
-        var statusCheck = mock(StatusChecker.class);
 
-        statusCheckerRegistry.register("any", statusCheck);
-        when(statusCheck.isComplete(any(), any())).thenReturn(false);
         var transferRequest = createTransferRequest();
 
         var initiateResult = service.initiateTransfer(transferRequest);

diff --git a/...transfer-core/src/main/java/org/eclipse/edc/connector/transfer/TransferCoreExtension.java b/...transfer-core/src/main/java/org/eclipse/edc/connector/transfer/TransferCoreExtension.java
@@ -33,7 +33,6 @@
 import org.eclipse.edc.connector.transfer.spi.provision.ProvisionManager;
 import org.eclipse.edc.connector.transfer.spi.provision.ResourceManifestGenerator;
 import org.eclipse.edc.connector.transfer.spi.retry.TransferWaitStrategy;
-import org.eclipse.edc.connector.transfer.spi.status.StatusCheckerRegistry;
 import org.eclipse.edc.connector.transfer.spi.store.TransferProcessStore;
 import org.eclipse.edc.connector.transfer.spi.types.DataRequest;
 import org.eclipse.edc.connector.transfer.spi.types.DeprovisionedResource;
@@ -94,9 +93,6 @@ public class TransferCoreExtension implements ServiceExtension {
     @Inject
     private DataFlowManager dataFlowManager;
 
-    @Inject
-    private StatusCheckerRegistry statusCheckerRegistry;
-
     @Inject
     private ResourceManifestGenerator resourceManifestGenerator;
 
@@ -180,7 +176,6 @@ public void initialize(ServiceExtensionContext context) {
                 .dataFlowManager(dataFlowManager)
                 .provisionManager(provisionManager)
                 .dispatcherRegistry(dispatcherRegistry)
-                .statusCheckerRegistry(statusCheckerRegistry)
                 .monitor(monitor)
                 .telemetry(telemetry)
                 .executorInstrumentation(executorInstrumentation)

diff --git a/...main/java/org/eclipse/edc/connector/transfer/TransferProcessDefaultServicesExtension.java b/...main/java/org/eclipse/edc/connector/transfer/TransferProcessDefaultServicesExtension.java
@@ -16,15 +16,13 @@
 
 import org.eclipse.edc.connector.transfer.flow.DataFlowManagerImpl;
 import org.eclipse.edc.connector.transfer.observe.TransferProcessObservableImpl;
-import org.eclipse.edc.connector.transfer.process.StatusCheckerRegistryImpl;
 import org.eclipse.edc.connector.transfer.provision.ProvisionManagerImpl;
 import org.eclipse.edc.connector.transfer.provision.ResourceManifestGeneratorImpl;
 import org.eclipse.edc.connector.transfer.spi.TransferProcessPendingGuard;
 import org.eclipse.edc.connector.transfer.spi.flow.DataFlowManager;
 import org.eclipse.edc.connector.transfer.spi.observe.TransferProcessObservable;
 import org.eclipse.edc.connector.transfer.spi.provision.ProvisionManager;
 import org.eclipse.edc.connector.transfer.spi.provision.ResourceManifestGenerator;
-import org.eclipse.edc.connector.transfer.spi.status.StatusCheckerRegistry;
 import org.eclipse.edc.policy.engine.spi.PolicyEngine;
 import org.eclipse.edc.runtime.metamodel.annotation.Extension;
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;
@@ -55,11 +53,6 @@ public ResourceManifestGenerator resourceManifestGenerator() {
         return new ResourceManifestGeneratorImpl(policyEngine);
     }
 
-    @Provider
-    public StatusCheckerRegistry statusCheckerRegistry() {
-        return new StatusCheckerRegistryImpl();
-    }
-
     @Provider
     public ProvisionManager provisionManager(ServiceExtensionContext context) {
         return new ProvisionManagerImpl(context.getMonitor());

diff --git a/...e/src/main/java/org/eclipse/edc/connector/transfer/process/StatusCheckerRegistryImpl.java b/...e/src/main/java/org/eclipse/edc/connector/transfer/process/StatusCheckerRegistryImpl.java
diff --git a/.../src/main/java/org/eclipse/edc/connector/transfer/process/TransferProcessManagerImpl.java b/.../src/main/java/org/eclipse/edc/connector/transfer/process/TransferProcessManagerImpl.java
@@ -29,7 +29,6 @@
 import org.eclipse.edc.connector.transfer.spi.observe.TransferProcessStartedData;
 import org.eclipse.edc.connector.transfer.spi.provision.ProvisionManager;
 import org.eclipse.edc.connector.transfer.spi.provision.ResourceManifestGenerator;
-import org.eclipse.edc.connector.transfer.spi.status.StatusCheckerRegistry;
 import org.eclipse.edc.connector.transfer.spi.store.TransferProcessStore;
 import org.eclipse.edc.connector.transfer.spi.types.DataFlowResponse;
 import org.eclipse.edc.connector.transfer.spi.types.DataRequest;
@@ -53,7 +52,6 @@
 import org.eclipse.edc.statemachine.Processor;
 import org.eclipse.edc.statemachine.ProcessorImpl;
 import org.eclipse.edc.statemachine.StateMachineManager;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 import java.util.Objects;
@@ -71,7 +69,6 @@
 import static org.eclipse.edc.connector.transfer.spi.types.TransferProcessStates.PROVISIONING;
 import static org.eclipse.edc.connector.transfer.spi.types.TransferProcessStates.REQUESTED;
 import static org.eclipse.edc.connector.transfer.spi.types.TransferProcessStates.REQUESTING;
-import static org.eclipse.edc.connector.transfer.spi.types.TransferProcessStates.STARTED;
 import static org.eclipse.edc.connector.transfer.spi.types.TransferProcessStates.STARTING;
 import static org.eclipse.edc.connector.transfer.spi.types.TransferProcessStates.TERMINATING;
 import static org.eclipse.edc.spi.persistence.StateEntityStore.hasState;
@@ -105,7 +102,6 @@ public class TransferProcessManagerImpl extends AbstractStateEntityManager<Trans
     private ProvisionManager provisionManager;
     private RemoteMessageDispatcherRegistry dispatcherRegistry;
     private DataFlowManager dataFlowManager;
-    private StatusCheckerRegistry statusCheckerRegistry;
     private Vault vault;
     private TransferProcessObservable observable;
     private DataAddressResolver addressResolver;
@@ -118,20 +114,6 @@ public class TransferProcessManagerImpl extends AbstractStateEntityManager<Trans
     private TransferProcessManagerImpl() {
     }
 
-    @Override
-    protected StateMachineManager.Builder configureStateMachineManager(StateMachineManager.Builder builder) {
-        return builder
-                .processor(processTransfersInState(INITIAL, this::processInitial))
-                .processor(processTransfersInState(PROVISIONING, this::processProvisioning))
-                .processor(processTransfersInState(PROVISIONED, this::processProvisioned))
-                .processor(processConsumerTransfersInState(REQUESTING, this::processRequesting))
-                .processor(processProviderTransfersInState(STARTING, this::processStarting))
-                .processor(processConsumerTransfersInState(STARTED, this::processStarted))
-                .processor(processTransfersInState(COMPLETING, this::processCompleting))
-                .processor(processTransfersInState(TERMINATING, this::processTerminating))
-                .processor(processTransfersInState(DEPROVISIONING, this::processDeprovisioning));
-    }
-
     /**
      * Initiate a consumer request TransferProcess.
      */
@@ -174,6 +156,19 @@ public StatusResult<TransferProcess> initiateConsumerRequest(TransferRequest tra
         return StatusResult.success(process);
     }
 
+    @Override
+    protected StateMachineManager.Builder configureStateMachineManager(StateMachineManager.Builder builder) {
+        return builder
+                .processor(processTransfersInState(INITIAL, this::processInitial))
+                .processor(processTransfersInState(PROVISIONING, this::processProvisioning))
+                .processor(processTransfersInState(PROVISIONED, this::processProvisioned))
+                .processor(processConsumerTransfersInState(REQUESTING, this::processRequesting))
+                .processor(processProviderTransfersInState(STARTING, this::processStarting))
+                .processor(processTransfersInState(COMPLETING, this::processCompleting))
+                .processor(processTransfersInState(TERMINATING, this::processTerminating))
+                .processor(processTransfersInState(DEPROVISIONING, this::processDeprovisioning));
+    }
+
     /**
      * Process INITIAL transfer<p> set it to PROVISIONING
      *
@@ -345,37 +340,6 @@ private void sendTransferStartMessage(TransferProcess process, DataFlowResponse
                 .execute(description);
     }
 
-    /**
-     * Process STARTED transfer<p> if is completed or there's no checker and it's not managed, set to COMPLETE,
-     * nothing otherwise.
-     *
-     * @param transferProcess the STARTED transfer fetched
-     * @return if the transfer has been processed or not
-     */
-    @WithSpan
-    private boolean processStarted(TransferProcess transferProcess) {
-        return entityRetryProcessFactory.doSimpleProcess(transferProcess, () -> checkCompletion(transferProcess))
-                .execute("Check completion");
-    }
-
-    @NotNull
-    private Boolean checkCompletion(TransferProcess transferProcess) {
-        var checker = statusCheckerRegistry.resolve(transferProcess.getDataDestination().getType());
-        if (checker == null) {
-            monitor.warning(format("No checker found for process %s. The process will not advance to the COMPLETED state.", transferProcess.getId()));
-            return false;
-        } else {
-            var resources = transferProcess.getProvisionedResources();
-            if (checker.isComplete(transferProcess, resources)) {
-                transitionToCompleting(transferProcess);
-                return true;
-            } else {
-                monitor.debug(format("Transfer process %s not COMPLETED yet. The process will stay in STARTED.", transferProcess.getId()));
-                return false;
-            }
-        }
-    }
-
     /**
      * Process COMPLETING transfer<p> Send COMPLETED message to counter-part
      *
@@ -588,6 +552,22 @@ public Builder self() {
             return this;
         }
 
+        @Override
+        public TransferProcessManagerImpl build() {
+            super.build();
+            Objects.requireNonNull(manager.manifestGenerator, "manifestGenerator cannot be null");
+            Objects.requireNonNull(manager.provisionManager, "provisionManager cannot be null");
+            Objects.requireNonNull(manager.dataFlowManager, "dataFlowManager cannot be null");
+            Objects.requireNonNull(manager.dispatcherRegistry, "dispatcherRegistry cannot be null");
+            Objects.requireNonNull(manager.observable, "observable cannot be null");
+            Objects.requireNonNull(manager.policyArchive, "policyArchive cannot be null");
+            Objects.requireNonNull(manager.addressResolver, "addressResolver cannot be null");
+            Objects.requireNonNull(manager.provisionResponsesHandler, "provisionResultHandler cannot be null");
+            Objects.requireNonNull(manager.deprovisionResponsesHandler, "deprovisionResponsesHandler cannot be null");
+
+            return manager;
+        }
+
         public Builder manifestGenerator(ResourceManifestGenerator manifestGenerator) {
             manager.manifestGenerator = manifestGenerator;
             return this;
@@ -608,11 +588,6 @@ public Builder dispatcherRegistry(RemoteMessageDispatcherRegistry registry) {
             return this;
         }
 
-        public Builder statusCheckerRegistry(StatusCheckerRegistry statusCheckerRegistry) {
-            manager.statusCheckerRegistry = statusCheckerRegistry;
-            return this;
-        }
-
         public Builder vault(Vault vault) {
             manager.vault = vault;
             return this;
@@ -652,23 +627,6 @@ public Builder pendingGuard(TransferProcessPendingGuard pendingGuard) {
             manager.pendingGuard = pendingGuard;
             return this;
         }
-
-        @Override
-        public TransferProcessManagerImpl build() {
-            super.build();
-            Objects.requireNonNull(manager.manifestGenerator, "manifestGenerator cannot be null");
-            Objects.requireNonNull(manager.provisionManager, "provisionManager cannot be null");
-            Objects.requireNonNull(manager.dataFlowManager, "dataFlowManager cannot be null");
-            Objects.requireNonNull(manager.dispatcherRegistry, "dispatcherRegistry cannot be null");
-            Objects.requireNonNull(manager.statusCheckerRegistry, "statusCheckerRegistry cannot be null!");
-            Objects.requireNonNull(manager.observable, "observable cannot be null");
-            Objects.requireNonNull(manager.policyArchive, "policyArchive cannot be null");
-            Objects.requireNonNull(manager.addressResolver, "addressResolver cannot be null");
-            Objects.requireNonNull(manager.provisionResponsesHandler, "provisionResultHandler cannot be null");
-            Objects.requireNonNull(manager.deprovisionResponsesHandler, "deprovisionResponsesHandler cannot be null");
-
-            return manager;
-        }
     }
 
 }
diff --git a/...org/eclipse/edc/connector/transfer/process/TransferProcessManagerImplIntegrationTest.java b/...org/eclipse/edc/connector/transfer/process/TransferProcessManagerImplIntegrationTest.java
@@ -86,7 +86,6 @@ void setup() {
                 .manifestGenerator(manifestGenerator)
                 .monitor(monitor)
                 .clock(clock)
-                .statusCheckerRegistry(mock())
                 .observable(mock())
                 .store(store)
                 .policyArchive(policyArchive)