diff --git a/core/common/lib/api-lib/build.gradle.kts b/core/common/lib/api-lib/build.gradle.kts new file mode 100644 index 0000000000..0836fd2d23 --- /dev/null +++ b/core/common/lib/api-lib/build.gradle.kts @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2025 Cofinity-X + * + * This program and the accompanying materials are made available under the + * terms of the Apache License, Version 2.0 which is available at + * https://www.apache.org/licenses/LICENSE-2.0 + * + * SPDX-License-Identifier: Apache-2.0 + * + * Contributors: + * Cofinity-X - initial API and implementation + * + */ + +plugins { + `java-library` +} + +dependencies { + api(project(":spi:common:core-spi")) + + implementation(project(":core:common:lib:validator-lib")) + implementation(libs.swagger.annotations.jakarta) + + testImplementation(project(":core:common:junit")) + testImplementation(project(":core:common:lib:json-ld-lib")) + testImplementation(project(":core:common:lib:query-lib")) + testImplementation(project(":core:common:lib:transform-lib")) +} + + diff --git a/extensions/common/api/api-core/src/main/java/org/eclipse/edc/api/model/ApiCoreSchema.java b/core/common/lib/api-lib/src/main/java/org/eclipse/edc/api/model/ApiCoreSchema.java similarity index 100% rename from extensions/common/api/api-core/src/main/java/org/eclipse/edc/api/model/ApiCoreSchema.java rename to core/common/lib/api-lib/src/main/java/org/eclipse/edc/api/model/ApiCoreSchema.java diff --git a/extensions/common/api/api-core/src/main/java/org/eclipse/edc/api/model/IdResponse.java b/core/common/lib/api-lib/src/main/java/org/eclipse/edc/api/model/IdResponse.java similarity index 100% rename from extensions/common/api/api-core/src/main/java/org/eclipse/edc/api/model/IdResponse.java rename to core/common/lib/api-lib/src/main/java/org/eclipse/edc/api/model/IdResponse.java diff --git a/extensions/common/api/api-core/src/main/java/org/eclipse/edc/api/transformer/JsonObjectFromCallbackAddressTransformer.java b/core/common/lib/api-lib/src/main/java/org/eclipse/edc/api/transformer/JsonObjectFromCallbackAddressTransformer.java similarity index 100% rename from extensions/common/api/api-core/src/main/java/org/eclipse/edc/api/transformer/JsonObjectFromCallbackAddressTransformer.java rename to core/common/lib/api-lib/src/main/java/org/eclipse/edc/api/transformer/JsonObjectFromCallbackAddressTransformer.java diff --git a/extensions/common/api/api-core/src/main/java/org/eclipse/edc/api/transformer/JsonObjectFromIdResponseTransformer.java b/core/common/lib/api-lib/src/main/java/org/eclipse/edc/api/transformer/JsonObjectFromIdResponseTransformer.java similarity index 100% rename from extensions/common/api/api-core/src/main/java/org/eclipse/edc/api/transformer/JsonObjectFromIdResponseTransformer.java rename to core/common/lib/api-lib/src/main/java/org/eclipse/edc/api/transformer/JsonObjectFromIdResponseTransformer.java diff --git a/extensions/common/api/api-core/src/main/java/org/eclipse/edc/api/transformer/JsonObjectToCallbackAddressTransformer.java b/core/common/lib/api-lib/src/main/java/org/eclipse/edc/api/transformer/JsonObjectToCallbackAddressTransformer.java similarity index 100% rename from extensions/common/api/api-core/src/main/java/org/eclipse/edc/api/transformer/JsonObjectToCallbackAddressTransformer.java rename to core/common/lib/api-lib/src/main/java/org/eclipse/edc/api/transformer/JsonObjectToCallbackAddressTransformer.java diff --git a/extensions/common/api/api-core/src/main/java/org/eclipse/edc/api/validation/DataAddressValidator.java b/core/common/lib/api-lib/src/main/java/org/eclipse/edc/api/validation/DataAddressValidator.java similarity index 100% rename from extensions/common/api/api-core/src/main/java/org/eclipse/edc/api/validation/DataAddressValidator.java rename to core/common/lib/api-lib/src/main/java/org/eclipse/edc/api/validation/DataAddressValidator.java diff --git a/extensions/common/api/api-core/src/test/java/org/eclipse/edc/api/model/ApiCoreSchemaTest.java b/core/common/lib/api-lib/src/test/java/org/eclipse/edc/api/model/ApiCoreSchemaTest.java similarity index 100% rename from extensions/common/api/api-core/src/test/java/org/eclipse/edc/api/model/ApiCoreSchemaTest.java rename to core/common/lib/api-lib/src/test/java/org/eclipse/edc/api/model/ApiCoreSchemaTest.java diff --git a/extensions/common/api/api-core/src/test/java/org/eclipse/edc/api/transformer/JsonObjectFromCallbackAddressTransformerTest.java b/core/common/lib/api-lib/src/test/java/org/eclipse/edc/api/transformer/JsonObjectFromCallbackAddressTransformerTest.java similarity index 100% rename from extensions/common/api/api-core/src/test/java/org/eclipse/edc/api/transformer/JsonObjectFromCallbackAddressTransformerTest.java rename to core/common/lib/api-lib/src/test/java/org/eclipse/edc/api/transformer/JsonObjectFromCallbackAddressTransformerTest.java diff --git a/extensions/common/api/api-core/src/test/java/org/eclipse/edc/api/transformer/JsonObjectFromIdResponseTransformerTest.java b/core/common/lib/api-lib/src/test/java/org/eclipse/edc/api/transformer/JsonObjectFromIdResponseTransformerTest.java similarity index 100% rename from extensions/common/api/api-core/src/test/java/org/eclipse/edc/api/transformer/JsonObjectFromIdResponseTransformerTest.java rename to core/common/lib/api-lib/src/test/java/org/eclipse/edc/api/transformer/JsonObjectFromIdResponseTransformerTest.java diff --git a/extensions/common/api/api-core/src/test/java/org/eclipse/edc/api/transformer/JsonObjectToCallbackAddressTransformerTest.java b/core/common/lib/api-lib/src/test/java/org/eclipse/edc/api/transformer/JsonObjectToCallbackAddressTransformerTest.java similarity index 100% rename from extensions/common/api/api-core/src/test/java/org/eclipse/edc/api/transformer/JsonObjectToCallbackAddressTransformerTest.java rename to core/common/lib/api-lib/src/test/java/org/eclipse/edc/api/transformer/JsonObjectToCallbackAddressTransformerTest.java diff --git a/extensions/common/api/api-core/src/test/java/org/eclipse/edc/api/validation/DataAddressValidatorTest.java b/core/common/lib/api-lib/src/test/java/org/eclipse/edc/api/validation/DataAddressValidatorTest.java similarity index 100% rename from extensions/common/api/api-core/src/test/java/org/eclipse/edc/api/validation/DataAddressValidatorTest.java rename to core/common/lib/api-lib/src/test/java/org/eclipse/edc/api/validation/DataAddressValidatorTest.java diff --git a/dist/bom/controlplane-base-bom/build.gradle.kts b/dist/bom/controlplane-base-bom/build.gradle.kts index 95ab9bd011..f7ebf28fcb 100644 --- a/dist/bom/controlplane-base-bom/build.gradle.kts +++ b/dist/bom/controlplane-base-bom/build.gradle.kts @@ -23,27 +23,27 @@ dependencies { // core dependencies api(project(":core:common:boot")) api(project(":core:common:connector-core")) + api(project(":core:common:edr-store-core")) api(project(":core:common:token-core")) api(project(":core:control-plane:control-plane-core")) - api(project(":core:common:edr-store-core")) - api(project(":data-protocols:dsp")) api(project(":core:data-plane-selector:data-plane-selector-core")) - + api(project(":data-protocols:dsp")) // extension dependencies api(project(":extensions:common:configuration:configuration-filesystem")) api(project(":extensions:common:auth:auth-tokenbased")) api(project(":extensions:common:auth:auth-configuration")) api(project(":extensions:common:auth:auth-delegated")) + api(project(":extensions:common:api:api-core")) + api(project(":extensions:common:api:api-observability")) + api(project(":extensions:common:api:control-api-configuration")) + api(project(":extensions:common:api:version-api")) + api(project(":extensions:common:http")) api(project(":extensions:control-plane:api:management-api")) api(project(":extensions:control-plane:transfer:transfer-data-plane-signaling")) api(project(":extensions:data-plane-selector:data-plane-selector-api")) api(project(":extensions:data-plane-selector:data-plane-selector-control-api")) api(project(":extensions:data-plane:data-plane-signaling:data-plane-signaling-client")) - api(project(":extensions:common:api:api-observability")) - api(project(":extensions:common:api:control-api-configuration")) - api(project(":extensions:common:api:version-api")) - api(project(":extensions:common:http")) api(project(":extensions:control-plane:callback:callback-event-dispatcher")) api(project(":extensions:control-plane:callback:callback-http-dispatcher")) api(project(":extensions:control-plane:edr:edr-store-receiver")) @@ -54,4 +54,4 @@ dependencies { edcBuild { -} \ No newline at end of file +} diff --git a/dist/bom/dataplane-base-bom/build.gradle.kts b/dist/bom/dataplane-base-bom/build.gradle.kts index a2c92666cc..3980f7d90e 100644 --- a/dist/bom/dataplane-base-bom/build.gradle.kts +++ b/dist/bom/dataplane-base-bom/build.gradle.kts @@ -26,10 +26,12 @@ dependencies { api(project(":core:common:token-core")) api(project(":core:data-plane:data-plane-core")) - // extension dependencies + api(project(":extensions:common:api:api-core")) + api(project(":extensions:common:api:api-observability")) api(project(":extensions:common:api:control-api-configuration")) api(project(":extensions:common:configuration:configuration-filesystem")) + api(project(":extensions:common:http")) api(project(":extensions:common:json-ld")) api(project(":extensions:control-plane:api:control-plane-api-client")) api(project(":extensions:data-plane:data-plane-self-registration")) @@ -39,6 +41,5 @@ dependencies { api(project(":extensions:data-plane:data-plane-signaling:data-plane-signaling-api")) api(project(":extensions:data-plane:data-plane-iam")) api(project(":extensions:data-plane-selector:data-plane-selector-client")) - api(project(":extensions:common:api:api-observability")) - api(project(":extensions:common:http")) + } diff --git a/dist/bom/sts-feature-bom/build.gradle.kts b/dist/bom/sts-feature-bom/build.gradle.kts index 70c2285eb8..3e4c8d5510 100644 --- a/dist/bom/sts-feature-bom/build.gradle.kts +++ b/dist/bom/sts-feature-bom/build.gradle.kts @@ -26,8 +26,8 @@ dependencies { api(project(":core:common:connector-core")) api(project(":core:common:token-core")) - // extension dependencies + api(project(":extensions:common:api:api-core")) api(project(":extensions:common:http")) api(project(":extensions:common:json-ld")) api(project(":extensions:common:api:api-observability")) @@ -38,4 +38,4 @@ dependencies { api(project(":extensions:common:iam:identity-trust:identity-trust-sts:identity-trust-sts-accounts-api")) api(project(":extensions:common:iam:identity-trust:identity-trust-sts:identity-trust-sts-core")) api(project(":extensions:common:iam:identity-trust:identity-trust-sts:identity-trust-sts-embedded")) -} \ No newline at end of file +} diff --git a/extensions/common/api/api-core/build.gradle.kts b/extensions/common/api/api-core/build.gradle.kts index 7d07a069d8..a014432fea 100644 --- a/extensions/common/api/api-core/build.gradle.kts +++ b/extensions/common/api/api-core/build.gradle.kts @@ -22,6 +22,7 @@ dependencies { api(project(":spi:common:web-spi")) api(project(":spi:common:json-ld-spi")) + implementation(project(":core:common:lib:api-lib")) implementation(project(":core:common:lib:transform-lib")) implementation(project(":core:common:lib:util-lib")) implementation(project(":core:common:lib:validator-lib")) diff --git a/extensions/common/api/control-api-configuration/build.gradle.kts b/extensions/common/api/control-api-configuration/build.gradle.kts index 01ff7f0d30..1b2012a0e8 100644 --- a/extensions/common/api/control-api-configuration/build.gradle.kts +++ b/extensions/common/api/control-api-configuration/build.gradle.kts @@ -18,9 +18,9 @@ plugins { } dependencies { + api(project(":spi:common:auth-spi")) api(project(":spi:common:web-spi")) api(project(":spi:control-plane:transfer-spi")) - implementation(project(":extensions:common:api:api-core")) implementation(project(":extensions:common:http:lib:jersey-providers-lib")) testImplementation(project(":core:common:junit")) diff --git a/extensions/common/api/management-api-configuration/build.gradle.kts b/extensions/common/api/management-api-configuration/build.gradle.kts index cee8567966..7cadbdd00c 100644 --- a/extensions/common/api/management-api-configuration/build.gradle.kts +++ b/extensions/common/api/management-api-configuration/build.gradle.kts @@ -18,15 +18,15 @@ plugins { } dependencies { + api(project(":spi:common:auth-spi")) api(project(":spi:common:json-ld-spi")) api(project(":spi:common:web-spi")) api(project(":spi:control-plane:contract-spi")) - implementation(project(":extensions:common:api:lib:management-api-lib")) - implementation(project(":extensions:common:http:lib:jersey-providers-lib")) - implementation(project(":extensions:common:api:api-core")) implementation(project(":core:common:lib:transform-lib")) implementation(project(":core:control-plane:control-plane-transform")) + implementation(project(":extensions:common:api:lib:management-api-lib")) + implementation(project(":extensions:common:http:lib:jersey-providers-lib")) testImplementation(project(":core:common:junit")) testImplementation(project(":core:common:lib:json-ld-lib")) diff --git a/extensions/common/api/version-api/build.gradle.kts b/extensions/common/api/version-api/build.gradle.kts index 6dd0447bf8..8ac121dd5e 100644 --- a/extensions/common/api/version-api/build.gradle.kts +++ b/extensions/common/api/version-api/build.gradle.kts @@ -19,7 +19,9 @@ plugins { } dependencies { - implementation(project(":extensions:common:api:api-core")) + api(project(":spi:common:boot-spi")) + api(project(":spi:common:json-ld-spi")) + api(project(":spi:common:web-spi")) implementation(libs.jakarta.rsApi) diff --git a/extensions/control-plane/api/management-api/asset-api/build.gradle.kts b/extensions/control-plane/api/management-api/asset-api/build.gradle.kts index fa1bf2314e..1dd91b1819 100644 --- a/extensions/control-plane/api/management-api/asset-api/build.gradle.kts +++ b/extensions/control-plane/api/management-api/asset-api/build.gradle.kts @@ -22,8 +22,8 @@ dependencies { api(project(":spi:common:validator-spi")) api(project(":spi:control-plane:control-plane-spi")) + implementation(project(":core:common:lib:api-lib")) implementation(project(":core:common:lib:validator-lib")) - implementation(project(":extensions:common:api:api-core")) implementation(project(":extensions:common:api:lib:management-api-lib")) implementation(libs.jakarta.rsApi) diff --git a/extensions/control-plane/api/management-api/catalog-api/build.gradle.kts b/extensions/control-plane/api/management-api/catalog-api/build.gradle.kts index e41741c7de..5ba17e1a01 100644 --- a/extensions/control-plane/api/management-api/catalog-api/build.gradle.kts +++ b/extensions/control-plane/api/management-api/catalog-api/build.gradle.kts @@ -20,8 +20,8 @@ plugins { dependencies { api(project(":spi:control-plane:control-plane-spi")) + implementation(project(":core:common:lib:api-lib")) implementation(project(":core:common:lib:validator-lib")) - implementation(project(":extensions:common:api:api-core")) implementation(project(":extensions:common:api:lib:management-api-lib")) implementation(libs.jakarta.rsApi) diff --git a/extensions/control-plane/api/management-api/contract-agreement-api/build.gradle.kts b/extensions/control-plane/api/management-api/contract-agreement-api/build.gradle.kts index 90cd90b0ce..2dcafa93b7 100644 --- a/extensions/control-plane/api/management-api/contract-agreement-api/build.gradle.kts +++ b/extensions/control-plane/api/management-api/contract-agreement-api/build.gradle.kts @@ -22,7 +22,7 @@ plugins { dependencies { api(project(":spi:control-plane:control-plane-spi")) - implementation(project(":extensions:common:api:api-core")) + implementation(project(":core:common:lib:api-lib")) implementation(project(":extensions:common:api:lib:management-api-lib")) implementation(libs.jakarta.rsApi) diff --git a/extensions/control-plane/api/management-api/contract-definition-api/build.gradle.kts b/extensions/control-plane/api/management-api/contract-definition-api/build.gradle.kts index 6f960a2a2b..4009386112 100644 --- a/extensions/control-plane/api/management-api/contract-definition-api/build.gradle.kts +++ b/extensions/control-plane/api/management-api/contract-definition-api/build.gradle.kts @@ -21,8 +21,8 @@ dependencies { api(project(":spi:control-plane:control-plane-spi")) api(project(":spi:common:transaction-spi")) - implementation(project(":extensions:common:api:api-core")) implementation(project(":extensions:common:api:lib:management-api-lib")) + implementation(project(":core:common:lib:api-lib")) implementation(project(":core:common:lib:validator-lib")) implementation(libs.jakarta.rsApi) diff --git a/extensions/control-plane/api/management-api/contract-negotiation-api/build.gradle.kts b/extensions/control-plane/api/management-api/contract-negotiation-api/build.gradle.kts index 4672dd9384..5e72f2a15d 100644 --- a/extensions/control-plane/api/management-api/contract-negotiation-api/build.gradle.kts +++ b/extensions/control-plane/api/management-api/contract-negotiation-api/build.gradle.kts @@ -19,8 +19,8 @@ dependencies { api(project(":spi:control-plane:control-plane-spi")) api(project(":spi:common:transaction-spi")) - implementation(project(":extensions:common:api:api-core")) implementation(project(":extensions:common:api:lib:management-api-lib")) + implementation(project(":core:common:lib:api-lib")) implementation(project(":core:common:lib:validator-lib")) implementation(libs.jakarta.rsApi) diff --git a/extensions/control-plane/api/management-api/edr-cache-api/build.gradle.kts b/extensions/control-plane/api/management-api/edr-cache-api/build.gradle.kts index e0ffd162f9..19f1346e29 100644 --- a/extensions/control-plane/api/management-api/edr-cache-api/build.gradle.kts +++ b/extensions/control-plane/api/management-api/edr-cache-api/build.gradle.kts @@ -21,8 +21,9 @@ plugins { dependencies { api(project(":spi:common:edr-store-spi")) api(project(":spi:common:validator-spi")) + api(project(":spi:common:web-spi")) api(project(":spi:control-plane:control-plane-spi")) - implementation(project(":extensions:common:api:api-core")) + implementation(project(":core:common:lib:api-lib")) implementation(project(":core:common:lib:validator-lib")) implementation(libs.jakarta.rsApi) diff --git a/extensions/control-plane/api/management-api/policy-definition-api/build.gradle.kts b/extensions/control-plane/api/management-api/policy-definition-api/build.gradle.kts index 89b64e891c..7a05762e14 100644 --- a/extensions/control-plane/api/management-api/policy-definition-api/build.gradle.kts +++ b/extensions/control-plane/api/management-api/policy-definition-api/build.gradle.kts @@ -25,9 +25,9 @@ dependencies { api(project(":spi:common:transaction-spi")) api(project(":spi:common:policy-model")) + implementation(project(":core:common:lib:api-lib")) implementation(project(":core:common:lib:util-lib")) implementation(project(":core:common:lib:validator-lib")) - implementation(project(":extensions:common:api:api-core")) implementation(project(":extensions:common:api:lib:management-api-lib")) implementation(libs.jakarta.rsApi) diff --git a/extensions/control-plane/api/management-api/protocol-version-api/build.gradle.kts b/extensions/control-plane/api/management-api/protocol-version-api/build.gradle.kts index cfa81ec99d..f8416eb1af 100644 --- a/extensions/control-plane/api/management-api/protocol-version-api/build.gradle.kts +++ b/extensions/control-plane/api/management-api/protocol-version-api/build.gradle.kts @@ -20,7 +20,6 @@ dependencies { api(project(":spi:control-plane:control-plane-spi")) implementation(project(":core:common:lib:validator-lib")) - implementation(project(":extensions:common:api:api-core")) implementation(project(":extensions:common:api:lib:management-api-lib")) implementation(libs.jakarta.rsApi) diff --git a/extensions/control-plane/api/management-api/secrets-api/build.gradle.kts b/extensions/control-plane/api/management-api/secrets-api/build.gradle.kts index 46224f113a..a797235259 100644 --- a/extensions/control-plane/api/management-api/secrets-api/build.gradle.kts +++ b/extensions/control-plane/api/management-api/secrets-api/build.gradle.kts @@ -20,10 +20,11 @@ plugins { dependencies { api(project(":spi:common:validator-spi")) + api(project(":spi:common:web-spi")) api(project(":spi:control-plane:control-plane-spi")) - implementation(project(":extensions:common:api:api-core")) - implementation(project(":core:common:lib:validator-lib")) + implementation(project(":core:common:lib:api-lib")) implementation(project(":core:common:lib:transform-lib")) + implementation(project(":core:common:lib:validator-lib")) implementation(libs.jakarta.rsApi) diff --git a/extensions/control-plane/api/management-api/transfer-process-api/build.gradle.kts b/extensions/control-plane/api/management-api/transfer-process-api/build.gradle.kts index d0c999cc63..145679cf39 100644 --- a/extensions/control-plane/api/management-api/transfer-process-api/build.gradle.kts +++ b/extensions/control-plane/api/management-api/transfer-process-api/build.gradle.kts @@ -21,9 +21,9 @@ dependencies { api(project(":spi:control-plane:transfer-spi")) api(project(":spi:control-plane:control-plane-spi")) + implementation(project(":core:common:lib:api-lib")) implementation(project(":core:common:lib:util-lib")) implementation(project(":core:common:lib:validator-lib")) - implementation(project(":extensions:common:api:api-core")) implementation(project(":extensions:common:api:lib:management-api-lib")) implementation(libs.jakarta.rsApi) diff --git a/extensions/control-plane/provision/provision-http/build.gradle.kts b/extensions/control-plane/provision/provision-http/build.gradle.kts index c07791ee12..1217a03b1e 100644 --- a/extensions/control-plane/provision/provision-http/build.gradle.kts +++ b/extensions/control-plane/provision/provision-http/build.gradle.kts @@ -22,7 +22,6 @@ dependencies { api(project(":spi:control-plane:control-plane-spi")) api(project(":spi:common:http-spi")) api(project(":spi:common:web-spi")) - implementation(project(":extensions:common:api:api-core")) implementation(project(":extensions:common:validator:validator-data-address-http-data")) implementation(libs.jakarta.rsApi) diff --git a/extensions/data-plane-selector/data-plane-selector-api/build.gradle.kts b/extensions/data-plane-selector/data-plane-selector-api/build.gradle.kts index 35827a824c..a324bc3474 100644 --- a/extensions/data-plane-selector/data-plane-selector-api/build.gradle.kts +++ b/extensions/data-plane-selector/data-plane-selector-api/build.gradle.kts @@ -19,13 +19,14 @@ plugins { dependencies { api(project(":spi:common:core-spi")) + api(project(":spi:common:web-spi")) api(project(":spi:data-plane-selector:data-plane-selector-spi")) implementation(project(":spi:common:transaction-spi")) + implementation(project(":core:common:lib:api-lib")) implementation(project(":core:common:lib:transform-lib")) implementation(project(":core:common:lib:util-lib")) implementation(project(":core:common:lib:validator-lib")) implementation(project(":extensions:common:json-ld")) - implementation(project(":extensions:common:api:api-core")) //for the exception mapper implementation(libs.jakarta.rsApi) @@ -33,6 +34,7 @@ dependencies { testImplementation(project(":core:common:connector-core")) testImplementation(project(":core:common:junit")) testImplementation(project(":core:data-plane-selector:data-plane-selector-core")) + testImplementation(project(":extensions:common:api:api-core")) testImplementation(project(":extensions:common:api:management-api-configuration")) testImplementation(project(":extensions:common:http")) testImplementation(project(":extensions:data-plane:data-plane-signaling:data-plane-signaling-client")) diff --git a/extensions/data-plane-selector/data-plane-selector-client/src/test/java/org/eclipse/edc/connector/dataplane/selector/RemoteDataPlaneSelectorServiceTest.java b/extensions/data-plane-selector/data-plane-selector-client/src/test/java/org/eclipse/edc/connector/dataplane/selector/RemoteDataPlaneSelectorServiceTest.java index dca5648521..ade8b9f67d 100644 --- a/extensions/data-plane-selector/data-plane-selector-client/src/test/java/org/eclipse/edc/connector/dataplane/selector/RemoteDataPlaneSelectorServiceTest.java +++ b/extensions/data-plane-selector/data-plane-selector-client/src/test/java/org/eclipse/edc/connector/dataplane/selector/RemoteDataPlaneSelectorServiceTest.java @@ -22,6 +22,7 @@ import org.eclipse.edc.junit.extensions.RuntimePerMethodExtension; import org.eclipse.edc.spi.result.ServiceFailure; import org.eclipse.edc.spi.result.ServiceResult; +import org.eclipse.edc.spi.system.configuration.ConfigFactory; import org.eclipse.edc.spi.types.domain.DataAddress; import org.eclipse.edc.validator.spi.JsonObjectValidatorRegistry; import org.eclipse.edc.validator.spi.ValidationResult; @@ -51,32 +52,33 @@ class RemoteDataPlaneSelectorServiceTest { private final JsonObjectValidatorRegistry validator = mock(); @RegisterExtension - public final RuntimeExtension client = new RuntimePerMethodExtension(new EmbeddedRuntime( - "client", - Map.of( + public final RuntimeExtension client = new RuntimePerMethodExtension(new EmbeddedRuntime("client", + ":core:common:connector-core", + ":extensions:common:http") + .configurationProvider(() -> ConfigFactory.fromMap(Map.of( "web.http.port", String.valueOf(getFreePort()), "edc.dpf.selector.url", "http://localhost:%d/control/v1/dataplanes".formatted(port), "edc.core.retry.retries.max", "0" - ), - ":core:common:connector-core", - ":extensions:common:http" - )); + ))) + ); @RegisterExtension public final RuntimeExtension server = new RuntimePerMethodExtension(new EmbeddedRuntime( "server", - Map.of( + ":extensions:data-plane-selector:data-plane-selector-control-api", + ":extensions:common:api:control-api-configuration", + ":extensions:common:api:api-core", + ":core:common:connector-core", + ":extensions:common:http") + .configurationProvider(() -> ConfigFactory.fromMap(Map.of( "web.http.port", String.valueOf(getFreePort()), "edc.dpf.selector.url", "http://not-used-but-mandatory", "web.http.control.port", port + "", "web.http.control.path", "/control" - ), - ":extensions:data-plane-selector:data-plane-selector-control-api", - ":extensions:common:api:control-api-configuration", - ":core:common:connector-core", - ":extensions:common:http")) + ))) .registerServiceMock(DataPlaneSelectorService.class, serverService) - .registerServiceMock(JsonObjectValidatorRegistry.class, validator); + .registerServiceMock(JsonObjectValidatorRegistry.class, validator) + ); @Test void addInstance() { diff --git a/extensions/data-plane-selector/data-plane-selector-control-api/build.gradle.kts b/extensions/data-plane-selector/data-plane-selector-control-api/build.gradle.kts index d3f7958b84..0ed43f426d 100644 --- a/extensions/data-plane-selector/data-plane-selector-control-api/build.gradle.kts +++ b/extensions/data-plane-selector/data-plane-selector-control-api/build.gradle.kts @@ -22,9 +22,9 @@ dependencies { api(project(":spi:common:web-spi")) api(project(":spi:data-plane-selector:data-plane-selector-spi")) + implementation(project(":core:common:lib:api-lib")) implementation(project(":core:common:lib:transform-lib")) implementation(project(":core:common:lib:validator-lib")) - implementation(project(":extensions:common:api:api-core")) implementation(libs.jakarta.rsApi) testImplementation(project(":core:common:junit")) diff --git a/extensions/data-plane/data-plane-integration-tests/src/test/java/org/eclipse/edc/connector/dataplane/http/DataPlaneHttpIntegrationTests.java b/extensions/data-plane/data-plane-integration-tests/src/test/java/org/eclipse/edc/connector/dataplane/http/DataPlaneHttpIntegrationTests.java index 8d450278ef..3b7f078dbb 100644 --- a/extensions/data-plane/data-plane-integration-tests/src/test/java/org/eclipse/edc/connector/dataplane/http/DataPlaneHttpIntegrationTests.java +++ b/extensions/data-plane/data-plane-integration-tests/src/test/java/org/eclipse/edc/connector/dataplane/http/DataPlaneHttpIntegrationTests.java @@ -31,6 +31,7 @@ import org.eclipse.edc.junit.extensions.RuntimeExtension; import org.eclipse.edc.junit.extensions.RuntimePerClassExtension; import org.eclipse.edc.spi.result.Result; +import org.eclipse.edc.spi.system.configuration.ConfigFactory; import org.eclipse.edc.spi.types.domain.DataAddress; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; @@ -101,23 +102,24 @@ public class DataPlaneHttpIntegrationTests { private static final DataPlaneAuthorizationService DATA_PLANE_AUTHORIZATION_SERVICE = mock(); private static final EmbeddedRuntime RUNTIME = new EmbeddedRuntime( "data-plane-server", - Map.of( - "web.http.public.port", valueOf(PUBLIC_API_PORT), - "web.http.public.path", PUBLIC_PATH, - "web.http.control.port", valueOf(CONTROL_API_PORT), - "web.http.control.path", CONTROL_PATH, - "edc.core.retry.retries.max", "0" - ), ":core:data-plane:data-plane-core", ":extensions:common:api:control-api-configuration", ":extensions:common:http", ":extensions:common:json-ld", + ":extensions:common:api:api-core", ":extensions:common:configuration:configuration-filesystem", ":extensions:control-plane:api:control-plane-api-client", ":extensions:data-plane:data-plane-http", ":extensions:data-plane:data-plane-public-api-v2", - ":extensions:data-plane:data-plane-signaling:data-plane-signaling-api" - ).registerServiceMock(DataPlaneAuthorizationService.class, DATA_PLANE_AUTHORIZATION_SERVICE); + ":extensions:data-plane:data-plane-signaling:data-plane-signaling-api") + .registerServiceMock(DataPlaneAuthorizationService.class, DATA_PLANE_AUTHORIZATION_SERVICE) + .configurationProvider(() -> ConfigFactory.fromMap(Map.of( + "web.http.public.port", valueOf(PUBLIC_API_PORT), + "web.http.public.path", PUBLIC_PATH, + "web.http.control.port", valueOf(CONTROL_API_PORT), + "web.http.control.path", CONTROL_PATH, + "edc.core.retry.retries.max", "0" + ))); private static ClientAndServer httpSourceMockServer; private static ClientAndServer httpSinkMockServer; private final Duration timeout = Duration.ofSeconds(30); diff --git a/settings.gradle.kts b/settings.gradle.kts index bd61f481a5..00f1a26ad7 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -47,6 +47,7 @@ include(":core:common:junit") include(":core:common:token-core") include(":core:common:edr-store-core") +include(":core:common:lib:api-lib") include(":core:common:lib:boot-lib") include(":core:common:lib:crypto-common-lib") include(":core:common:lib:http-lib") diff --git a/system-tests/e2e-transfer-test/control-plane/build.gradle.kts b/system-tests/e2e-transfer-test/control-plane/build.gradle.kts index c68da4895b..02188a77bb 100644 --- a/system-tests/e2e-transfer-test/control-plane/build.gradle.kts +++ b/system-tests/e2e-transfer-test/control-plane/build.gradle.kts @@ -17,27 +17,10 @@ plugins { } dependencies { - implementation(project(":core:common:edr-store-core")) - implementation(project(":core:common:token-core")) - implementation(project(":core:control-plane:control-plane-core")) - implementation(project(":data-protocols:dsp")) - implementation(project(":extensions:common:http")) - implementation(project(":extensions:common:api:control-api-configuration")) - implementation(project(":extensions:common:api:management-api-configuration")) - implementation(project(":extensions:common:iam:iam-mock")) + implementation(project(":dist:bom:controlplane-base-bom")) + implementation(project(":extensions:common:iam:iam-mock")) implementation(project(":extensions:control-plane:api:control-plane-api")) - implementation(project(":extensions:control-plane:api:management-api")) - implementation(project(":extensions:control-plane:api:management-api:edr-cache-api")) - implementation(project(":extensions:control-plane:callback:callback-event-dispatcher")) - implementation(project(":extensions:control-plane:callback:callback-http-dispatcher")) - implementation(project(":extensions:control-plane:edr:edr-store-receiver")) - implementation(project(":extensions:control-plane:transfer:transfer-data-plane-signaling")) - - implementation(project(":core:data-plane-selector:data-plane-selector-core")) - implementation(project(":extensions:data-plane-selector:data-plane-selector-api")) - implementation(project(":extensions:data-plane-selector:data-plane-selector-control-api")) - implementation(project(":extensions:control-plane:provision:provision-http")) implementation(project(":core:policy-monitor:policy-monitor-core")) diff --git a/system-tests/e2e-transfer-test/data-plane/build.gradle.kts b/system-tests/e2e-transfer-test/data-plane/build.gradle.kts index 63dba80ac3..0176e638c2 100644 --- a/system-tests/e2e-transfer-test/data-plane/build.gradle.kts +++ b/system-tests/e2e-transfer-test/data-plane/build.gradle.kts @@ -17,18 +17,9 @@ plugins { } dependencies { - implementation(project(":core:data-plane:data-plane-core")) - implementation(project(":core:common:token-core")) - implementation(project(":extensions:common:api:control-api-configuration")) - implementation(project(":extensions:common:http")) - implementation(project(":extensions:control-plane:api:control-plane-api-client")) - implementation(project(":extensions:data-plane:data-plane-self-registration")) - implementation(project(":extensions:data-plane:data-plane-iam")) - implementation(project(":extensions:data-plane:data-plane-http")) + implementation(project(":dist:bom:dataplane-base-bom")) + implementation(project(":extensions:data-plane:data-plane-kafka")) - implementation(project(":extensions:data-plane:data-plane-http-oauth2")) - implementation(project(":extensions:data-plane:data-plane-public-api-v2")) - implementation(project(":extensions:data-plane:data-plane-signaling:data-plane-signaling-api")) } edcBuild { diff --git a/system-tests/e2e-transfer-test/runner/src/test/java/org/eclipse/edc/test/e2e/TransferEndToEndParticipant.java b/system-tests/e2e-transfer-test/runner/src/test/java/org/eclipse/edc/test/e2e/TransferEndToEndParticipant.java index 3243363e62..d805f34de8 100644 --- a/system-tests/e2e-transfer-test/runner/src/test/java/org/eclipse/edc/test/e2e/TransferEndToEndParticipant.java +++ b/system-tests/e2e-transfer-test/runner/src/test/java/org/eclipse/edc/test/e2e/TransferEndToEndParticipant.java @@ -53,6 +53,7 @@ public Config controlPlaneConfig() { put(PARTICIPANT_ID, id); put("web.http.port", String.valueOf(getFreePort())); put("web.http.path", "/api"); + put("web.http.version.port", String.valueOf(getFreePort())); put("web.http.protocol.port", String.valueOf(controlPlaneProtocol.get().getPort())); put("web.http.protocol.path", controlPlaneProtocol.get().getPath()); put("web.http.management.port", String.valueOf(controlPlaneManagement.get().getPort())); diff --git a/system-tests/management-api/management-api-test-runner/build.gradle.kts b/system-tests/management-api/management-api-test-runner/build.gradle.kts index 2545ad85e7..d79d20fc24 100644 --- a/system-tests/management-api/management-api-test-runner/build.gradle.kts +++ b/system-tests/management-api/management-api-test-runner/build.gradle.kts @@ -27,7 +27,6 @@ dependencies { testImplementation(project(":core:common:edr-store-core")) //useful for generic DTOs etc. - testImplementation(project(":extensions:common:api:api-core")) testImplementation(project(":spi:control-plane:policy-spi")) testImplementation(project(":spi:control-plane:transfer-spi")) diff --git a/system-tests/version-api/version-api-test-runner/build.gradle.kts b/system-tests/version-api/version-api-test-runner/build.gradle.kts index c518a27ec6..ec1140a848 100644 --- a/system-tests/version-api/version-api-test-runner/build.gradle.kts +++ b/system-tests/version-api/version-api-test-runner/build.gradle.kts @@ -28,7 +28,6 @@ dependencies { testImplementation(project(":core:common:connector-core")) //useful for generic DTOs etc. - testImplementation(project(":extensions:common:api:api-core")) testImplementation(project(":spi:control-plane:policy-spi")) testImplementation(project(":spi:control-plane:transfer-spi"))