fix: package declaration of JtiValidationStore (#4623)

eclipse-edc · Nov 13, 2024 · 58f7a07 · 58f7a07
1 parent fdf6427
commit 58f7a07
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 18 deletions.
diff --git a/...dr/store/index/SqlJtiValidationStore.java → ...tion/store/sql/SqlJtiValidationStore.java b/...dr/store/index/SqlJtiValidationStore.java → ...tion/store/sql/SqlJtiValidationStore.java
@@ -12,10 +12,10 @@
  *
  */
 
-package org.eclipse.edc.edr.store.index;
+package org.eclipse.edc.jtivalidation.store.sql;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.eclipse.edc.edr.store.index.sql.schema.JtiValidationStoreStatements;
+import org.eclipse.edc.jtivalidation.store.sql.schema.JtiValidationStoreStatements;
 import org.eclipse.edc.jwt.validation.jti.JtiValidationEntry;
 import org.eclipse.edc.jwt.validation.jti.JtiValidationStore;
 import org.eclipse.edc.spi.monitor.Monitor;

diff --git a/...index/SqlJtiValidationStoreExtension.java → ...e/sql/SqlJtiValidationStoreExtension.java b/...index/SqlJtiValidationStoreExtension.java → ...e/sql/SqlJtiValidationStoreExtension.java
@@ -12,11 +12,11 @@
  *
  */
 
-package org.eclipse.edc.edr.store.index;
+package org.eclipse.edc.jtivalidation.store.sql;
 
 
-import org.eclipse.edc.edr.store.index.sql.schema.JtiValidationStoreStatements;
-import org.eclipse.edc.edr.store.index.sql.schema.postgres.PostgresDialectStatements;
+import org.eclipse.edc.jtivalidation.store.sql.schema.JtiValidationStoreStatements;
+import org.eclipse.edc.jtivalidation.store.sql.schema.postgres.PostgresDialectStatements;
 import org.eclipse.edc.jwt.validation.jti.JtiValidationStore;
 import org.eclipse.edc.runtime.metamodel.annotation.Extension;
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;

diff --git a/.../sql/schema/BaseSqlDialectStatements.java → .../sql/schema/BaseSqlDialectStatements.java b/.../sql/schema/BaseSqlDialectStatements.java → .../sql/schema/BaseSqlDialectStatements.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.edr.store.index.sql.schema;
+package org.eclipse.edc.jtivalidation.store.sql.schema;
 
 import org.eclipse.edc.spi.query.Criterion;
 import org.eclipse.edc.sql.translation.SqlOperatorTranslator;

diff --git a/.../schema/JtiValidationStoreStatements.java → .../schema/JtiValidationStoreStatements.java b/.../schema/JtiValidationStoreStatements.java → .../schema/JtiValidationStoreStatements.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.edr.store.index.sql.schema;
+package org.eclipse.edc.jtivalidation.store.sql.schema;
 
 import org.eclipse.edc.sql.statement.SqlStatements;
 

diff --git a/...a/postgres/PostgresDialectStatements.java → ...a/postgres/PostgresDialectStatements.java b/...a/postgres/PostgresDialectStatements.java → ...a/postgres/PostgresDialectStatements.java
@@ -12,9 +12,9 @@
  *
  */
 
-package org.eclipse.edc.edr.store.index.sql.schema.postgres;
+package org.eclipse.edc.jtivalidation.store.sql.schema.postgres;
 
-import org.eclipse.edc.edr.store.index.sql.schema.BaseSqlDialectStatements;
+import org.eclipse.edc.jtivalidation.store.sql.schema.BaseSqlDialectStatements;
 import org.eclipse.edc.sql.dialect.PostgresDialect;
 import org.eclipse.edc.sql.translation.PostgresqlOperatorTranslator;
 

diff --git a/...tore-sql/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/...tore-sql/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
@@ -12,4 +12,4 @@
 #
 #
 
-org.eclipse.edc.edr.store.index.SqlJtiValidationStoreExtension
+org.eclipse.edc.jtivalidation.store.sql.SqlJtiValidationStoreExtension
diff --git a/...l/SqlJtiValidationStoreExtensionTest.java → ...l/SqlJtiValidationStoreExtensionTest.java b/...l/SqlJtiValidationStoreExtensionTest.java → ...l/SqlJtiValidationStoreExtensionTest.java
@@ -12,10 +12,8 @@
  *
  */
 
-package org.eclipse.edc.edr.store.index.sql;
+package org.eclipse.edc.jtivalidation.store.sql;
 
-import org.eclipse.edc.edr.store.index.SqlJtiValidationStore;
-import org.eclipse.edc.edr.store.index.SqlJtiValidationStoreExtension;
 import org.eclipse.edc.json.JacksonTypeManager;
 import org.eclipse.edc.junit.extensions.DependencyInjectionExtension;
 import org.eclipse.edc.jwt.validation.jti.JtiValidationStore;
@@ -27,7 +25,7 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.eclipse.edc.edr.store.index.SqlJtiValidationStoreExtension.DATASOURCE_NAME;
+import static org.eclipse.edc.jtivalidation.store.sql.SqlJtiValidationStoreExtension.DATASOURCE_NAME;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;

diff --git a/.../index/sql/SqlJtiValidationStoreTest.java → .../store/sql/SqlJtiValidationStoreTest.java b/.../index/sql/SqlJtiValidationStoreTest.java → .../store/sql/SqlJtiValidationStoreTest.java
@@ -12,12 +12,11 @@
  *
  */
 
-package org.eclipse.edc.edr.store.index.sql;
+package org.eclipse.edc.jtivalidation.store.sql;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.eclipse.edc.edr.store.index.SqlJtiValidationStore;
-import org.eclipse.edc.edr.store.index.sql.schema.BaseSqlDialectStatements;
-import org.eclipse.edc.edr.store.index.sql.schema.postgres.PostgresDialectStatements;
+import org.eclipse.edc.jtivalidation.store.sql.schema.BaseSqlDialectStatements;
+import org.eclipse.edc.jtivalidation.store.sql.schema.postgres.PostgresDialectStatements;
 import org.eclipse.edc.junit.annotations.ComponentTest;
 import org.eclipse.edc.junit.testfixtures.TestUtils;
 import org.eclipse.edc.jwt.validation.jti.JtiValidationStore;