chore: adopt upstream ParticipantIdentityResolver (#24)

Author: wolf4ood

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

@@ -18,6 +18,7 @@
 import org.eclipse.edc.connector.controlplane.contract.spi.negotiation.ContractNegotiationPendingGuard;
 import org.eclipse.edc.connector.controlplane.contract.spi.negotiation.observe.ContractNegotiationObservable;
 import org.eclipse.edc.connector.controlplane.contract.spi.negotiation.store.ContractNegotiationStore;
+import org.eclipse.edc.participantcontext.spi.identity.ParticipantIdentityResolver;
 import org.eclipse.edc.runtime.metamodel.annotation.Extension;
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;
 import org.eclipse.edc.runtime.metamodel.annotation.Provider;
@@ -27,7 +28,6 @@
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
 import org.eclipse.edc.transaction.spi.TransactionContext;
 import org.eclipse.edc.virtualized.controlplane.contract.spi.negotiation.ContractNegotiationStateMachineService;
-import org.eclipse.edc.virtualized.controlplane.participantcontext.spi.ParticipantIdentityResolver;
 import org.eclipse.edc.virtualized.controlplane.participantcontext.spi.ParticipantWebhookResolver;
 
 import java.time.Clock;

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

@@ -27,14 +27,14 @@
 import org.eclipse.edc.connector.controlplane.contract.spi.types.negotiation.ContractOfferMessage;
 import org.eclipse.edc.connector.controlplane.contract.spi.types.negotiation.ContractRequestMessage;
 import org.eclipse.edc.connector.controlplane.contract.spi.types.protocol.ContractNegotiationAck;
+import org.eclipse.edc.participantcontext.spi.identity.ParticipantIdentityResolver;
 import org.eclipse.edc.policy.model.PolicyType;
 import org.eclipse.edc.spi.message.RemoteMessageDispatcherRegistry;
 import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.response.StatusResult;
 import org.eclipse.edc.spi.types.domain.message.ProcessRemoteMessage;
 import org.eclipse.edc.transaction.spi.TransactionContext;
 import org.eclipse.edc.virtualized.controlplane.contract.spi.negotiation.ContractNegotiationStateMachineService;
-import org.eclipse.edc.virtualized.controlplane.participantcontext.spi.ParticipantIdentityResolver;
 import org.eclipse.edc.virtualized.controlplane.participantcontext.spi.ParticipantWebhookResolver;
 
 import java.time.Clock;

core/v-connector-core/src/main/java/org/eclipse/edc/virtualized/controlplane/VirtualCoreServicesExtension.java

@@ -15,6 +15,7 @@
 package org.eclipse.edc.virtualized.controlplane;
 
 import org.eclipse.edc.participantcontext.spi.config.ParticipantContextConfig;
+import org.eclipse.edc.participantcontext.spi.identity.ParticipantIdentityResolver;
 import org.eclipse.edc.protocol.spi.DataspaceProfileContextRegistry;
 import org.eclipse.edc.runtime.metamodel.annotation.Extension;
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;
@@ -23,7 +24,6 @@
 import org.eclipse.edc.spi.system.ServiceExtension;
 import org.eclipse.edc.virtualized.controlplane.participantcontext.ParticipantContextIdentityResolverImpl;
 import org.eclipse.edc.virtualized.controlplane.participantcontext.ParticipantWebhookResolverImpl;
-import org.eclipse.edc.virtualized.controlplane.participantcontext.spi.ParticipantIdentityResolver;
 import org.eclipse.edc.virtualized.controlplane.participantcontext.spi.ParticipantWebhookResolver;
 
 import static org.eclipse.edc.virtualized.controlplane.VirtualCoreServicesExtension.NAME;

core/v-connector-core/src/main/java/org/eclipse/edc/virtualized/controlplane/participantcontext/ParticipantContextIdentityResolverImpl.java

@@ -15,7 +15,7 @@
 package org.eclipse.edc.virtualized.controlplane.participantcontext;
 
 import org.eclipse.edc.participantcontext.spi.config.ParticipantContextConfig;
-import org.eclipse.edc.virtualized.controlplane.participantcontext.spi.ParticipantIdentityResolver;
+import org.eclipse.edc.participantcontext.spi.identity.ParticipantIdentityResolver;
 import org.jetbrains.annotations.Nullable;
 
 import static org.eclipse.edc.virtualized.controlplane.VirtualCoreServicesExtension.PARTICIPANT_ID;
@@ -28,7 +28,6 @@ public ParticipantContextIdentityResolverImpl(ParticipantContextConfig contextCo
         this.contextConfig = contextConfig;
     }
 
-    //TODO take into account the protocol, probably wait for upstream final changes
     @Override
     public @Nullable String getParticipantId(String participantContextId, String protocol) {
         return contextConfig.getString(participantContextId, PARTICIPANT_ID);

data-protocols/dsp/dsp-2025/dsp-http-api-configuration-2025/src/main/java/org/eclipse/edc/virtual/protocol/dsp/http/api/configuration/v2025/DspApiConfigurationV2025Extension.java

@@ -86,7 +86,7 @@ public void initialize(ServiceExtensionContext context) {
         registerTransformers();
 
         // dynamic webhook registration based on participant context
-        dataspaceProfileContextRegistry.register(new DataspaceProfileContext(DATASPACE_PROTOCOL_HTTP_V_2025_1, V_2025_1, () -> dspWebhookAddress.get() + "/%s" + V_2025_1_PATH, context.getParticipantId(), participantIdExtractionFunction));
+        dataspaceProfileContextRegistry.register(new DataspaceProfileContext(DATASPACE_PROTOCOL_HTTP_V_2025_1, V_2025_1, () -> dspWebhookAddress.get() + "/%s" + V_2025_1_PATH, participantIdExtractionFunction));
     }
 
     private void registerNamespaces() {