Skip to content

Commit 5fc7a32

Browse files
wolf4oodwolf4ood
committed
chore: fix after upstream changes
1 parent bcb4fab commit 5fc7a32

File tree

5 files changed

+18
-21
lines changed

5 files changed

+18
-21
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
import org.eclipse.edc.connector.controlplane.transfer.spi.flow.DataFlowController;
2222
import org.eclipse.edc.connector.controlplane.transfer.spi.observe.TransferProcessObservable;
2323
import org.eclipse.edc.connector.controlplane.transfer.spi.store.TransferProcessStore;
24+
import org.eclipse.edc.connector.controlplane.transfer.spi.types.DataAddressStore;
2425
import org.eclipse.edc.runtime.metamodel.annotation.Extension;
2526
import org.eclipse.edc.runtime.metamodel.annotation.Inject;
2627
import org.eclipse.edc.runtime.metamodel.annotation.Provider;
2728
import org.eclipse.edc.spi.command.CommandHandlerRegistry;
2829
import org.eclipse.edc.spi.message.RemoteMessageDispatcherRegistry;
2930
import org.eclipse.edc.spi.monitor.Monitor;
30-
import org.eclipse.edc.spi.security.Vault;
3131
import org.eclipse.edc.spi.system.ServiceExtension;
3232
import org.eclipse.edc.transaction.spi.TransactionContext;
3333
import org.eclipse.edc.virtual.controlplane.participantcontext.spi.ParticipantWebhookResolver;
@@ -79,7 +79,7 @@ public class TransferManagerExtension implements ServiceExtension {
7979
private DataAddressResolver dataAddressResolver;
8080

8181
@Inject
82-
private Vault vault;
82+
private DataAddressStore dataAddressStore;
8383

8484
@Inject
8585
private TaskService taskService;
@@ -112,7 +112,7 @@ public TransferProcessTaskExecutor transferProcessTaskExecutor() {
112112
.dataFlowController(dataFlowController)
113113
.dispatcherRegistry(dispatcherRegistry)
114114
.webhookResolver(webhookResolver)
115-
.vault(vault)
115+
.dataAddressStore(dataAddressStore)
116116
.addressResolver(dataAddressResolver)
117117
.monitor(monitor)
118118
.pendingGuard(pendingGuard)

‎core/transfer-process-manager/src/main/java/org/eclipse/edc/virtual/controlplane/transfer/process/task/TransferProcessTaskExecutorImpl.java‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.eclipse.edc.connector.controlplane.transfer.spi.observe.TransferProcessObservable;
2222
import org.eclipse.edc.connector.controlplane.transfer.spi.observe.TransferProcessStartedData;
2323
import org.eclipse.edc.connector.controlplane.transfer.spi.store.TransferProcessStore;
24+
import org.eclipse.edc.connector.controlplane.transfer.spi.types.DataAddressStore;
2425
import org.eclipse.edc.connector.controlplane.transfer.spi.types.TransferProcess;
2526
import org.eclipse.edc.connector.controlplane.transfer.spi.types.TransferProcessStates;
2627
import org.eclipse.edc.connector.controlplane.transfer.spi.types.protocol.TransferCompletionMessage;
@@ -33,8 +34,6 @@
3334
import org.eclipse.edc.spi.message.RemoteMessageDispatcherRegistry;
3435
import org.eclipse.edc.spi.monitor.Monitor;
3536
import org.eclipse.edc.spi.response.StatusResult;
36-
import org.eclipse.edc.spi.security.Vault;
37-
import org.eclipse.edc.spi.types.domain.DataAddress;
3837
import org.eclipse.edc.transaction.spi.TransactionContext;
3938
import org.eclipse.edc.virtual.controlplane.participantcontext.spi.ParticipantWebhookResolver;
4039
import org.eclipse.edc.virtual.controlplane.tasks.ProcessTaskPayload;
@@ -63,7 +62,6 @@
6362
import static org.eclipse.edc.connector.controlplane.transfer.spi.types.TransferProcessStates.REQUESTED;
6463
import static org.eclipse.edc.connector.controlplane.transfer.spi.types.TransferProcessStates.from;
6564
import static org.eclipse.edc.spi.response.ResponseStatus.FATAL_ERROR;
66-
import static org.eclipse.edc.spi.types.domain.DataAddress.EDC_DATA_ADDRESS_SECRET;
6765

6866
public class TransferProcessTaskExecutorImpl implements TransferProcessTaskExecutor {
6967

@@ -74,7 +72,7 @@ public class TransferProcessTaskExecutorImpl implements TransferProcessTaskExecu
7472
private DataFlowController dataFlowController;
7573
private RemoteMessageDispatcherRegistry dispatcherRegistry;
7674
private ParticipantWebhookResolver webhookResolver;
77-
private Vault vault;
75+
private DataAddressStore dataAddressStore;
7876
private DataAddressResolver addressResolver;
7977
private TransferProcessObservable observable;
8078
private PolicyArchive policyArchive;
@@ -296,20 +294,15 @@ private StatusResult<Void> handleCompleteDataflow(TransferProcess process) {
296294
}
297295

298296
private StatusResult<Void> handleSendRequest(TransferProcess process) {
299-
var originalDestination = process.getDataDestination();
300297
var callbackAddress = webhookResolver.getWebhook(process.getParticipantContextId(), process.getProtocol());
301298
var agreementId = policyArchive.getAgreementIdForContract(process.getContractId());
302299

303300
if (callbackAddress != null) {
304-
var dataDestination = Optional.ofNullable(originalDestination)
305-
.map(DataAddress::getKeyName)
306-
.map(vault::resolveSecret)
307-
.map(secret -> DataAddress.Builder.newInstance().properties(originalDestination.getProperties()).property(EDC_DATA_ADDRESS_SECRET, secret).build())
308-
.orElse(originalDestination);
301+
var dataAddress = dataAddressStore.resolve(process).orElse(f -> null);
309302

310303
var messageBuilder = TransferRequestMessage.Builder.newInstance()
311304
.callbackAddress(callbackAddress.url())
312-
.dataDestination(dataDestination)
305+
.dataAddress(dataAddress)
313306
.transferType(process.getTransferType())
314307
.contractId(agreementId);
315308

@@ -485,8 +478,8 @@ public Builder dispatcherRegistry(RemoteMessageDispatcherRegistry registry) {
485478
return this;
486479
}
487480

488-
public Builder vault(Vault vault) {
489-
manager.vault = vault;
481+
public Builder dataAddressStore(DataAddressStore dataAddressStore) {
482+
manager.dataAddressStore = dataAddressStore;
490483
return this;
491484
}
492485

‎core/transfer-process-manager/src/test/java/org/eclipse/edc/virtual/controlplane/transfer/process/task/TransferProcessTaskExecutorImplTest.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import org.eclipse.edc.connector.controlplane.transfer.spi.flow.DataFlowController;
2121
import org.eclipse.edc.connector.controlplane.transfer.spi.observe.TransferProcessObservable;
2222
import org.eclipse.edc.connector.controlplane.transfer.spi.store.TransferProcessStore;
23+
import org.eclipse.edc.connector.controlplane.transfer.spi.types.DataAddressStore;
2324
import org.eclipse.edc.connector.controlplane.transfer.spi.types.DataFlowResponse;
2425
import org.eclipse.edc.connector.controlplane.transfer.spi.types.TransferProcess;
2526
import org.eclipse.edc.connector.controlplane.transfer.spi.types.TransferProcessStates;
@@ -29,7 +30,7 @@
2930
import org.eclipse.edc.spi.message.RemoteMessageDispatcherRegistry;
3031
import org.eclipse.edc.spi.monitor.Monitor;
3132
import org.eclipse.edc.spi.response.StatusResult;
32-
import org.eclipse.edc.spi.security.Vault;
33+
import org.eclipse.edc.spi.result.StoreResult;
3334
import org.eclipse.edc.spi.types.domain.DataAddress;
3435
import org.eclipse.edc.transaction.spi.NoopTransactionContext;
3536
import org.eclipse.edc.transaction.spi.TransactionContext;
@@ -95,7 +96,7 @@ class TransferProcessTaskExecutorImplTest {
9596
private final TransferProcessPendingGuard pendingGuard = mock();
9697
private final TransactionContext transactionContext = new NoopTransactionContext();
9798
private final Monitor monitor = mock();
98-
private final Vault vault = mock();
99+
private final DataAddressStore dataAddressStore = mock();
99100
private final Clock clock = Clock.systemUTC();
100101
private final TaskService taskService = mock();
101102
private final String protocolWebhookUrl = "http://protocol.webhook/url";
@@ -117,7 +118,7 @@ void setUp() {
117118
.pendingGuard(pendingGuard)
118119
.transactionContext(transactionContext)
119120
.monitor(monitor)
120-
.vault(vault)
121+
.dataAddressStore(dataAddressStore)
121122
.clock(clock)
122123
.taskService(taskService)
123124
.build();
@@ -129,14 +130,15 @@ void setUp() {
129130
void handle(TransferProcessTaskPayload payload, TransferProcessStates expectedState) {
130131

131132
var contractId = "contractId";
132-
133+
var dataAddress = DataAddress.Builder.newInstance().type("any").keyName("keyName").build();
133134

134135
when(dataFlowController.started(any())).thenReturn(StatusResult.success());
135136
when(dataFlowController.prepare(any(), any())).thenReturn(StatusResult.success(DataFlowResponse.Builder.newInstance().build()));
136137
when(dataFlowController.start(any(), any())).thenReturn(StatusResult.success(DataFlowResponse.Builder.newInstance().build()));
137138
when(dataFlowController.terminate(any())).thenReturn(StatusResult.success());
138139
when(dataFlowController.suspend(any())).thenReturn(StatusResult.success());
139140
when(addressResolver.resolveForAsset(any())).thenReturn(DataAddress.Builder.newInstance().type("type").build());
141+
when(dataAddressStore.resolve(any())).thenReturn(StoreResult.success(dataAddress));
140142

141143
when(dispatcherRegistry.dispatch(any(), any(), any())).thenReturn(completedFuture(StatusResult.success(TransferProcessAck.Builder.newInstance().build())));
142144
when(webhookResolver.getWebhook(any(), any())).thenReturn(() -> protocolWebhookUrl);

‎extensions/control-plane/api/management-api/management-api-configuration/src/main/resources/management-api-version.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
{
33
"version": "4.0.0-alpha",
44
"urlPath": "/v4alpha",
5-
"lastUpdated": "2026-01-13T17:43:01Z"
5+
"lastUpdated": "2026-02-16T17:43:01Z"
66
}
77
]

‎gradle/libs.versions.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ edc-iam-mock = { module = "org.eclipse.edc:iam-mock", version.ref = "edc" }
108108
edc-tck-extension = { module = "org.eclipse.edc:tck-extension", version.ref = "edc" }
109109
edc-crypto-verifiablecredentials-ldp = { module = "org.eclipse.edc:ldp-verifiable-credentials", version.ref = "edc" }
110110
edc-crypto-verifiablecredentials-jwt = { module = "org.eclipse.edc:jwt-verifiable-credentials", version.ref = "edc" }
111+
edc-crypto-verifiablecredentials = { module = "org.eclipse.edc:verifiable-credentials", version.ref = "edc" }
111112
edc-api-observability = { module = "org.eclipse.edc:api-observability", version.ref = "edc" }
112113
edc-participantcontext-store-sql = { module = "org.eclipse.edc:participantcontext-store-sql", version.ref = "edc" }
113114
edc-participantcontext-config-store-sql = { module = "org.eclipse.edc:participantcontext-config-store-sql", version.ref = "edc" }
@@ -157,6 +158,7 @@ jsonschema = { module = "com.networknt:json-schema-validator", version.ref = "js
157158

158159
[bundles]
159160
dcp = [
161+
"edc-crypto-verifiablecredentials",
160162
"edc-crypto-verifiablecredentials-jwt",
161163
"edc-crypto-verifiablecredentials-ldp",
162164
"edc-iam-dcp-core",

0 commit comments

Comments
 (0)