fix compilation

eclipse-tractusx · Oct 8, 2024 · 76d5d10 · 76d5d10
1 parent f1c7865
commit 76d5d10
Show file tree

Hide file tree

Showing 8 changed files with 230 additions and 234 deletions.
diff --git a/DEPENDENCIES b/DEPENDENCIES
diff --git a/...pse/tractusx/edc/validation/businesspartner/BusinessPartnerNumberValidationExtension.java b/...pse/tractusx/edc/validation/businesspartner/BusinessPartnerNumberValidationExtension.java
@@ -28,12 +28,12 @@
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
 import org.eclipse.tractusx.edc.validation.businesspartner.functions.BusinessPartnerNumberPermissionFunction;
 
-import static org.eclipse.edc.connector.controlplane.contract.spi.offer.ContractDefinitionResolver.CATALOGING_SCOPE;
 import static org.eclipse.edc.connector.controlplane.contract.spi.validation.ContractValidationService.NEGOTIATION_SCOPE;
 import static org.eclipse.edc.connector.controlplane.contract.spi.validation.ContractValidationService.TRANSFER_SCOPE;
 import static org.eclipse.edc.policy.model.OdrlNamespace.ODRL_SCHEMA;
 import static org.eclipse.tractusx.edc.edr.spi.CoreConstants.TX_NAMESPACE;
 import static org.eclipse.tractusx.edc.validation.businesspartner.BusinessPartnerNumberValidationExtension.NAME;
+import static org.eclipse.tractusx.edc.validation.businesspartner.BusinessPartnerValidationExtension.CATALOGING_SCOPE;
 
 /**
  * Business partner number evaluation function.

diff --git a/...g/eclipse/tractusx/edc/validation/businesspartner/BusinessPartnerValidationExtension.java b/...g/eclipse/tractusx/edc/validation/businesspartner/BusinessPartnerValidationExtension.java
@@ -29,7 +29,6 @@
 import org.eclipse.tractusx.edc.validation.businesspartner.functions.BusinessPartnerGroupFunction;
 import org.eclipse.tractusx.edc.validation.businesspartner.spi.BusinessPartnerStore;
 
-import static org.eclipse.edc.connector.controlplane.contract.spi.offer.ContractDefinitionResolver.CATALOGING_SCOPE;
 import static org.eclipse.edc.connector.controlplane.contract.spi.validation.ContractValidationService.NEGOTIATION_SCOPE;
 import static org.eclipse.edc.connector.controlplane.contract.spi.validation.ContractValidationService.TRANSFER_SCOPE;
 import static org.eclipse.edc.policy.model.OdrlNamespace.ODRL_SCHEMA;
@@ -57,7 +56,11 @@
  */
 @Extension(value = "Registers a function to evaluate whether a BPN number is covered by a certain policy or not", categories = { "policy", "contract" })
 public class BusinessPartnerValidationExtension implements ServiceExtension {
+
+    public static final String CATALOGING_SCOPE = "catalog";
+
     private static final String USE = "USE";
+
     @Inject
     private RuleBindingRegistry ruleBindingRegistry;
     @Inject

diff --git a/...k/src/main/java/org/eclipse/tractusx/edc/callback/InProcessCallbackMessageDispatcher.java b/...k/src/main/java/org/eclipse/tractusx/edc/callback/InProcessCallbackMessageDispatcher.java
@@ -42,11 +42,6 @@ public InProcessCallbackMessageDispatcher(InProcessCallbackRegistry registry) {
         this.registry = registry;
     }
 
-    @Override
-    public String protocol() {
-        return CALLBACK_EVENT_LOCAL;
-    }
-
     @Override
     public <T, M extends RemoteMessage> CompletableFuture<StatusResult<T>> dispatch(Class<T> responseType, M message) {
         if (message instanceof CallbackEventRemoteMessage) {

diff --git a/.../edr-callback/src/main/java/org/eclipse/tractusx/edc/callback/LocalCallbackExtension.java b/.../edr-callback/src/main/java/org/eclipse/tractusx/edc/callback/LocalCallbackExtension.java
@@ -20,16 +20,13 @@
 package org.eclipse.tractusx.edc.callback;
 
 import org.eclipse.edc.connector.controlplane.services.spi.callback.CallbackProtocolResolverRegistry;
-import org.eclipse.edc.connector.controlplane.services.spi.contractagreement.ContractAgreementService;
 import org.eclipse.edc.connector.controlplane.services.spi.transferprocess.TransferProcessService;
 import org.eclipse.edc.runtime.metamodel.annotation.Extension;
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;
 import org.eclipse.edc.spi.message.RemoteMessageDispatcherRegistry;
 import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.system.ServiceExtension;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
-import org.eclipse.edc.transaction.spi.TransactionContext;
-import org.eclipse.edc.transform.spi.TypeTransformerRegistry;
 import org.eclipse.tractusx.edc.spi.callback.InProcessCallbackRegistry;
 
 import static org.eclipse.tractusx.edc.callback.InProcessCallbackMessageDispatcher.CALLBACK_EVENT_LOCAL;
@@ -54,15 +51,6 @@ public class LocalCallbackExtension implements ServiceExtension {
     @Inject
     private Monitor monitor;
 
-    @Inject
-    private TransactionContext transactionContext;
-
-    @Inject
-    private ContractAgreementService agreementService;
-
-    @Inject
-    private TypeTransformerRegistry transformerRegistry;
-
     @Override
     public String name() {
         return NAME;
@@ -74,7 +62,7 @@ public void initialize(ServiceExtensionContext context) {
         callbackRegistry.registerHandler(new ContractNegotiationCallback(transferProcessService, monitor));
 
         resolverRegistry.registerResolver(this::resolveProtocol);
-        registry.register(new InProcessCallbackMessageDispatcher(callbackRegistry));
+        registry.register(CALLBACK_EVENT_LOCAL, new InProcessCallbackMessageDispatcher(callbackRegistry));
 
     }
 

diff --git a/edc-tests/runtime/iatp/runtime-memory-iatp-dim-ih/build.gradle.kts b/edc-tests/runtime/iatp/runtime-memory-iatp-dim-ih/build.gradle.kts
@@ -52,6 +52,7 @@ dependencies {
     implementation(libs.edc.ih.api.presentation)
     implementation(libs.edc.ih.keypairs)
     implementation(libs.edc.ih.participants)
+    implementation(libs.edc.sts.account.provisioner)
     implementation(libs.edc.ih.did)
     implementation(libs.edc.ih.core)
 

diff --git a/edc-tests/runtime/iatp/runtime-memory-iatp-ih/build.gradle.kts b/edc-tests/runtime/iatp/runtime-memory-iatp-ih/build.gradle.kts
@@ -54,6 +54,7 @@ dependencies {
     implementation(libs.edc.ih.api.presentation)
     implementation(libs.edc.ih.keypairs)
     implementation(libs.edc.ih.participants)
+    implementation(libs.edc.sts.account.provisioner)
     implementation(libs.edc.ih.did)
     implementation(libs.edc.ih.core)
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -139,6 +139,7 @@ edc-identity-trust-sts-embedded = { module = "org.eclipse.edc:identity-trust-sts
 edc-identity-trust-sts-core = { module = "org.eclipse.edc:identity-trust-sts-core", version.ref = "edc" }
 edc-identity-trust-sts-api = { module = "org.eclipse.edc:identity-trust-sts-api", version.ref = "edc" }
 edc-identity-trust-sts-client-configuration = { module = "org.eclipse.edc:identity-trust-sts-client-configuration", version.ref = "edc" }
+edc-sts-account-provisioner = { module = "org.eclipse.edc:sts-account-provisioner", version.ref = "edc" }
 
 # Federated Catalog modules
 edc-fc-spi-crawler = { module = "org.eclipse.edc:crawler-spi", version.ref = "edc" }
@@ -218,7 +219,12 @@ edc-sqlstores = [
     "edc-data-plane-instance-store-sql"
 ]
 edc-monitoring = ["edc-micrometer-core", "edc-micrometer-jersey", "edc-micrometer-jetty"]
-edc-sts = ["edc-identity-trust-sts-core", "edc-identity-trust-sts-api", "edc-identity-trust-sts-client-configuration"]
+edc-sts = [
+    "edc-identity-trust-sts-core",
+    "edc-identity-trust-sts-api",
+    "edc-identity-trust-sts-client-configuration",
+    "edc-sts-account-provisioner"
+]
 
 [plugins]
 swagger = { id = "io.swagger.core.v3.swagger-gradle-plugin", version = "2.2.24" }