chore: remove util dependency on SPI and remove Jax-RS dependency (#4021

) Remove util dependency on SPI; remove Jax-RS dependency
eclipse-edc · Mar 18, 2024 · 87e80e8 · 87e80e8
1 parent e7873db
commit 87e80e8
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 13 deletions.
diff --git a/core/common/util/build.gradle.kts b/core/common/util/build.gradle.kts
@@ -18,8 +18,6 @@ plugins {
 }
 
 dependencies {
-    api(project(":spi:common:core-spi"))
-
     testImplementation(libs.junit.pioneer)
 }
 

diff --git a/...a/org/eclipse/edc/spi/types/PathItem.java → ...eclipse/edc/util/reflection/PathItem.java b/...a/org/eclipse/edc/spi/types/PathItem.java → ...eclipse/edc/util/reflection/PathItem.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.spi.types;
+package org.eclipse.edc.util.reflection;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/core/common/util/src/main/java/org/eclipse/edc/util/reflection/ReflectionUtil.java b/core/common/util/src/main/java/org/eclipse/edc/util/reflection/ReflectionUtil.java
@@ -14,8 +14,6 @@
 
 package org.eclipse.edc.util.reflection;
 
-import org.eclipse.edc.spi.types.PathItem;
-
 import java.lang.reflect.Field;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;

diff --git a/extensions/common/iam/decentralized-identity/identity-did-core/build.gradle.kts b/extensions/common/iam/decentralized-identity/identity-did-core/build.gradle.kts
@@ -7,8 +7,6 @@ dependencies {
     api(project(":spi:common:identity-did-spi"))
     implementation(project(":core:common:util"))
 
-    implementation(libs.jakarta.rsApi)
-
     testImplementation(project(":core:common:junit"))
 }
 

diff --git a/...ns/common/sql/sql-core/src/main/java/org/eclipse/edc/sql/translation/FieldTranslator.java b/...ns/common/sql/sql-core/src/main/java/org/eclipse/edc/sql/translation/FieldTranslator.java
@@ -15,7 +15,7 @@
 package org.eclipse.edc.sql.translation;
 
 import org.eclipse.edc.spi.query.Criterion;
-import org.eclipse.edc.spi.types.PathItem;
+import org.eclipse.edc.util.reflection.PathItem;
 
 import java.util.Collection;
 import java.util.List;

diff --git a/...ommon/sql/sql-core/src/main/java/org/eclipse/edc/sql/translation/JsonFieldTranslator.java b/...ommon/sql/sql-core/src/main/java/org/eclipse/edc/sql/translation/JsonFieldTranslator.java
@@ -15,7 +15,7 @@
 package org.eclipse.edc.sql.translation;
 
 import org.eclipse.edc.spi.query.Criterion;
-import org.eclipse.edc.spi.types.PathItem;
+import org.eclipse.edc.util.reflection.PathItem;
 
 import java.util.List;
 import java.util.Optional;

diff --git a/...ql/sql-core/src/main/java/org/eclipse/edc/sql/translation/PlainColumnFieldTranslator.java b/...ql/sql-core/src/main/java/org/eclipse/edc/sql/translation/PlainColumnFieldTranslator.java
@@ -15,7 +15,7 @@
 package org.eclipse.edc.sql.translation;
 
 import org.eclipse.edc.spi.query.Criterion;
-import org.eclipse.edc.spi.types.PathItem;
+import org.eclipse.edc.util.reflection.PathItem;
 
 import java.util.List;
 

diff --git a/...common/sql/sql-core/src/main/java/org/eclipse/edc/sql/translation/TranslationMapping.java b/...common/sql/sql-core/src/main/java/org/eclipse/edc/sql/translation/TranslationMapping.java
@@ -15,7 +15,7 @@
 package org.eclipse.edc.sql.translation;
 
 import org.eclipse.edc.spi.query.Criterion;
-import org.eclipse.edc.spi.types.PathItem;
+import org.eclipse.edc.util.reflection.PathItem;
 
 import java.util.HashMap;
 import java.util.List;

diff --git a/...n/sql/sql-core/src/test/java/org/eclipse/edc/sql/translation/JsonFieldTranslatorTest.java b/...n/sql/sql-core/src/test/java/org/eclipse/edc/sql/translation/JsonFieldTranslatorTest.java
@@ -14,7 +14,7 @@
 
 package org.eclipse.edc.sql.translation;
 
-import org.eclipse.edc.spi.types.PathItem;
+import org.eclipse.edc.util.reflection.PathItem;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 

diff --git a/...ql-core/src/test/java/org/eclipse/edc/sql/translation/PlainColumnFieldTranslatorTest.java b/...ql-core/src/test/java/org/eclipse/edc/sql/translation/PlainColumnFieldTranslatorTest.java
@@ -14,7 +14,7 @@
 
 package org.eclipse.edc.sql.translation;
 
-import org.eclipse.edc.spi.types.PathItem;
+import org.eclipse.edc.util.reflection.PathItem;
 import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.Test;
 

diff --git a/extensions/control-plane/store/sql/asset-index-sql/build.gradle.kts b/extensions/control-plane/store/sql/asset-index-sql/build.gradle.kts
@@ -22,6 +22,7 @@ dependencies {
     api(project(":spi:common:transaction-spi"))
     implementation(project(":spi:common:transaction-datasource-spi"))
     implementation(project(":extensions:common:sql:sql-core"))
+    implementation(project(":core:common:util"))
 
     testImplementation(project(":core:common:junit"))
 

diff --git a/spi/common/core-spi/src/test/java/org/eclipse/edc/spi/types/PathItemTest.java b/spi/common/core-spi/src/test/java/org/eclipse/edc/spi/types/PathItemTest.java
@@ -14,6 +14,7 @@
 
 package org.eclipse.edc.spi.types;
 
+import org.eclipse.edc.util.reflection.PathItem;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;