refactor: extract api-lib to avoid extensions depending on api-core

eclipse-edc · Feb 12, 2025 · c2482d7 · c2482d7
1 parent eee070b
commit c2482d7
Show file tree

Hide file tree

Showing 33 changed files with 61 additions and 27 deletions.
diff --git a/core/common/lib/api-lib/build.gradle.kts 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/.../eclipse/edc/api/model/ApiCoreSchema.java → .../eclipse/edc/api/model/ApiCoreSchema.java b/.../eclipse/edc/api/model/ApiCoreSchema.java → .../eclipse/edc/api/model/ApiCoreSchema.java
diff --git a/...org/eclipse/edc/api/model/IdResponse.java → ...org/eclipse/edc/api/model/IdResponse.java b/...org/eclipse/edc/api/model/IdResponse.java → ...org/eclipse/edc/api/model/IdResponse.java
diff --git a/...ObjectFromCallbackAddressTransformer.java → ...ObjectFromCallbackAddressTransformer.java b/...ObjectFromCallbackAddressTransformer.java → ...ObjectFromCallbackAddressTransformer.java
diff --git a/.../JsonObjectFromIdResponseTransformer.java → .../JsonObjectFromIdResponseTransformer.java b/.../JsonObjectFromIdResponseTransformer.java → .../JsonObjectFromIdResponseTransformer.java
diff --git a/...onObjectToCallbackAddressTransformer.java → ...onObjectToCallbackAddressTransformer.java b/...onObjectToCallbackAddressTransformer.java → ...onObjectToCallbackAddressTransformer.java
diff --git a/.../api/validation/DataAddressValidator.java → .../api/validation/DataAddressValidator.java b/.../api/validation/DataAddressValidator.java → .../api/validation/DataAddressValidator.java
diff --git a/...ipse/edc/api/model/ApiCoreSchemaTest.java → ...ipse/edc/api/model/ApiCoreSchemaTest.java b/...ipse/edc/api/model/ApiCoreSchemaTest.java → ...ipse/edc/api/model/ApiCoreSchemaTest.java
diff --git a/...ctFromCallbackAddressTransformerTest.java → ...ctFromCallbackAddressTransformerTest.java b/...ctFromCallbackAddressTransformerTest.java → ...ctFromCallbackAddressTransformerTest.java
diff --git a/...nObjectFromIdResponseTransformerTest.java → ...nObjectFromIdResponseTransformerTest.java b/...nObjectFromIdResponseTransformerTest.java → ...nObjectFromIdResponseTransformerTest.java
diff --git a/...jectToCallbackAddressTransformerTest.java → ...jectToCallbackAddressTransformerTest.java b/...jectToCallbackAddressTransformerTest.java → ...jectToCallbackAddressTransformerTest.java
diff --git a/.../validation/DataAddressValidatorTest.java → .../validation/DataAddressValidatorTest.java b/.../validation/DataAddressValidatorTest.java → .../validation/DataAddressValidatorTest.java
diff --git a/dist/bom/controlplane-base-bom/build.gradle.kts b/dist/bom/controlplane-base-bom/build.gradle.kts
@@ -29,21 +29,21 @@ dependencies {
     api(project(":data-protocols:dsp"))
     api(project(":core:data-plane-selector:data-plane-selector-core"))
 
-
     // 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 {
 
-}
+}
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)
 

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
@@ -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/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/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
@@ -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"))