changed packages

eclipse-edc · Dec 12, 2023 · 5550eca · 5550eca
1 parent 8d4c43c
commit 5550eca
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 77 deletions.
diff --git a/...d/store/sql/BaseSqlDialectStatements.java → ...credentials/BaseSqlDialectStatements.java b/...d/store/sql/BaseSqlDialectStatements.java → ...credentials/BaseSqlDialectStatements.java
@@ -12,9 +12,9 @@
  *
  */
 
-package org.eclipse.edc.identityhub.did.store.sql;
+package org.eclipse.edc.identityhub.store.sql.credentials;
 
-import org.eclipse.edc.identityhub.did.store.sql.schema.postgres.VerifiableCredentialResourceMapping;
+import org.eclipse.edc.identityhub.store.sql.credentials.schema.postgres.VerifiableCredentialResourceMapping;
 import org.eclipse.edc.spi.query.QuerySpec;
 import org.eclipse.edc.sql.translation.SqlQueryStatement;
 

diff --git a/.../store/sql/CredentialStoreStatements.java → ...redentials/CredentialStoreStatements.java b/.../store/sql/CredentialStoreStatements.java → ...redentials/CredentialStoreStatements.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.identityhub.did.store.sql;
+package org.eclipse.edc.identityhub.store.sql.credentials;
 
 import org.eclipse.edc.spi.query.QuerySpec;
 import org.eclipse.edc.sql.statement.SqlStatements;

diff --git a/...hub/did/store/sql/SqlCredentialStore.java → ...e/sql/credentials/SqlCredentialStore.java b/...hub/did/store/sql/SqlCredentialStore.java → ...e/sql/credentials/SqlCredentialStore.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.identityhub.did.store.sql;
+package org.eclipse.edc.identityhub.store.sql.credentials;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.eclipse.edc.identityhub.spi.store.CredentialStore;

diff --git a/...tore/sql/SqlCredentialStoreExtension.java → ...dentials/SqlCredentialStoreExtension.java b/...tore/sql/SqlCredentialStoreExtension.java → ...dentials/SqlCredentialStoreExtension.java
@@ -12,10 +12,10 @@
  *
  */
 
-package org.eclipse.edc.identityhub.did.store.sql;
+package org.eclipse.edc.identityhub.store.sql.credentials;
 
-import org.eclipse.edc.identityhub.did.store.sql.schema.postgres.PostgresDialectStatements;
 import org.eclipse.edc.identityhub.spi.store.CredentialStore;
+import org.eclipse.edc.identityhub.store.sql.credentials.schema.postgres.PostgresDialectStatements;
 import org.eclipse.edc.runtime.metamodel.annotation.Extension;
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;
 import org.eclipse.edc.runtime.metamodel.annotation.Provider;
@@ -27,7 +27,7 @@
 import org.eclipse.edc.transaction.datasource.spi.DataSourceRegistry;
 import org.eclipse.edc.transaction.spi.TransactionContext;
 
-import static org.eclipse.edc.identityhub.did.store.sql.SqlCredentialStoreExtension.NAME;
+import static org.eclipse.edc.identityhub.store.sql.credentials.SqlCredentialStoreExtension.NAME;
 
 @Extension(value = NAME)
 public class SqlCredentialStoreExtension implements ServiceExtension {

diff --git a/...chema/postgres/CredentialJsonMapping.java → ...chema/postgres/CredentialJsonMapping.java b/...chema/postgres/CredentialJsonMapping.java → ...chema/postgres/CredentialJsonMapping.java
@@ -12,16 +12,14 @@
  *
  */
 
-package org.eclipse.edc.identityhub.did.store.sql.schema.postgres;
+package org.eclipse.edc.identityhub.store.sql.credentials.schema.postgres;
 
 import org.eclipse.edc.spi.types.PathItem;
 import org.eclipse.edc.sql.translation.JsonFieldMapping;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.eclipse.edc.identityhub.did.store.sql.schema.postgres.PostgresDialectStatements.CREDENTIAL_SUBJECT_ALIAS;
-
 /**
  * Maps the canonical format of a {@link org.eclipse.edc.identitytrust.model.VerifiableCredential} onto its JSON representation
  * and generates query statements for Postgres.
@@ -30,7 +28,7 @@ public class CredentialJsonMapping extends JsonFieldMapping {
 
     public CredentialJsonMapping(String columnName) {
         super(columnName);
-        add("credentialSubject", CREDENTIAL_SUBJECT_ALIAS);
+        add("credentialSubject", PostgresDialectStatements.CREDENTIAL_SUBJECT_ALIAS);
     }
 
     @Override

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.identityhub.did.store.sql.schema.postgres;
+package org.eclipse.edc.identityhub.store.sql.credentials.schema.postgres;
 
-import org.eclipse.edc.identityhub.did.store.sql.BaseSqlDialectStatements;
+import org.eclipse.edc.identityhub.store.sql.credentials.BaseSqlDialectStatements;
 import org.eclipse.edc.spi.query.Criterion;
 import org.eclipse.edc.spi.query.QuerySpec;
 import org.eclipse.edc.sql.dialect.PostgresDialect;

diff --git a/...VerifiableCredentialContainerMapping.java → ...VerifiableCredentialContainerMapping.java b/...VerifiableCredentialContainerMapping.java → ...VerifiableCredentialContainerMapping.java
@@ -12,9 +12,9 @@
  *
  */
 
-package org.eclipse.edc.identityhub.did.store.sql.schema.postgres;
+package org.eclipse.edc.identityhub.store.sql.credentials.schema.postgres;
 
-import org.eclipse.edc.identityhub.did.store.sql.CredentialStoreStatements;
+import org.eclipse.edc.identityhub.store.sql.credentials.CredentialStoreStatements;
 import org.eclipse.edc.sql.translation.TranslationMapping;
 
 /**

diff --git a/.../VerifiableCredentialResourceMapping.java → .../VerifiableCredentialResourceMapping.java b/.../VerifiableCredentialResourceMapping.java → .../VerifiableCredentialResourceMapping.java
@@ -12,9 +12,9 @@
  *
  */
 
-package org.eclipse.edc.identityhub.did.store.sql.schema.postgres;
+package org.eclipse.edc.identityhub.store.sql.credentials.schema.postgres;
 
-import org.eclipse.edc.identityhub.did.store.sql.CredentialStoreStatements;
+import org.eclipse.edc.identityhub.store.sql.credentials.CredentialStoreStatements;
 import org.eclipse.edc.sql.translation.TranslationMapping;
 
 

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.identityhub.did.store.sql.SqlCredentialStoreExtension
+org.eclipse.edc.identityhub.store.sql.credentials.SqlCredentialStoreExtension
diff --git a/...id/store/sql/SqlCredentialsStoreTest.java → .../credentials/SqlCredentialsStoreTest.java b/...id/store/sql/SqlCredentialsStoreTest.java → .../credentials/SqlCredentialsStoreTest.java
@@ -12,11 +12,11 @@
  *
  */
 
-package org.eclipse.edc.identityhub.did.store.sql;
+package org.eclipse.edc.identityhub.store.sql.credentials;
 
 import org.eclipse.edc.identityhub.credentials.store.test.CredentialStoreTestBase;
-import org.eclipse.edc.identityhub.did.store.sql.schema.postgres.PostgresDialectStatements;
 import org.eclipse.edc.identityhub.spi.store.CredentialStore;
+import org.eclipse.edc.identityhub.store.sql.credentials.schema.postgres.PostgresDialectStatements;
 import org.eclipse.edc.junit.annotations.ComponentTest;
 import org.eclipse.edc.spi.types.TypeManager;
 import org.eclipse.edc.sql.QueryExecutor;

diff --git a/extensions/store/sql/identity-hub-credentials-store-sql/src/test/resources/did.json b/extensions/store/sql/identity-hub-credentials-store-sql/src/test/resources/did.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,4 +12,4 @@ @@
     #
     #
-    org.eclipse.edc.identityhub.did.store.sql.SqlCredentialStoreExtension
+    org.eclipse.edc.identityhub.store.sql.credentials.SqlCredentialStoreExtension