Skip to content

Commit 592aa2b

Browse files
authored
chore: fix compile issue and remove some unused code (#141)
1 parent b6b450b commit 592aa2b

File tree

13 files changed

+8
-1460
lines changed

13 files changed

+8
-1460
lines changed

core/negotiation-manager/src/main/java/org/eclipse/edc/virtual/controlplane/contract/negotiation/ContractManagerExtension.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,8 @@
2525
import org.eclipse.edc.spi.message.RemoteMessageDispatcherRegistry;
2626
import org.eclipse.edc.spi.monitor.Monitor;
2727
import org.eclipse.edc.spi.system.ServiceExtension;
28-
import org.eclipse.edc.spi.system.ServiceExtensionContext;
2928
import org.eclipse.edc.transaction.spi.TransactionContext;
3029
import org.eclipse.edc.virtual.controlplane.contract.negotiation.task.ContractNegotiationTaskExecutorImpl;
31-
import org.eclipse.edc.virtual.controlplane.contract.spi.negotiation.ContractNegotiationStateMachineService;
3230
import org.eclipse.edc.virtual.controlplane.contract.spi.negotiation.ContractNegotiationTaskExecutor;
3331
import org.eclipse.edc.virtual.controlplane.participantcontext.spi.ParticipantWebhookResolver;
3432
import org.eclipse.edc.virtual.controlplane.tasks.TaskService;
@@ -76,11 +74,6 @@ public ConsumerContractNegotiationManager consumerContractNegotiationManager() {
7674
return new VirtualConsumerContractNegotiationManager(contractNegotiationStore, observable, monitor);
7775
}
7876

79-
@Provider
80-
public ContractNegotiationStateMachineService contractNegotiationStateMachineService(ServiceExtensionContext context) {
81-
return new ContractNegotiationStateMachineServiceImpl(clock, identityResolver, webhookResolver, dispatcherRegistry, contractNegotiationStore, transactionContext, pendingGuard, observable, monitor);
82-
}
83-
8477
@Provider
8578
public ContractNegotiationTaskExecutor contractNegotiationTaskExecutor() {
8679
return ContractNegotiationTaskExecutorImpl.Builder.newInstance()

core/negotiation-manager/src/main/java/org/eclipse/edc/virtual/controlplane/contract/negotiation/ContractNegotiationStateMachineServiceImpl.java

Lines changed: 0 additions & 420 deletions
This file was deleted.

core/negotiation-manager/src/main/java/org/eclipse/edc/virtual/controlplane/contract/negotiation/VirtualConsumerContractNegotiationManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.eclipse.edc.spi.monitor.Monitor;
2525
import org.eclipse.edc.spi.response.StatusResult;
2626
import org.eclipse.edc.spi.telemetry.Telemetry;
27-
import org.eclipse.edc.virtual.controlplane.contract.spi.negotiation.ContractNegotiationStateMachineService;
27+
import org.eclipse.edc.virtual.controlplane.contract.spi.negotiation.ContractNegotiationTaskExecutor;
2828

2929
import java.util.UUID;
3030

@@ -33,7 +33,7 @@
3333
/**
3434
* An implementation of the {@link ConsumerContractNegotiationManager} that only handles initial contract negotiation
3535
* requests by transitioning them to the initial state. The subsequent state transitions are handled by the
36-
* by {@link ContractNegotiationStateMachineService},
36+
* by {@link ContractNegotiationTaskExecutor},
3737
* which can be invoked using different mechanisms, such as a loopback mechanism, a message bus.
3838
*/
3939
public class VirtualConsumerContractNegotiationManager implements ConsumerContractNegotiationManager {

core/transfer-process-manager/src/main/java/org/eclipse/edc/virtual/controlplane/transfer/process/TransferManagerExtension.java

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.eclipse.edc.spi.monitor.Monitor;
3030
import org.eclipse.edc.spi.security.Vault;
3131
import org.eclipse.edc.spi.system.ServiceExtension;
32-
import org.eclipse.edc.spi.system.ServiceExtensionContext;
3332
import org.eclipse.edc.transaction.spi.TransactionContext;
3433
import org.eclipse.edc.virtual.controlplane.participantcontext.spi.ParticipantWebhookResolver;
3534
import org.eclipse.edc.virtual.controlplane.tasks.TaskService;
@@ -38,7 +37,6 @@
3837
import org.eclipse.edc.virtual.controlplane.transfer.process.task.command.ResumeTransferCommandHandler;
3938
import org.eclipse.edc.virtual.controlplane.transfer.process.task.command.SuspendTransferCommandHandler;
4039
import org.eclipse.edc.virtual.controlplane.transfer.process.task.command.TerminateTransferCommandHandler;
41-
import org.eclipse.edc.virtual.controlplane.transfer.spi.TransferProcessStateMachineService;
4240
import org.eclipse.edc.virtual.controlplane.transfer.spi.TransferProcessTaskExecutor;
4341

4442
import java.time.Clock;
@@ -106,23 +104,6 @@ public TransferProcessManager transferProcessManager() {
106104
return new VirtualTransferProcessManager(store, observable, policyArchive, clock, monitor);
107105
}
108106

109-
@Provider
110-
public TransferProcessStateMachineService transferProcessStateMachineService(ServiceExtensionContext context) {
111-
return TransferProcessStateMachineServiceImpl.Builder.newInstance()
112-
.store(store)
113-
.transactionContext(transactionContext)
114-
.dataFlowController(dataFlowController)
115-
.dispatcherRegistry(dispatcherRegistry)
116-
.webhookResolver(webhookResolver)
117-
.vault(vault)
118-
.addressResolver(dataAddressResolver)
119-
.monitor(monitor)
120-
.pendingGuard(pendingGuard)
121-
.observable(observable)
122-
.policyArchive(policyArchive)
123-
.build();
124-
}
125-
126107
@Provider
127108
public TransferProcessTaskExecutor transferProcessTaskExecutor() {
128109
return TransferProcessTaskExecutorImpl.Builder.newInstance()

0 commit comments

Comments
 (0)