From e0f8f080c621db48129c9037dbbf123b4f489137 Mon Sep 17 00:00:00 2001 From: ndr_brt Date: Thu, 14 Apr 2022 09:09:09 +0200 Subject: [PATCH 1/2] bugfix: restructure sql moudule folders --- CHANGELOG.md | 2 +- .../sql/{asset => asset-index-sql}/README.md | 0 .../build.gradle.kts | 8 ++++---- .../{asset => asset-index-sql}/docs/er.puml | 0 .../docs/schema.sql | 0 .../sql/asset/index/ConfigurationKeys.java | 0 .../asset/index/PostgresSqlAssetQueries.java | 0 .../sql/asset/index/SqlAssetIndex.java | 0 .../index/SqlAssetIndexServiceExtension.java | 0 .../sql/asset/index/SqlAssetQueries.java | 0 .../sql/asset/index/SqlAssetTables.java | 0 .../asset/index/SqlConditionExpression.java | 0 ...spaceconnector.spi.system.ServiceExtension | 0 .../sql/asset/index/SqlAssetIndexTest.java | 0 .../index/SqlConditionExpressionTest.java | 0 .../src/test/resources/schema.sql | 0 extensions/sql/build.gradle.kts | 12 +++++++----- .../sql/{common => common-sql}/README.md | 0 .../{common => common-sql}/build.gradle.kts | 4 ++-- .../sql/ArgumentHandler.java | 0 .../sql/ArgumentHandlers.java | 0 .../sql/ConnectionFactory.java | 0 .../sql/ResultSetMapper.java | 0 .../sql/SqlQueryExecutor.java | 0 .../ConnectionFactoryDataSource.java | 0 .../datasource/ConnectionPoolDataSource.java | 0 .../PooledDataSourceConnection.java | 0 .../sql/pool/ConnectionPool.java | 0 .../sql/SqlQueryExecutorIntegrationTest.java | 0 .../sql/SqlQueryExecutorTest.java | 0 .../ConnectionFactoryDataSourceTest.java | 0 .../ConnectionPoolDataSourceTest.java | 0 .../PooledDataSourceConnectionTest.java | 0 .../build.gradle.kts | 8 ++++---- .../docs/README.md | 0 .../docs/er.png | Bin .../docs/er.puml | 0 .../docs/schema.sql | 0 .../store/ContractDefinitionStatements.java | 0 .../store/PostgresStatements.java | 0 .../store/SqlContractDefinitionStore.java | 0 .../SqlContractDefinitionStoreExtension.java | 0 ...spaceconnector.spi.system.ServiceExtension | 0 .../store/SqlContractDefinitionStoreTest.java | 0 .../src/test/resources/schema.sql | 0 .../build.gradle.kts | 12 ++++++------ .../docs/README.md | 0 .../docs/ddl_postgres.sql | 0 .../SqlContractNegotiationStoreExtension.java | 0 .../store/ContractNegotiationStatements.java | 0 .../store/PostgresStatements.java | 0 .../store/SqlContractNegotiationStore.java | 0 ...spaceconnector.spi.system.ServiceExtension | 0 ...ContractNegotiationStoreExtensionTest.java | 0 .../contractnegotiation/TestFunctions.java | 0 .../SqlContractNegotiationStoreTest.java | 0 .../src/test/resources/schema.sql | 0 .../sql/{lease => lease-sql}/build.gradle.kts | 8 ++++---- .../sql/lease/LeaseStatements.java | 0 .../sql/lease/SqlLease.java | 0 .../sql/lease/SqlLeaseContext.java | 0 .../sql/lease/SqlLeaseContextBuilder.java | 0 .../sql/lease/SqlLeaseContextTest.java | 0 .../src/test/resources/schema.sql | 0 .../sql/lease/LeaseUtil.java | 0 .../build.gradle.kts | 8 ++++---- .../docs/README.md | 0 .../{policy => policy-store-sql}/docs/er.png | Bin .../{policy => policy-store-sql}/docs/er.puml | 0 .../docs/schema.sql | 0 .../sql/policy/SqlPolicyStoreExtension.java | 0 .../sql/policy/store/PostgressStatements.java | 0 .../sql/policy/store/SqlPolicyStore.java | 0 .../store/SqlPolicyStoreStatements.java | 0 ...spaceconnector.spi.system.ServiceExtension | 0 .../slq/policy/store/SqlPolicyStoreTest.java | 0 .../src/test/resources/schema.sql | 0 .../README.md | 0 .../build.gradle.kts | 6 +++--- .../pool/commons/CommonsConnectionPool.java | 0 .../commons/CommonsConnectionPoolConfig.java | 0 .../CommonsConnectionPoolConfigKeys.java | 0 ...CommonsConnectionPoolServiceExtension.java | 0 .../DriverManagerConnectionFactory.java | 0 ...spaceconnector.spi.system.ServiceExtension | 0 ...onsConnectionPoolServiceExtensionTest.java | 0 .../CommonsConnectionPoolConfigTest.java | 0 ...onsConnectionPoolServiceExtensionTest.java | 0 .../commons/CommonsConnectionPoolTest.java | 0 .../build.gradle.kts | 12 ++++++------ .../doc/README.md | 0 .../doc/ddl_postgres.sql | 0 .../SqlTransferProcessStoreExtension.java | 0 .../store/PostgresStatements.java | 0 .../store/SqlTransferProcessStore.java | 0 .../store/TransferProcessStoreStatements.java | 0 ...spaceconnector.spi.system.ServiceExtension | 0 .../store/SqlTransferProcessStoreTest.java | 0 .../transferprocess/store/TestFunctions.java | 0 .../src/test/resources/schema.sql | 0 settings.gradle.kts | 18 +++++++++--------- 101 files changed, 50 insertions(+), 48 deletions(-) rename extensions/sql/{asset => asset-index-sql}/README.md (100%) rename extensions/sql/{asset/index => asset-index-sql}/build.gradle.kts (87%) rename extensions/sql/{asset => asset-index-sql}/docs/er.puml (100%) rename extensions/sql/{asset => asset-index-sql}/docs/schema.sql (100%) rename extensions/sql/{asset/index => asset-index-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/asset/index/ConfigurationKeys.java (100%) rename extensions/sql/{asset/index => asset-index-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/asset/index/PostgresSqlAssetQueries.java (100%) rename extensions/sql/{asset/index => asset-index-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/asset/index/SqlAssetIndex.java (100%) rename extensions/sql/{asset/index => asset-index-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/asset/index/SqlAssetIndexServiceExtension.java (100%) rename extensions/sql/{asset/index => asset-index-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/asset/index/SqlAssetQueries.java (100%) rename extensions/sql/{asset/index => asset-index-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/asset/index/SqlAssetTables.java (100%) rename extensions/sql/{asset/index => asset-index-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/asset/index/SqlConditionExpression.java (100%) rename extensions/sql/{asset/index => asset-index-sql}/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension (100%) rename extensions/sql/{asset/index => asset-index-sql}/src/test/java/org/eclipse/dataspaceconnector/sql/asset/index/SqlAssetIndexTest.java (100%) rename extensions/sql/{asset/index => asset-index-sql}/src/test/java/org/eclipse/dataspaceconnector/sql/asset/index/SqlConditionExpressionTest.java (100%) rename extensions/sql/{asset/index => asset-index-sql}/src/test/resources/schema.sql (100%) rename extensions/sql/{common => common-sql}/README.md (100%) rename extensions/sql/{common => common-sql}/build.gradle.kts (88%) rename extensions/sql/{common => common-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/ArgumentHandler.java (100%) rename extensions/sql/{common => common-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/ArgumentHandlers.java (100%) rename extensions/sql/{common => common-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/ConnectionFactory.java (100%) rename extensions/sql/{common => common-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/ResultSetMapper.java (100%) rename extensions/sql/{common => common-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/SqlQueryExecutor.java (100%) rename extensions/sql/{common => common-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/datasource/ConnectionFactoryDataSource.java (100%) rename extensions/sql/{common => common-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/datasource/ConnectionPoolDataSource.java (100%) rename extensions/sql/{common => common-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/datasource/PooledDataSourceConnection.java (100%) rename extensions/sql/{common => common-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/pool/ConnectionPool.java (100%) rename extensions/sql/{common => common-sql}/src/test/java/org/eclipse/dataspaceconnector/sql/SqlQueryExecutorIntegrationTest.java (100%) rename extensions/sql/{common => common-sql}/src/test/java/org/eclipse/dataspaceconnector/sql/SqlQueryExecutorTest.java (100%) rename extensions/sql/{common => common-sql}/src/test/java/org/eclipse/dataspaceconnector/sql/datasource/ConnectionFactoryDataSourceTest.java (100%) rename extensions/sql/{common => common-sql}/src/test/java/org/eclipse/dataspaceconnector/sql/datasource/ConnectionPoolDataSourceTest.java (100%) rename extensions/sql/{common => common-sql}/src/test/java/org/eclipse/dataspaceconnector/sql/datasource/PooledDataSourceConnectionTest.java (100%) rename extensions/sql/{contract-definition/store => contract-definition-store-sql}/build.gradle.kts (86%) rename extensions/sql/{contract-definition => contract-definition-store-sql}/docs/README.md (100%) rename extensions/sql/{contract-definition => contract-definition-store-sql}/docs/er.png (100%) rename extensions/sql/{contract-definition => contract-definition-store-sql}/docs/er.puml (100%) rename extensions/sql/{contract-definition => contract-definition-store-sql}/docs/schema.sql (100%) rename extensions/sql/{contract-definition/store => contract-definition-store-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/contractdefinition/store/ContractDefinitionStatements.java (100%) rename extensions/sql/{contract-definition/store => contract-definition-store-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/contractdefinition/store/PostgresStatements.java (100%) rename extensions/sql/{contract-definition/store => contract-definition-store-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/contractdefinition/store/SqlContractDefinitionStore.java (100%) rename extensions/sql/{contract-definition/store => contract-definition-store-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/contractdefinition/store/SqlContractDefinitionStoreExtension.java (100%) rename extensions/sql/{contract-definition/store => contract-definition-store-sql}/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension (100%) rename extensions/sql/{contract-definition/store => contract-definition-store-sql}/src/test/java/org/eclipse/dataspaceconnector/sql/contractdefinition/store/SqlContractDefinitionStoreTest.java (100%) rename extensions/sql/{contract-definition/store => contract-definition-store-sql}/src/test/resources/schema.sql (100%) rename extensions/sql/{contract-negotiation-store => contract-negotiation-store-sql}/build.gradle.kts (84%) rename extensions/sql/{contract-negotiation-store => contract-negotiation-store-sql}/docs/README.md (100%) rename extensions/sql/{contract-negotiation-store => contract-negotiation-store-sql}/docs/ddl_postgres.sql (100%) rename extensions/sql/{contract-negotiation-store => contract-negotiation-store-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/contractnegotiation/SqlContractNegotiationStoreExtension.java (100%) rename extensions/sql/{contract-negotiation-store => contract-negotiation-store-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/contractnegotiation/store/ContractNegotiationStatements.java (100%) rename extensions/sql/{contract-negotiation-store => contract-negotiation-store-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/contractnegotiation/store/PostgresStatements.java (100%) rename extensions/sql/{contract-negotiation-store => contract-negotiation-store-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/contractnegotiation/store/SqlContractNegotiationStore.java (100%) rename extensions/sql/{contract-negotiation-store => contract-negotiation-store-sql}/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension (100%) rename extensions/sql/{contract-negotiation-store => contract-negotiation-store-sql}/src/test/java/org/eclipse/dataspaceconnector/sql/contractnegotiation/SqlContractNegotiationStoreExtensionTest.java (100%) rename extensions/sql/{contract-negotiation-store => contract-negotiation-store-sql}/src/test/java/org/eclipse/dataspaceconnector/sql/contractnegotiation/TestFunctions.java (100%) rename extensions/sql/{contract-negotiation-store => contract-negotiation-store-sql}/src/test/java/org/eclipse/dataspaceconnector/sql/contractnegotiation/store/SqlContractNegotiationStoreTest.java (100%) rename extensions/sql/{contract-negotiation-store => contract-negotiation-store-sql}/src/test/resources/schema.sql (100%) rename extensions/sql/{lease => lease-sql}/build.gradle.kts (89%) rename extensions/sql/{lease => lease-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/lease/LeaseStatements.java (100%) rename extensions/sql/{lease => lease-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/lease/SqlLease.java (100%) rename extensions/sql/{lease => lease-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/lease/SqlLeaseContext.java (100%) rename extensions/sql/{lease => lease-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/lease/SqlLeaseContextBuilder.java (100%) rename extensions/sql/{lease => lease-sql}/src/test/java/org/eclipse/dataspaceconnector/sql/lease/SqlLeaseContextTest.java (100%) rename extensions/sql/{lease => lease-sql}/src/test/resources/schema.sql (100%) rename extensions/sql/{lease => lease-sql}/src/testFixtures/java/org/eclipse/dataspaceconnector/sql/lease/LeaseUtil.java (100%) rename extensions/sql/{policy/store => policy-store-sql}/build.gradle.kts (86%) rename extensions/sql/{policy => policy-store-sql}/docs/README.md (100%) rename extensions/sql/{policy => policy-store-sql}/docs/er.png (100%) rename extensions/sql/{policy => policy-store-sql}/docs/er.puml (100%) rename extensions/sql/{policy => policy-store-sql}/docs/schema.sql (100%) rename extensions/sql/{policy/store => policy-store-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/policy/SqlPolicyStoreExtension.java (100%) rename extensions/sql/{policy/store => policy-store-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/policy/store/PostgressStatements.java (100%) rename extensions/sql/{policy/store => policy-store-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/policy/store/SqlPolicyStore.java (100%) rename extensions/sql/{policy/store => policy-store-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/policy/store/SqlPolicyStoreStatements.java (100%) rename extensions/sql/{policy/store => policy-store-sql}/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension (100%) rename extensions/sql/{policy/store => policy-store-sql}/src/test/java/org/eclipse/dataspaceconnector/slq/policy/store/SqlPolicyStoreTest.java (100%) rename extensions/sql/{policy/store => policy-store-sql}/src/test/resources/schema.sql (100%) rename extensions/sql/pool/{apache-commons-pool => apache-commons-pool-sql}/README.md (100%) rename extensions/sql/pool/{apache-commons-pool => apache-commons-pool-sql}/build.gradle.kts (87%) rename extensions/sql/pool/{apache-commons-pool => apache-commons-pool-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/pool/commons/CommonsConnectionPool.java (100%) rename extensions/sql/pool/{apache-commons-pool => apache-commons-pool-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/pool/commons/CommonsConnectionPoolConfig.java (100%) rename extensions/sql/pool/{apache-commons-pool => apache-commons-pool-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/pool/commons/CommonsConnectionPoolConfigKeys.java (100%) rename extensions/sql/pool/{apache-commons-pool => apache-commons-pool-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/pool/commons/CommonsConnectionPoolServiceExtension.java (100%) rename extensions/sql/pool/{apache-commons-pool => apache-commons-pool-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/pool/commons/DriverManagerConnectionFactory.java (100%) rename extensions/sql/pool/{apache-commons-pool => apache-commons-pool-sql}/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension (100%) rename extensions/sql/pool/{apache-commons-pool => apache-commons-pool-sql}/src/test/java/org/eclipse/dataspaceconnector/sql/pool/commons/AbstractCommonsConnectionPoolServiceExtensionTest.java (100%) rename extensions/sql/pool/{apache-commons-pool => apache-commons-pool-sql}/src/test/java/org/eclipse/dataspaceconnector/sql/pool/commons/CommonsConnectionPoolConfigTest.java (100%) rename extensions/sql/pool/{apache-commons-pool => apache-commons-pool-sql}/src/test/java/org/eclipse/dataspaceconnector/sql/pool/commons/CommonsConnectionPoolServiceExtensionTest.java (100%) rename extensions/sql/pool/{apache-commons-pool => apache-commons-pool-sql}/src/test/java/org/eclipse/dataspaceconnector/sql/pool/commons/CommonsConnectionPoolTest.java (100%) rename extensions/sql/{transfer-process-store => transfer-process-store-sql}/build.gradle.kts (84%) rename extensions/sql/{transfer-process-store => transfer-process-store-sql}/doc/README.md (100%) rename extensions/sql/{transfer-process-store => transfer-process-store-sql}/doc/ddl_postgres.sql (100%) rename extensions/sql/{transfer-process-store => transfer-process-store-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/transferprocess/SqlTransferProcessStoreExtension.java (100%) rename extensions/sql/{transfer-process-store => transfer-process-store-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/transferprocess/store/PostgresStatements.java (100%) rename extensions/sql/{transfer-process-store => transfer-process-store-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/transferprocess/store/SqlTransferProcessStore.java (100%) rename extensions/sql/{transfer-process-store => transfer-process-store-sql}/src/main/java/org/eclipse/dataspaceconnector/sql/transferprocess/store/TransferProcessStoreStatements.java (100%) rename extensions/sql/{transfer-process-store => transfer-process-store-sql}/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension (100%) rename extensions/sql/{transfer-process-store => transfer-process-store-sql}/src/test/java/org/eclipse/dataspaceconnector/sql/transferprocess/store/SqlTransferProcessStoreTest.java (100%) rename extensions/sql/{transfer-process-store => transfer-process-store-sql}/src/test/java/org/eclipse/dataspaceconnector/sql/transferprocess/store/TestFunctions.java (100%) rename extensions/sql/{transfer-process-store => transfer-process-store-sql}/src/test/resources/schema.sql (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6eb7c068024..4ade03fa9b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,7 +21,7 @@ in the detailed section referring to by linking pull requests or issues. #### Changed -* +* Restructure sql extension folder tree (#1154) #### Removed diff --git a/extensions/sql/asset/README.md b/extensions/sql/asset-index-sql/README.md similarity index 100% rename from extensions/sql/asset/README.md rename to extensions/sql/asset-index-sql/README.md diff --git a/extensions/sql/asset/index/build.gradle.kts b/extensions/sql/asset-index-sql/build.gradle.kts similarity index 87% rename from extensions/sql/asset/index/build.gradle.kts rename to extensions/sql/asset-index-sql/build.gradle.kts index 4a0144719e9..b81d5829661 100644 --- a/extensions/sql/asset/index/build.gradle.kts +++ b/extensions/sql/asset-index-sql/build.gradle.kts @@ -25,11 +25,11 @@ dependencies { implementation(project(":extensions:dataloading")) implementation(project(":extensions:transaction:transaction-spi")) implementation(project(":extensions:transaction:transaction-datasource-spi")) - implementation(project(":extensions:sql:common")) + implementation(project(":extensions:sql:common-sql")) testImplementation(testFixtures(project(":launchers:junit"))) testImplementation(project(":core:base")) - testImplementation(project(":extensions:sql:pool:apache-commons-pool")) + testImplementation(project(":extensions:sql:pool:apache-commons-pool-sql")) testImplementation(project(":extensions:transaction:transaction-local")) testImplementation("com.h2database:h2:${h2Version}") testImplementation("org.assertj:assertj-core:${assertj}") @@ -37,8 +37,8 @@ dependencies { publishing { publications { - create("sql-asset-index") { - artifactId = "sql-asset-index" + create("asset-index-sql") { + artifactId = "asset-index-sql" from(components["java"]) } } diff --git a/extensions/sql/asset/docs/er.puml b/extensions/sql/asset-index-sql/docs/er.puml similarity index 100% rename from extensions/sql/asset/docs/er.puml rename to extensions/sql/asset-index-sql/docs/er.puml diff --git a/extensions/sql/asset/docs/schema.sql b/extensions/sql/asset-index-sql/docs/schema.sql similarity index 100% rename from extensions/sql/asset/docs/schema.sql rename to extensions/sql/asset-index-sql/docs/schema.sql diff --git a/extensions/sql/asset/index/src/main/java/org/eclipse/dataspaceconnector/sql/asset/index/ConfigurationKeys.java b/extensions/sql/asset-index-sql/src/main/java/org/eclipse/dataspaceconnector/sql/asset/index/ConfigurationKeys.java similarity index 100% rename from extensions/sql/asset/index/src/main/java/org/eclipse/dataspaceconnector/sql/asset/index/ConfigurationKeys.java rename to extensions/sql/asset-index-sql/src/main/java/org/eclipse/dataspaceconnector/sql/asset/index/ConfigurationKeys.java diff --git a/extensions/sql/asset/index/src/main/java/org/eclipse/dataspaceconnector/sql/asset/index/PostgresSqlAssetQueries.java b/extensions/sql/asset-index-sql/src/main/java/org/eclipse/dataspaceconnector/sql/asset/index/PostgresSqlAssetQueries.java similarity index 100% rename from extensions/sql/asset/index/src/main/java/org/eclipse/dataspaceconnector/sql/asset/index/PostgresSqlAssetQueries.java rename to extensions/sql/asset-index-sql/src/main/java/org/eclipse/dataspaceconnector/sql/asset/index/PostgresSqlAssetQueries.java diff --git a/extensions/sql/asset/index/src/main/java/org/eclipse/dataspaceconnector/sql/asset/index/SqlAssetIndex.java b/extensions/sql/asset-index-sql/src/main/java/org/eclipse/dataspaceconnector/sql/asset/index/SqlAssetIndex.java similarity index 100% rename from extensions/sql/asset/index/src/main/java/org/eclipse/dataspaceconnector/sql/asset/index/SqlAssetIndex.java rename to extensions/sql/asset-index-sql/src/main/java/org/eclipse/dataspaceconnector/sql/asset/index/SqlAssetIndex.java diff --git a/extensions/sql/asset/index/src/main/java/org/eclipse/dataspaceconnector/sql/asset/index/SqlAssetIndexServiceExtension.java b/extensions/sql/asset-index-sql/src/main/java/org/eclipse/dataspaceconnector/sql/asset/index/SqlAssetIndexServiceExtension.java similarity index 100% rename from extensions/sql/asset/index/src/main/java/org/eclipse/dataspaceconnector/sql/asset/index/SqlAssetIndexServiceExtension.java rename to extensions/sql/asset-index-sql/src/main/java/org/eclipse/dataspaceconnector/sql/asset/index/SqlAssetIndexServiceExtension.java diff --git a/extensions/sql/asset/index/src/main/java/org/eclipse/dataspaceconnector/sql/asset/index/SqlAssetQueries.java b/extensions/sql/asset-index-sql/src/main/java/org/eclipse/dataspaceconnector/sql/asset/index/SqlAssetQueries.java similarity index 100% rename from extensions/sql/asset/index/src/main/java/org/eclipse/dataspaceconnector/sql/asset/index/SqlAssetQueries.java rename to extensions/sql/asset-index-sql/src/main/java/org/eclipse/dataspaceconnector/sql/asset/index/SqlAssetQueries.java diff --git a/extensions/sql/asset/index/src/main/java/org/eclipse/dataspaceconnector/sql/asset/index/SqlAssetTables.java b/extensions/sql/asset-index-sql/src/main/java/org/eclipse/dataspaceconnector/sql/asset/index/SqlAssetTables.java similarity index 100% rename from extensions/sql/asset/index/src/main/java/org/eclipse/dataspaceconnector/sql/asset/index/SqlAssetTables.java rename to extensions/sql/asset-index-sql/src/main/java/org/eclipse/dataspaceconnector/sql/asset/index/SqlAssetTables.java diff --git a/extensions/sql/asset/index/src/main/java/org/eclipse/dataspaceconnector/sql/asset/index/SqlConditionExpression.java b/extensions/sql/asset-index-sql/src/main/java/org/eclipse/dataspaceconnector/sql/asset/index/SqlConditionExpression.java similarity index 100% rename from extensions/sql/asset/index/src/main/java/org/eclipse/dataspaceconnector/sql/asset/index/SqlConditionExpression.java rename to extensions/sql/asset-index-sql/src/main/java/org/eclipse/dataspaceconnector/sql/asset/index/SqlConditionExpression.java diff --git a/extensions/sql/asset/index/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension b/extensions/sql/asset-index-sql/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension similarity index 100% rename from extensions/sql/asset/index/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension rename to extensions/sql/asset-index-sql/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension diff --git a/extensions/sql/asset/index/src/test/java/org/eclipse/dataspaceconnector/sql/asset/index/SqlAssetIndexTest.java b/extensions/sql/asset-index-sql/src/test/java/org/eclipse/dataspaceconnector/sql/asset/index/SqlAssetIndexTest.java similarity index 100% rename from extensions/sql/asset/index/src/test/java/org/eclipse/dataspaceconnector/sql/asset/index/SqlAssetIndexTest.java rename to extensions/sql/asset-index-sql/src/test/java/org/eclipse/dataspaceconnector/sql/asset/index/SqlAssetIndexTest.java diff --git a/extensions/sql/asset/index/src/test/java/org/eclipse/dataspaceconnector/sql/asset/index/SqlConditionExpressionTest.java b/extensions/sql/asset-index-sql/src/test/java/org/eclipse/dataspaceconnector/sql/asset/index/SqlConditionExpressionTest.java similarity index 100% rename from extensions/sql/asset/index/src/test/java/org/eclipse/dataspaceconnector/sql/asset/index/SqlConditionExpressionTest.java rename to extensions/sql/asset-index-sql/src/test/java/org/eclipse/dataspaceconnector/sql/asset/index/SqlConditionExpressionTest.java diff --git a/extensions/sql/asset/index/src/test/resources/schema.sql b/extensions/sql/asset-index-sql/src/test/resources/schema.sql similarity index 100% rename from extensions/sql/asset/index/src/test/resources/schema.sql rename to extensions/sql/asset-index-sql/src/test/resources/schema.sql diff --git a/extensions/sql/build.gradle.kts b/extensions/sql/build.gradle.kts index 0476c4ec04e..009f6b3e4ae 100644 --- a/extensions/sql/build.gradle.kts +++ b/extensions/sql/build.gradle.kts @@ -18,11 +18,13 @@ plugins { } dependencies { - implementation(project(":extensions:sql:contract-definition")) - implementation(project(":extensions:sql:contract-negotiation-store")) - implementation(project(":extensions:sql:lease")) - implementation(project(":extensions:sql:pool")) - implementation(project(":extensions:sql:transfer-process-store")) + implementation(project(":extensions:sql:asset-index-sql")) + implementation(project(":extensions:sql:common-sql")) + implementation(project(":extensions:sql:contract-definition-store-sql")) + implementation(project(":extensions:sql:contract-negotiation-store-sql")) + implementation(project(":extensions:sql:lease-sql")) + implementation(project(":extensions:sql:policy-store-sql")) + implementation(project(":extensions:sql:transfer-process-store-sql")) } publishing { diff --git a/extensions/sql/common/README.md b/extensions/sql/common-sql/README.md similarity index 100% rename from extensions/sql/common/README.md rename to extensions/sql/common-sql/README.md diff --git a/extensions/sql/common/build.gradle.kts b/extensions/sql/common-sql/build.gradle.kts similarity index 88% rename from extensions/sql/common/build.gradle.kts rename to extensions/sql/common-sql/build.gradle.kts index 3a64ab3b90a..c8fcb24d208 100644 --- a/extensions/sql/common/build.gradle.kts +++ b/extensions/sql/common-sql/build.gradle.kts @@ -27,8 +27,8 @@ dependencies { publishing { publications { - create("sql-common") { - artifactId = "sql-common" + create("common-sql") { + artifactId = "common-sql" from(components["java"]) } } diff --git a/extensions/sql/common/src/main/java/org/eclipse/dataspaceconnector/sql/ArgumentHandler.java b/extensions/sql/common-sql/src/main/java/org/eclipse/dataspaceconnector/sql/ArgumentHandler.java similarity index 100% rename from extensions/sql/common/src/main/java/org/eclipse/dataspaceconnector/sql/ArgumentHandler.java rename to extensions/sql/common-sql/src/main/java/org/eclipse/dataspaceconnector/sql/ArgumentHandler.java diff --git a/extensions/sql/common/src/main/java/org/eclipse/dataspaceconnector/sql/ArgumentHandlers.java b/extensions/sql/common-sql/src/main/java/org/eclipse/dataspaceconnector/sql/ArgumentHandlers.java similarity index 100% rename from extensions/sql/common/src/main/java/org/eclipse/dataspaceconnector/sql/ArgumentHandlers.java rename to extensions/sql/common-sql/src/main/java/org/eclipse/dataspaceconnector/sql/ArgumentHandlers.java diff --git a/extensions/sql/common/src/main/java/org/eclipse/dataspaceconnector/sql/ConnectionFactory.java b/extensions/sql/common-sql/src/main/java/org/eclipse/dataspaceconnector/sql/ConnectionFactory.java similarity index 100% rename from extensions/sql/common/src/main/java/org/eclipse/dataspaceconnector/sql/ConnectionFactory.java rename to extensions/sql/common-sql/src/main/java/org/eclipse/dataspaceconnector/sql/ConnectionFactory.java diff --git a/extensions/sql/common/src/main/java/org/eclipse/dataspaceconnector/sql/ResultSetMapper.java b/extensions/sql/common-sql/src/main/java/org/eclipse/dataspaceconnector/sql/ResultSetMapper.java similarity index 100% rename from extensions/sql/common/src/main/java/org/eclipse/dataspaceconnector/sql/ResultSetMapper.java rename to extensions/sql/common-sql/src/main/java/org/eclipse/dataspaceconnector/sql/ResultSetMapper.java diff --git a/extensions/sql/common/src/main/java/org/eclipse/dataspaceconnector/sql/SqlQueryExecutor.java b/extensions/sql/common-sql/src/main/java/org/eclipse/dataspaceconnector/sql/SqlQueryExecutor.java similarity index 100% rename from extensions/sql/common/src/main/java/org/eclipse/dataspaceconnector/sql/SqlQueryExecutor.java rename to extensions/sql/common-sql/src/main/java/org/eclipse/dataspaceconnector/sql/SqlQueryExecutor.java diff --git a/extensions/sql/common/src/main/java/org/eclipse/dataspaceconnector/sql/datasource/ConnectionFactoryDataSource.java b/extensions/sql/common-sql/src/main/java/org/eclipse/dataspaceconnector/sql/datasource/ConnectionFactoryDataSource.java similarity index 100% rename from extensions/sql/common/src/main/java/org/eclipse/dataspaceconnector/sql/datasource/ConnectionFactoryDataSource.java rename to extensions/sql/common-sql/src/main/java/org/eclipse/dataspaceconnector/sql/datasource/ConnectionFactoryDataSource.java diff --git a/extensions/sql/common/src/main/java/org/eclipse/dataspaceconnector/sql/datasource/ConnectionPoolDataSource.java b/extensions/sql/common-sql/src/main/java/org/eclipse/dataspaceconnector/sql/datasource/ConnectionPoolDataSource.java similarity index 100% rename from extensions/sql/common/src/main/java/org/eclipse/dataspaceconnector/sql/datasource/ConnectionPoolDataSource.java rename to extensions/sql/common-sql/src/main/java/org/eclipse/dataspaceconnector/sql/datasource/ConnectionPoolDataSource.java diff --git a/extensions/sql/common/src/main/java/org/eclipse/dataspaceconnector/sql/datasource/PooledDataSourceConnection.java b/extensions/sql/common-sql/src/main/java/org/eclipse/dataspaceconnector/sql/datasource/PooledDataSourceConnection.java similarity index 100% rename from extensions/sql/common/src/main/java/org/eclipse/dataspaceconnector/sql/datasource/PooledDataSourceConnection.java rename to extensions/sql/common-sql/src/main/java/org/eclipse/dataspaceconnector/sql/datasource/PooledDataSourceConnection.java diff --git a/extensions/sql/common/src/main/java/org/eclipse/dataspaceconnector/sql/pool/ConnectionPool.java b/extensions/sql/common-sql/src/main/java/org/eclipse/dataspaceconnector/sql/pool/ConnectionPool.java similarity index 100% rename from extensions/sql/common/src/main/java/org/eclipse/dataspaceconnector/sql/pool/ConnectionPool.java rename to extensions/sql/common-sql/src/main/java/org/eclipse/dataspaceconnector/sql/pool/ConnectionPool.java diff --git a/extensions/sql/common/src/test/java/org/eclipse/dataspaceconnector/sql/SqlQueryExecutorIntegrationTest.java b/extensions/sql/common-sql/src/test/java/org/eclipse/dataspaceconnector/sql/SqlQueryExecutorIntegrationTest.java similarity index 100% rename from extensions/sql/common/src/test/java/org/eclipse/dataspaceconnector/sql/SqlQueryExecutorIntegrationTest.java rename to extensions/sql/common-sql/src/test/java/org/eclipse/dataspaceconnector/sql/SqlQueryExecutorIntegrationTest.java diff --git a/extensions/sql/common/src/test/java/org/eclipse/dataspaceconnector/sql/SqlQueryExecutorTest.java b/extensions/sql/common-sql/src/test/java/org/eclipse/dataspaceconnector/sql/SqlQueryExecutorTest.java similarity index 100% rename from extensions/sql/common/src/test/java/org/eclipse/dataspaceconnector/sql/SqlQueryExecutorTest.java rename to extensions/sql/common-sql/src/test/java/org/eclipse/dataspaceconnector/sql/SqlQueryExecutorTest.java diff --git a/extensions/sql/common/src/test/java/org/eclipse/dataspaceconnector/sql/datasource/ConnectionFactoryDataSourceTest.java b/extensions/sql/common-sql/src/test/java/org/eclipse/dataspaceconnector/sql/datasource/ConnectionFactoryDataSourceTest.java similarity index 100% rename from extensions/sql/common/src/test/java/org/eclipse/dataspaceconnector/sql/datasource/ConnectionFactoryDataSourceTest.java rename to extensions/sql/common-sql/src/test/java/org/eclipse/dataspaceconnector/sql/datasource/ConnectionFactoryDataSourceTest.java diff --git a/extensions/sql/common/src/test/java/org/eclipse/dataspaceconnector/sql/datasource/ConnectionPoolDataSourceTest.java b/extensions/sql/common-sql/src/test/java/org/eclipse/dataspaceconnector/sql/datasource/ConnectionPoolDataSourceTest.java similarity index 100% rename from extensions/sql/common/src/test/java/org/eclipse/dataspaceconnector/sql/datasource/ConnectionPoolDataSourceTest.java rename to extensions/sql/common-sql/src/test/java/org/eclipse/dataspaceconnector/sql/datasource/ConnectionPoolDataSourceTest.java diff --git a/extensions/sql/common/src/test/java/org/eclipse/dataspaceconnector/sql/datasource/PooledDataSourceConnectionTest.java b/extensions/sql/common-sql/src/test/java/org/eclipse/dataspaceconnector/sql/datasource/PooledDataSourceConnectionTest.java similarity index 100% rename from extensions/sql/common/src/test/java/org/eclipse/dataspaceconnector/sql/datasource/PooledDataSourceConnectionTest.java rename to extensions/sql/common-sql/src/test/java/org/eclipse/dataspaceconnector/sql/datasource/PooledDataSourceConnectionTest.java diff --git a/extensions/sql/contract-definition/store/build.gradle.kts b/extensions/sql/contract-definition-store-sql/build.gradle.kts similarity index 86% rename from extensions/sql/contract-definition/store/build.gradle.kts rename to extensions/sql/contract-definition-store-sql/build.gradle.kts index 2ee0fa19b54..2e49780133b 100644 --- a/extensions/sql/contract-definition/store/build.gradle.kts +++ b/extensions/sql/contract-definition-store-sql/build.gradle.kts @@ -26,11 +26,11 @@ dependencies { implementation(project(":extensions:dataloading")) implementation(project(":extensions:transaction:transaction-spi")) implementation(project(":extensions:transaction:transaction-datasource-spi")) - implementation(project(":extensions:sql:common")) + implementation(project(":extensions:sql:common-sql")) testImplementation(testFixtures(project(":launchers:junit"))) testImplementation(project(":core:base")) - testImplementation(project(":extensions:sql:pool:apache-commons-pool")) + testImplementation(project(":extensions:sql:pool:apache-commons-pool-sql")) testImplementation(project(":extensions:transaction:transaction-local")) testImplementation("com.h2database:h2:${h2Version}") testImplementation("org.assertj:assertj-core:${assertj}") @@ -38,8 +38,8 @@ dependencies { publishing { publications { - create("sql-contractdefinition-store") { - artifactId = "sql-contractdefinition-store" + create("contractdefinition-store-sql") { + artifactId = "contractdefinition-store-sql" from(components["java"]) } } diff --git a/extensions/sql/contract-definition/docs/README.md b/extensions/sql/contract-definition-store-sql/docs/README.md similarity index 100% rename from extensions/sql/contract-definition/docs/README.md rename to extensions/sql/contract-definition-store-sql/docs/README.md diff --git a/extensions/sql/contract-definition/docs/er.png b/extensions/sql/contract-definition-store-sql/docs/er.png similarity index 100% rename from extensions/sql/contract-definition/docs/er.png rename to extensions/sql/contract-definition-store-sql/docs/er.png diff --git a/extensions/sql/contract-definition/docs/er.puml b/extensions/sql/contract-definition-store-sql/docs/er.puml similarity index 100% rename from extensions/sql/contract-definition/docs/er.puml rename to extensions/sql/contract-definition-store-sql/docs/er.puml diff --git a/extensions/sql/contract-definition/docs/schema.sql b/extensions/sql/contract-definition-store-sql/docs/schema.sql similarity index 100% rename from extensions/sql/contract-definition/docs/schema.sql rename to extensions/sql/contract-definition-store-sql/docs/schema.sql diff --git a/extensions/sql/contract-definition/store/src/main/java/org/eclipse/dataspaceconnector/sql/contractdefinition/store/ContractDefinitionStatements.java b/extensions/sql/contract-definition-store-sql/src/main/java/org/eclipse/dataspaceconnector/sql/contractdefinition/store/ContractDefinitionStatements.java similarity index 100% rename from extensions/sql/contract-definition/store/src/main/java/org/eclipse/dataspaceconnector/sql/contractdefinition/store/ContractDefinitionStatements.java rename to extensions/sql/contract-definition-store-sql/src/main/java/org/eclipse/dataspaceconnector/sql/contractdefinition/store/ContractDefinitionStatements.java diff --git a/extensions/sql/contract-definition/store/src/main/java/org/eclipse/dataspaceconnector/sql/contractdefinition/store/PostgresStatements.java b/extensions/sql/contract-definition-store-sql/src/main/java/org/eclipse/dataspaceconnector/sql/contractdefinition/store/PostgresStatements.java similarity index 100% rename from extensions/sql/contract-definition/store/src/main/java/org/eclipse/dataspaceconnector/sql/contractdefinition/store/PostgresStatements.java rename to extensions/sql/contract-definition-store-sql/src/main/java/org/eclipse/dataspaceconnector/sql/contractdefinition/store/PostgresStatements.java diff --git a/extensions/sql/contract-definition/store/src/main/java/org/eclipse/dataspaceconnector/sql/contractdefinition/store/SqlContractDefinitionStore.java b/extensions/sql/contract-definition-store-sql/src/main/java/org/eclipse/dataspaceconnector/sql/contractdefinition/store/SqlContractDefinitionStore.java similarity index 100% rename from extensions/sql/contract-definition/store/src/main/java/org/eclipse/dataspaceconnector/sql/contractdefinition/store/SqlContractDefinitionStore.java rename to extensions/sql/contract-definition-store-sql/src/main/java/org/eclipse/dataspaceconnector/sql/contractdefinition/store/SqlContractDefinitionStore.java diff --git a/extensions/sql/contract-definition/store/src/main/java/org/eclipse/dataspaceconnector/sql/contractdefinition/store/SqlContractDefinitionStoreExtension.java b/extensions/sql/contract-definition-store-sql/src/main/java/org/eclipse/dataspaceconnector/sql/contractdefinition/store/SqlContractDefinitionStoreExtension.java similarity index 100% rename from extensions/sql/contract-definition/store/src/main/java/org/eclipse/dataspaceconnector/sql/contractdefinition/store/SqlContractDefinitionStoreExtension.java rename to extensions/sql/contract-definition-store-sql/src/main/java/org/eclipse/dataspaceconnector/sql/contractdefinition/store/SqlContractDefinitionStoreExtension.java diff --git a/extensions/sql/contract-definition/store/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension b/extensions/sql/contract-definition-store-sql/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension similarity index 100% rename from extensions/sql/contract-definition/store/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension rename to extensions/sql/contract-definition-store-sql/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension diff --git a/extensions/sql/contract-definition/store/src/test/java/org/eclipse/dataspaceconnector/sql/contractdefinition/store/SqlContractDefinitionStoreTest.java b/extensions/sql/contract-definition-store-sql/src/test/java/org/eclipse/dataspaceconnector/sql/contractdefinition/store/SqlContractDefinitionStoreTest.java similarity index 100% rename from extensions/sql/contract-definition/store/src/test/java/org/eclipse/dataspaceconnector/sql/contractdefinition/store/SqlContractDefinitionStoreTest.java rename to extensions/sql/contract-definition-store-sql/src/test/java/org/eclipse/dataspaceconnector/sql/contractdefinition/store/SqlContractDefinitionStoreTest.java diff --git a/extensions/sql/contract-definition/store/src/test/resources/schema.sql b/extensions/sql/contract-definition-store-sql/src/test/resources/schema.sql similarity index 100% rename from extensions/sql/contract-definition/store/src/test/resources/schema.sql rename to extensions/sql/contract-definition-store-sql/src/test/resources/schema.sql diff --git a/extensions/sql/contract-negotiation-store/build.gradle.kts b/extensions/sql/contract-negotiation-store-sql/build.gradle.kts similarity index 84% rename from extensions/sql/contract-negotiation-store/build.gradle.kts rename to extensions/sql/contract-negotiation-store-sql/build.gradle.kts index d6ebe913b75..dc72602847e 100644 --- a/extensions/sql/contract-negotiation-store/build.gradle.kts +++ b/extensions/sql/contract-negotiation-store-sql/build.gradle.kts @@ -26,23 +26,23 @@ dependencies { implementation(project(":extensions:dataloading")) implementation(project(":extensions:transaction:transaction-spi")) implementation(project(":extensions:transaction:transaction-datasource-spi")) - implementation(project(":extensions:sql:common")) - implementation(project(":extensions:sql:lease")) + implementation(project(":extensions:sql:common-sql")) + implementation(project(":extensions:sql:lease-sql")) testImplementation(testFixtures(project(":launchers:junit"))) testImplementation(project(":core:base")) testImplementation(project(":core:contract")) - testImplementation(project(":extensions:sql:pool:apache-commons-pool")) + testImplementation(project(":extensions:sql:pool:apache-commons-pool-sql")) testImplementation(project(":extensions:transaction:transaction-local")) - testImplementation(testFixtures(project(":extensions:sql:lease"))) + testImplementation(testFixtures(project(":extensions:sql:lease-sql"))) testImplementation("com.h2database:h2:${h2Version}") testImplementation("org.assertj:assertj-core:${assertj}") } publishing { publications { - create("sql-contractnegotiation-store") { - artifactId = "sql-contractnegotiation-store" + create("contractnegotiation-store-sql") { + artifactId = "contractnegotiation-store-sql" from(components["java"]) } } diff --git a/extensions/sql/contract-negotiation-store/docs/README.md b/extensions/sql/contract-negotiation-store-sql/docs/README.md similarity index 100% rename from extensions/sql/contract-negotiation-store/docs/README.md rename to extensions/sql/contract-negotiation-store-sql/docs/README.md diff --git a/extensions/sql/contract-negotiation-store/docs/ddl_postgres.sql b/extensions/sql/contract-negotiation-store-sql/docs/ddl_postgres.sql similarity index 100% rename from extensions/sql/contract-negotiation-store/docs/ddl_postgres.sql rename to extensions/sql/contract-negotiation-store-sql/docs/ddl_postgres.sql diff --git a/extensions/sql/contract-negotiation-store/src/main/java/org/eclipse/dataspaceconnector/sql/contractnegotiation/SqlContractNegotiationStoreExtension.java b/extensions/sql/contract-negotiation-store-sql/src/main/java/org/eclipse/dataspaceconnector/sql/contractnegotiation/SqlContractNegotiationStoreExtension.java similarity index 100% rename from extensions/sql/contract-negotiation-store/src/main/java/org/eclipse/dataspaceconnector/sql/contractnegotiation/SqlContractNegotiationStoreExtension.java rename to extensions/sql/contract-negotiation-store-sql/src/main/java/org/eclipse/dataspaceconnector/sql/contractnegotiation/SqlContractNegotiationStoreExtension.java diff --git a/extensions/sql/contract-negotiation-store/src/main/java/org/eclipse/dataspaceconnector/sql/contractnegotiation/store/ContractNegotiationStatements.java b/extensions/sql/contract-negotiation-store-sql/src/main/java/org/eclipse/dataspaceconnector/sql/contractnegotiation/store/ContractNegotiationStatements.java similarity index 100% rename from extensions/sql/contract-negotiation-store/src/main/java/org/eclipse/dataspaceconnector/sql/contractnegotiation/store/ContractNegotiationStatements.java rename to extensions/sql/contract-negotiation-store-sql/src/main/java/org/eclipse/dataspaceconnector/sql/contractnegotiation/store/ContractNegotiationStatements.java diff --git a/extensions/sql/contract-negotiation-store/src/main/java/org/eclipse/dataspaceconnector/sql/contractnegotiation/store/PostgresStatements.java b/extensions/sql/contract-negotiation-store-sql/src/main/java/org/eclipse/dataspaceconnector/sql/contractnegotiation/store/PostgresStatements.java similarity index 100% rename from extensions/sql/contract-negotiation-store/src/main/java/org/eclipse/dataspaceconnector/sql/contractnegotiation/store/PostgresStatements.java rename to extensions/sql/contract-negotiation-store-sql/src/main/java/org/eclipse/dataspaceconnector/sql/contractnegotiation/store/PostgresStatements.java diff --git a/extensions/sql/contract-negotiation-store/src/main/java/org/eclipse/dataspaceconnector/sql/contractnegotiation/store/SqlContractNegotiationStore.java b/extensions/sql/contract-negotiation-store-sql/src/main/java/org/eclipse/dataspaceconnector/sql/contractnegotiation/store/SqlContractNegotiationStore.java similarity index 100% rename from extensions/sql/contract-negotiation-store/src/main/java/org/eclipse/dataspaceconnector/sql/contractnegotiation/store/SqlContractNegotiationStore.java rename to extensions/sql/contract-negotiation-store-sql/src/main/java/org/eclipse/dataspaceconnector/sql/contractnegotiation/store/SqlContractNegotiationStore.java diff --git a/extensions/sql/contract-negotiation-store/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension b/extensions/sql/contract-negotiation-store-sql/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension similarity index 100% rename from extensions/sql/contract-negotiation-store/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension rename to extensions/sql/contract-negotiation-store-sql/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension diff --git a/extensions/sql/contract-negotiation-store/src/test/java/org/eclipse/dataspaceconnector/sql/contractnegotiation/SqlContractNegotiationStoreExtensionTest.java b/extensions/sql/contract-negotiation-store-sql/src/test/java/org/eclipse/dataspaceconnector/sql/contractnegotiation/SqlContractNegotiationStoreExtensionTest.java similarity index 100% rename from extensions/sql/contract-negotiation-store/src/test/java/org/eclipse/dataspaceconnector/sql/contractnegotiation/SqlContractNegotiationStoreExtensionTest.java rename to extensions/sql/contract-negotiation-store-sql/src/test/java/org/eclipse/dataspaceconnector/sql/contractnegotiation/SqlContractNegotiationStoreExtensionTest.java diff --git a/extensions/sql/contract-negotiation-store/src/test/java/org/eclipse/dataspaceconnector/sql/contractnegotiation/TestFunctions.java b/extensions/sql/contract-negotiation-store-sql/src/test/java/org/eclipse/dataspaceconnector/sql/contractnegotiation/TestFunctions.java similarity index 100% rename from extensions/sql/contract-negotiation-store/src/test/java/org/eclipse/dataspaceconnector/sql/contractnegotiation/TestFunctions.java rename to extensions/sql/contract-negotiation-store-sql/src/test/java/org/eclipse/dataspaceconnector/sql/contractnegotiation/TestFunctions.java diff --git a/extensions/sql/contract-negotiation-store/src/test/java/org/eclipse/dataspaceconnector/sql/contractnegotiation/store/SqlContractNegotiationStoreTest.java b/extensions/sql/contract-negotiation-store-sql/src/test/java/org/eclipse/dataspaceconnector/sql/contractnegotiation/store/SqlContractNegotiationStoreTest.java similarity index 100% rename from extensions/sql/contract-negotiation-store/src/test/java/org/eclipse/dataspaceconnector/sql/contractnegotiation/store/SqlContractNegotiationStoreTest.java rename to extensions/sql/contract-negotiation-store-sql/src/test/java/org/eclipse/dataspaceconnector/sql/contractnegotiation/store/SqlContractNegotiationStoreTest.java diff --git a/extensions/sql/contract-negotiation-store/src/test/resources/schema.sql b/extensions/sql/contract-negotiation-store-sql/src/test/resources/schema.sql similarity index 100% rename from extensions/sql/contract-negotiation-store/src/test/resources/schema.sql rename to extensions/sql/contract-negotiation-store-sql/src/test/resources/schema.sql diff --git a/extensions/sql/lease/build.gradle.kts b/extensions/sql/lease-sql/build.gradle.kts similarity index 89% rename from extensions/sql/lease/build.gradle.kts rename to extensions/sql/lease-sql/build.gradle.kts index e4f5f616df6..9bbdbb0e424 100644 --- a/extensions/sql/lease/build.gradle.kts +++ b/extensions/sql/lease-sql/build.gradle.kts @@ -26,21 +26,21 @@ val assertj: String by project dependencies { api(project(":extensions:transaction:transaction-datasource-spi")) api(project(":extensions:transaction:transaction-spi")) - api(project(":extensions:sql:common")) + api(project(":extensions:sql:common-sql")) testImplementation(testFixtures(project(":launchers:junit"))) testImplementation(project(":core:base")) testImplementation(project(":extensions:transaction:transaction-local")) - testImplementation(testFixtures(project(":extensions:sql:lease"))) + testImplementation(testFixtures(project(":extensions:sql:lease-sql"))) testImplementation("com.h2database:h2:${h2Version}") testImplementation("org.assertj:assertj-core:${assertj}") } publishing { publications { - create("sql-lease") { - artifactId = "sql-lease" + create("lease-sql") { + artifactId = "lease-sql" from(components["java"]) } } diff --git a/extensions/sql/lease/src/main/java/org/eclipse/dataspaceconnector/sql/lease/LeaseStatements.java b/extensions/sql/lease-sql/src/main/java/org/eclipse/dataspaceconnector/sql/lease/LeaseStatements.java similarity index 100% rename from extensions/sql/lease/src/main/java/org/eclipse/dataspaceconnector/sql/lease/LeaseStatements.java rename to extensions/sql/lease-sql/src/main/java/org/eclipse/dataspaceconnector/sql/lease/LeaseStatements.java diff --git a/extensions/sql/lease/src/main/java/org/eclipse/dataspaceconnector/sql/lease/SqlLease.java b/extensions/sql/lease-sql/src/main/java/org/eclipse/dataspaceconnector/sql/lease/SqlLease.java similarity index 100% rename from extensions/sql/lease/src/main/java/org/eclipse/dataspaceconnector/sql/lease/SqlLease.java rename to extensions/sql/lease-sql/src/main/java/org/eclipse/dataspaceconnector/sql/lease/SqlLease.java diff --git a/extensions/sql/lease/src/main/java/org/eclipse/dataspaceconnector/sql/lease/SqlLeaseContext.java b/extensions/sql/lease-sql/src/main/java/org/eclipse/dataspaceconnector/sql/lease/SqlLeaseContext.java similarity index 100% rename from extensions/sql/lease/src/main/java/org/eclipse/dataspaceconnector/sql/lease/SqlLeaseContext.java rename to extensions/sql/lease-sql/src/main/java/org/eclipse/dataspaceconnector/sql/lease/SqlLeaseContext.java diff --git a/extensions/sql/lease/src/main/java/org/eclipse/dataspaceconnector/sql/lease/SqlLeaseContextBuilder.java b/extensions/sql/lease-sql/src/main/java/org/eclipse/dataspaceconnector/sql/lease/SqlLeaseContextBuilder.java similarity index 100% rename from extensions/sql/lease/src/main/java/org/eclipse/dataspaceconnector/sql/lease/SqlLeaseContextBuilder.java rename to extensions/sql/lease-sql/src/main/java/org/eclipse/dataspaceconnector/sql/lease/SqlLeaseContextBuilder.java diff --git a/extensions/sql/lease/src/test/java/org/eclipse/dataspaceconnector/sql/lease/SqlLeaseContextTest.java b/extensions/sql/lease-sql/src/test/java/org/eclipse/dataspaceconnector/sql/lease/SqlLeaseContextTest.java similarity index 100% rename from extensions/sql/lease/src/test/java/org/eclipse/dataspaceconnector/sql/lease/SqlLeaseContextTest.java rename to extensions/sql/lease-sql/src/test/java/org/eclipse/dataspaceconnector/sql/lease/SqlLeaseContextTest.java diff --git a/extensions/sql/lease/src/test/resources/schema.sql b/extensions/sql/lease-sql/src/test/resources/schema.sql similarity index 100% rename from extensions/sql/lease/src/test/resources/schema.sql rename to extensions/sql/lease-sql/src/test/resources/schema.sql diff --git a/extensions/sql/lease/src/testFixtures/java/org/eclipse/dataspaceconnector/sql/lease/LeaseUtil.java b/extensions/sql/lease-sql/src/testFixtures/java/org/eclipse/dataspaceconnector/sql/lease/LeaseUtil.java similarity index 100% rename from extensions/sql/lease/src/testFixtures/java/org/eclipse/dataspaceconnector/sql/lease/LeaseUtil.java rename to extensions/sql/lease-sql/src/testFixtures/java/org/eclipse/dataspaceconnector/sql/lease/LeaseUtil.java diff --git a/extensions/sql/policy/store/build.gradle.kts b/extensions/sql/policy-store-sql/build.gradle.kts similarity index 86% rename from extensions/sql/policy/store/build.gradle.kts rename to extensions/sql/policy-store-sql/build.gradle.kts index 1450205ddfe..a3f9d987bd1 100644 --- a/extensions/sql/policy/store/build.gradle.kts +++ b/extensions/sql/policy-store-sql/build.gradle.kts @@ -26,17 +26,17 @@ dependencies { implementation(project(":extensions:dataloading")) implementation(project(":extensions:transaction:transaction-spi")) implementation(project(":extensions:transaction:transaction-datasource-spi")) - implementation(project(":extensions:sql:common")) + implementation(project(":extensions:sql:common-sql")) - testImplementation(project(":extensions:sql:pool:apache-commons-pool")) + testImplementation(project(":extensions:sql:pool:apache-commons-pool-sql")) testImplementation(project(":extensions:transaction:transaction-local")) testImplementation("com.h2database:h2:${h2Version}") } publishing { publications { - create("sql-policy-store") { - artifactId = "sql-policy-store" + create("policy-store-sql") { + artifactId = "policy-store-sql" from(components["java"]) } } diff --git a/extensions/sql/policy/docs/README.md b/extensions/sql/policy-store-sql/docs/README.md similarity index 100% rename from extensions/sql/policy/docs/README.md rename to extensions/sql/policy-store-sql/docs/README.md diff --git a/extensions/sql/policy/docs/er.png b/extensions/sql/policy-store-sql/docs/er.png similarity index 100% rename from extensions/sql/policy/docs/er.png rename to extensions/sql/policy-store-sql/docs/er.png diff --git a/extensions/sql/policy/docs/er.puml b/extensions/sql/policy-store-sql/docs/er.puml similarity index 100% rename from extensions/sql/policy/docs/er.puml rename to extensions/sql/policy-store-sql/docs/er.puml diff --git a/extensions/sql/policy/docs/schema.sql b/extensions/sql/policy-store-sql/docs/schema.sql similarity index 100% rename from extensions/sql/policy/docs/schema.sql rename to extensions/sql/policy-store-sql/docs/schema.sql diff --git a/extensions/sql/policy/store/src/main/java/org/eclipse/dataspaceconnector/sql/policy/SqlPolicyStoreExtension.java b/extensions/sql/policy-store-sql/src/main/java/org/eclipse/dataspaceconnector/sql/policy/SqlPolicyStoreExtension.java similarity index 100% rename from extensions/sql/policy/store/src/main/java/org/eclipse/dataspaceconnector/sql/policy/SqlPolicyStoreExtension.java rename to extensions/sql/policy-store-sql/src/main/java/org/eclipse/dataspaceconnector/sql/policy/SqlPolicyStoreExtension.java diff --git a/extensions/sql/policy/store/src/main/java/org/eclipse/dataspaceconnector/sql/policy/store/PostgressStatements.java b/extensions/sql/policy-store-sql/src/main/java/org/eclipse/dataspaceconnector/sql/policy/store/PostgressStatements.java similarity index 100% rename from extensions/sql/policy/store/src/main/java/org/eclipse/dataspaceconnector/sql/policy/store/PostgressStatements.java rename to extensions/sql/policy-store-sql/src/main/java/org/eclipse/dataspaceconnector/sql/policy/store/PostgressStatements.java diff --git a/extensions/sql/policy/store/src/main/java/org/eclipse/dataspaceconnector/sql/policy/store/SqlPolicyStore.java b/extensions/sql/policy-store-sql/src/main/java/org/eclipse/dataspaceconnector/sql/policy/store/SqlPolicyStore.java similarity index 100% rename from extensions/sql/policy/store/src/main/java/org/eclipse/dataspaceconnector/sql/policy/store/SqlPolicyStore.java rename to extensions/sql/policy-store-sql/src/main/java/org/eclipse/dataspaceconnector/sql/policy/store/SqlPolicyStore.java diff --git a/extensions/sql/policy/store/src/main/java/org/eclipse/dataspaceconnector/sql/policy/store/SqlPolicyStoreStatements.java b/extensions/sql/policy-store-sql/src/main/java/org/eclipse/dataspaceconnector/sql/policy/store/SqlPolicyStoreStatements.java similarity index 100% rename from extensions/sql/policy/store/src/main/java/org/eclipse/dataspaceconnector/sql/policy/store/SqlPolicyStoreStatements.java rename to extensions/sql/policy-store-sql/src/main/java/org/eclipse/dataspaceconnector/sql/policy/store/SqlPolicyStoreStatements.java diff --git a/extensions/sql/policy/store/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension b/extensions/sql/policy-store-sql/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension similarity index 100% rename from extensions/sql/policy/store/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension rename to extensions/sql/policy-store-sql/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension diff --git a/extensions/sql/policy/store/src/test/java/org/eclipse/dataspaceconnector/slq/policy/store/SqlPolicyStoreTest.java b/extensions/sql/policy-store-sql/src/test/java/org/eclipse/dataspaceconnector/slq/policy/store/SqlPolicyStoreTest.java similarity index 100% rename from extensions/sql/policy/store/src/test/java/org/eclipse/dataspaceconnector/slq/policy/store/SqlPolicyStoreTest.java rename to extensions/sql/policy-store-sql/src/test/java/org/eclipse/dataspaceconnector/slq/policy/store/SqlPolicyStoreTest.java diff --git a/extensions/sql/policy/store/src/test/resources/schema.sql b/extensions/sql/policy-store-sql/src/test/resources/schema.sql similarity index 100% rename from extensions/sql/policy/store/src/test/resources/schema.sql rename to extensions/sql/policy-store-sql/src/test/resources/schema.sql diff --git a/extensions/sql/pool/apache-commons-pool/README.md b/extensions/sql/pool/apache-commons-pool-sql/README.md similarity index 100% rename from extensions/sql/pool/apache-commons-pool/README.md rename to extensions/sql/pool/apache-commons-pool-sql/README.md diff --git a/extensions/sql/pool/apache-commons-pool/build.gradle.kts b/extensions/sql/pool/apache-commons-pool-sql/build.gradle.kts similarity index 87% rename from extensions/sql/pool/apache-commons-pool/build.gradle.kts rename to extensions/sql/pool/apache-commons-pool-sql/build.gradle.kts index 5b53a7a5775..3963a73ce07 100644 --- a/extensions/sql/pool/apache-commons-pool/build.gradle.kts +++ b/extensions/sql/pool/apache-commons-pool-sql/build.gradle.kts @@ -24,7 +24,7 @@ val mockitoVersion: String by project dependencies { api(project((":spi"))) api(project(":extensions:transaction:transaction-datasource-spi")) - api(project(":extensions:sql:common")) + api(project(":extensions:sql:common-sql")) implementation("org.apache.commons:commons-pool2:${apacheCommonsPool2Version}") @@ -38,8 +38,8 @@ dependencies { publishing { publications { - create("sql-pool-apache-commons-pool") { - artifactId = "sql-pool-apache-commons-pool" + create("apache-commons-pool-sql") { + artifactId = "apache-commons-pool-sql" from(components["java"]) } } diff --git a/extensions/sql/pool/apache-commons-pool/src/main/java/org/eclipse/dataspaceconnector/sql/pool/commons/CommonsConnectionPool.java b/extensions/sql/pool/apache-commons-pool-sql/src/main/java/org/eclipse/dataspaceconnector/sql/pool/commons/CommonsConnectionPool.java similarity index 100% rename from extensions/sql/pool/apache-commons-pool/src/main/java/org/eclipse/dataspaceconnector/sql/pool/commons/CommonsConnectionPool.java rename to extensions/sql/pool/apache-commons-pool-sql/src/main/java/org/eclipse/dataspaceconnector/sql/pool/commons/CommonsConnectionPool.java diff --git a/extensions/sql/pool/apache-commons-pool/src/main/java/org/eclipse/dataspaceconnector/sql/pool/commons/CommonsConnectionPoolConfig.java b/extensions/sql/pool/apache-commons-pool-sql/src/main/java/org/eclipse/dataspaceconnector/sql/pool/commons/CommonsConnectionPoolConfig.java similarity index 100% rename from extensions/sql/pool/apache-commons-pool/src/main/java/org/eclipse/dataspaceconnector/sql/pool/commons/CommonsConnectionPoolConfig.java rename to extensions/sql/pool/apache-commons-pool-sql/src/main/java/org/eclipse/dataspaceconnector/sql/pool/commons/CommonsConnectionPoolConfig.java diff --git a/extensions/sql/pool/apache-commons-pool/src/main/java/org/eclipse/dataspaceconnector/sql/pool/commons/CommonsConnectionPoolConfigKeys.java b/extensions/sql/pool/apache-commons-pool-sql/src/main/java/org/eclipse/dataspaceconnector/sql/pool/commons/CommonsConnectionPoolConfigKeys.java similarity index 100% rename from extensions/sql/pool/apache-commons-pool/src/main/java/org/eclipse/dataspaceconnector/sql/pool/commons/CommonsConnectionPoolConfigKeys.java rename to extensions/sql/pool/apache-commons-pool-sql/src/main/java/org/eclipse/dataspaceconnector/sql/pool/commons/CommonsConnectionPoolConfigKeys.java diff --git a/extensions/sql/pool/apache-commons-pool/src/main/java/org/eclipse/dataspaceconnector/sql/pool/commons/CommonsConnectionPoolServiceExtension.java b/extensions/sql/pool/apache-commons-pool-sql/src/main/java/org/eclipse/dataspaceconnector/sql/pool/commons/CommonsConnectionPoolServiceExtension.java similarity index 100% rename from extensions/sql/pool/apache-commons-pool/src/main/java/org/eclipse/dataspaceconnector/sql/pool/commons/CommonsConnectionPoolServiceExtension.java rename to extensions/sql/pool/apache-commons-pool-sql/src/main/java/org/eclipse/dataspaceconnector/sql/pool/commons/CommonsConnectionPoolServiceExtension.java diff --git a/extensions/sql/pool/apache-commons-pool/src/main/java/org/eclipse/dataspaceconnector/sql/pool/commons/DriverManagerConnectionFactory.java b/extensions/sql/pool/apache-commons-pool-sql/src/main/java/org/eclipse/dataspaceconnector/sql/pool/commons/DriverManagerConnectionFactory.java similarity index 100% rename from extensions/sql/pool/apache-commons-pool/src/main/java/org/eclipse/dataspaceconnector/sql/pool/commons/DriverManagerConnectionFactory.java rename to extensions/sql/pool/apache-commons-pool-sql/src/main/java/org/eclipse/dataspaceconnector/sql/pool/commons/DriverManagerConnectionFactory.java diff --git a/extensions/sql/pool/apache-commons-pool/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension b/extensions/sql/pool/apache-commons-pool-sql/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension similarity index 100% rename from extensions/sql/pool/apache-commons-pool/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension rename to extensions/sql/pool/apache-commons-pool-sql/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension diff --git a/extensions/sql/pool/apache-commons-pool/src/test/java/org/eclipse/dataspaceconnector/sql/pool/commons/AbstractCommonsConnectionPoolServiceExtensionTest.java b/extensions/sql/pool/apache-commons-pool-sql/src/test/java/org/eclipse/dataspaceconnector/sql/pool/commons/AbstractCommonsConnectionPoolServiceExtensionTest.java similarity index 100% rename from extensions/sql/pool/apache-commons-pool/src/test/java/org/eclipse/dataspaceconnector/sql/pool/commons/AbstractCommonsConnectionPoolServiceExtensionTest.java rename to extensions/sql/pool/apache-commons-pool-sql/src/test/java/org/eclipse/dataspaceconnector/sql/pool/commons/AbstractCommonsConnectionPoolServiceExtensionTest.java diff --git a/extensions/sql/pool/apache-commons-pool/src/test/java/org/eclipse/dataspaceconnector/sql/pool/commons/CommonsConnectionPoolConfigTest.java b/extensions/sql/pool/apache-commons-pool-sql/src/test/java/org/eclipse/dataspaceconnector/sql/pool/commons/CommonsConnectionPoolConfigTest.java similarity index 100% rename from extensions/sql/pool/apache-commons-pool/src/test/java/org/eclipse/dataspaceconnector/sql/pool/commons/CommonsConnectionPoolConfigTest.java rename to extensions/sql/pool/apache-commons-pool-sql/src/test/java/org/eclipse/dataspaceconnector/sql/pool/commons/CommonsConnectionPoolConfigTest.java diff --git a/extensions/sql/pool/apache-commons-pool/src/test/java/org/eclipse/dataspaceconnector/sql/pool/commons/CommonsConnectionPoolServiceExtensionTest.java b/extensions/sql/pool/apache-commons-pool-sql/src/test/java/org/eclipse/dataspaceconnector/sql/pool/commons/CommonsConnectionPoolServiceExtensionTest.java similarity index 100% rename from extensions/sql/pool/apache-commons-pool/src/test/java/org/eclipse/dataspaceconnector/sql/pool/commons/CommonsConnectionPoolServiceExtensionTest.java rename to extensions/sql/pool/apache-commons-pool-sql/src/test/java/org/eclipse/dataspaceconnector/sql/pool/commons/CommonsConnectionPoolServiceExtensionTest.java diff --git a/extensions/sql/pool/apache-commons-pool/src/test/java/org/eclipse/dataspaceconnector/sql/pool/commons/CommonsConnectionPoolTest.java b/extensions/sql/pool/apache-commons-pool-sql/src/test/java/org/eclipse/dataspaceconnector/sql/pool/commons/CommonsConnectionPoolTest.java similarity index 100% rename from extensions/sql/pool/apache-commons-pool/src/test/java/org/eclipse/dataspaceconnector/sql/pool/commons/CommonsConnectionPoolTest.java rename to extensions/sql/pool/apache-commons-pool-sql/src/test/java/org/eclipse/dataspaceconnector/sql/pool/commons/CommonsConnectionPoolTest.java diff --git a/extensions/sql/transfer-process-store/build.gradle.kts b/extensions/sql/transfer-process-store-sql/build.gradle.kts similarity index 84% rename from extensions/sql/transfer-process-store/build.gradle.kts rename to extensions/sql/transfer-process-store-sql/build.gradle.kts index ca1685c4500..3d5d7e1bcb0 100644 --- a/extensions/sql/transfer-process-store/build.gradle.kts +++ b/extensions/sql/transfer-process-store-sql/build.gradle.kts @@ -28,13 +28,13 @@ dependencies { implementation(project(":extensions:dataloading")) implementation(project(":extensions:transaction:transaction-spi")) implementation(project(":extensions:transaction:transaction-datasource-spi")) - implementation(project(":extensions:sql:common")) - implementation(project(":extensions:sql:lease")) + implementation(project(":extensions:sql:common-sql")) + implementation(project(":extensions:sql:lease-sql")) testImplementation(testFixtures(project(":launchers:junit"))) - testImplementation(testFixtures(project(":extensions:sql:lease"))) + testImplementation(testFixtures(project(":extensions:sql:lease-sql"))) testImplementation(project(":core:base")) - testImplementation(project(":extensions:sql:pool:apache-commons-pool")) + testImplementation(project(":extensions:sql:pool:apache-commons-pool-sql")) testImplementation(project(":extensions:transaction:transaction-local")) testImplementation("com.h2database:h2:${h2Version}") testImplementation("org.assertj:assertj-core:${assertj}") @@ -43,8 +43,8 @@ dependencies { publishing { publications { - create("sql-transferprocess-store") { - artifactId = "sql-transferprocess-store" + create("transfer-process-store-sql") { + artifactId = "transfer-process-store-sql" from(components["java"]) } } diff --git a/extensions/sql/transfer-process-store/doc/README.md b/extensions/sql/transfer-process-store-sql/doc/README.md similarity index 100% rename from extensions/sql/transfer-process-store/doc/README.md rename to extensions/sql/transfer-process-store-sql/doc/README.md diff --git a/extensions/sql/transfer-process-store/doc/ddl_postgres.sql b/extensions/sql/transfer-process-store-sql/doc/ddl_postgres.sql similarity index 100% rename from extensions/sql/transfer-process-store/doc/ddl_postgres.sql rename to extensions/sql/transfer-process-store-sql/doc/ddl_postgres.sql diff --git a/extensions/sql/transfer-process-store/src/main/java/org/eclipse/dataspaceconnector/sql/transferprocess/SqlTransferProcessStoreExtension.java b/extensions/sql/transfer-process-store-sql/src/main/java/org/eclipse/dataspaceconnector/sql/transferprocess/SqlTransferProcessStoreExtension.java similarity index 100% rename from extensions/sql/transfer-process-store/src/main/java/org/eclipse/dataspaceconnector/sql/transferprocess/SqlTransferProcessStoreExtension.java rename to extensions/sql/transfer-process-store-sql/src/main/java/org/eclipse/dataspaceconnector/sql/transferprocess/SqlTransferProcessStoreExtension.java diff --git a/extensions/sql/transfer-process-store/src/main/java/org/eclipse/dataspaceconnector/sql/transferprocess/store/PostgresStatements.java b/extensions/sql/transfer-process-store-sql/src/main/java/org/eclipse/dataspaceconnector/sql/transferprocess/store/PostgresStatements.java similarity index 100% rename from extensions/sql/transfer-process-store/src/main/java/org/eclipse/dataspaceconnector/sql/transferprocess/store/PostgresStatements.java rename to extensions/sql/transfer-process-store-sql/src/main/java/org/eclipse/dataspaceconnector/sql/transferprocess/store/PostgresStatements.java diff --git a/extensions/sql/transfer-process-store/src/main/java/org/eclipse/dataspaceconnector/sql/transferprocess/store/SqlTransferProcessStore.java b/extensions/sql/transfer-process-store-sql/src/main/java/org/eclipse/dataspaceconnector/sql/transferprocess/store/SqlTransferProcessStore.java similarity index 100% rename from extensions/sql/transfer-process-store/src/main/java/org/eclipse/dataspaceconnector/sql/transferprocess/store/SqlTransferProcessStore.java rename to extensions/sql/transfer-process-store-sql/src/main/java/org/eclipse/dataspaceconnector/sql/transferprocess/store/SqlTransferProcessStore.java diff --git a/extensions/sql/transfer-process-store/src/main/java/org/eclipse/dataspaceconnector/sql/transferprocess/store/TransferProcessStoreStatements.java b/extensions/sql/transfer-process-store-sql/src/main/java/org/eclipse/dataspaceconnector/sql/transferprocess/store/TransferProcessStoreStatements.java similarity index 100% rename from extensions/sql/transfer-process-store/src/main/java/org/eclipse/dataspaceconnector/sql/transferprocess/store/TransferProcessStoreStatements.java rename to extensions/sql/transfer-process-store-sql/src/main/java/org/eclipse/dataspaceconnector/sql/transferprocess/store/TransferProcessStoreStatements.java diff --git a/extensions/sql/transfer-process-store/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension b/extensions/sql/transfer-process-store-sql/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension similarity index 100% rename from extensions/sql/transfer-process-store/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension rename to extensions/sql/transfer-process-store-sql/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension diff --git a/extensions/sql/transfer-process-store/src/test/java/org/eclipse/dataspaceconnector/sql/transferprocess/store/SqlTransferProcessStoreTest.java b/extensions/sql/transfer-process-store-sql/src/test/java/org/eclipse/dataspaceconnector/sql/transferprocess/store/SqlTransferProcessStoreTest.java similarity index 100% rename from extensions/sql/transfer-process-store/src/test/java/org/eclipse/dataspaceconnector/sql/transferprocess/store/SqlTransferProcessStoreTest.java rename to extensions/sql/transfer-process-store-sql/src/test/java/org/eclipse/dataspaceconnector/sql/transferprocess/store/SqlTransferProcessStoreTest.java diff --git a/extensions/sql/transfer-process-store/src/test/java/org/eclipse/dataspaceconnector/sql/transferprocess/store/TestFunctions.java b/extensions/sql/transfer-process-store-sql/src/test/java/org/eclipse/dataspaceconnector/sql/transferprocess/store/TestFunctions.java similarity index 100% rename from extensions/sql/transfer-process-store/src/test/java/org/eclipse/dataspaceconnector/sql/transferprocess/store/TestFunctions.java rename to extensions/sql/transfer-process-store-sql/src/test/java/org/eclipse/dataspaceconnector/sql/transferprocess/store/TestFunctions.java diff --git a/extensions/sql/transfer-process-store/src/test/resources/schema.sql b/extensions/sql/transfer-process-store-sql/src/test/resources/schema.sql similarity index 100% rename from extensions/sql/transfer-process-store/src/test/resources/schema.sql rename to extensions/sql/transfer-process-store-sql/src/test/resources/schema.sql diff --git a/settings.gradle.kts b/settings.gradle.kts index a17a465d3eb..9be2c143ffd 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -43,10 +43,6 @@ include(":data-protocols:ids:ids-transform-v1") include(":data-protocols:ids:ids-token-validation") include(":data-protocols:ids:ids-api-configuration") -include("extensions:sql:contract-definition:store") -include("extensions:sql:contract-negotiation-store") -include("extensions:sql:policy:store") - // modules for technology- or cloud-provider extensions include(":extensions:aws") include(":extensions:api:control") @@ -143,14 +139,18 @@ include(":extensions:azure:data-plane:common") include(":extensions:azure:data-plane:storage") include(":extensions:data-plane:data-plane-api") include(":extensions:data-plane:integration-tests") -include(":extensions:sql:common") -include(":extensions:sql:lease") -include(":extensions:sql:pool:apache-commons-pool") -include(":extensions:sql:asset:index") -include(":extensions:sql:transfer-process-store") include(":extensions:http-receiver") include(":extensions:http-provisioner") +include(":extensions:sql:asset-index-sql") +include(":extensions:sql:common-sql") +include(":extensions:sql:contract-definition-store-sql") +include(":extensions:sql:contract-negotiation-store-sql") +include(":extensions:sql:lease-sql") +include(":extensions:sql:policy-store-sql") +include(":extensions:sql:pool:apache-commons-pool-sql") +include(":extensions:sql:transfer-process-store-sql") + // modules for launchers, i.e. runnable compositions of the app include(":launchers:basic") include(":launchers:junit") From 5a265bc16e4f1b2f244cf59c8cc84cf41626b351 Mon Sep 17 00:00:00 2001 From: ndr_brt Date: Wed, 20 Apr 2022 08:48:53 +0200 Subject: [PATCH 2/2] PR remarks --- extensions/sql/transfer-process-store-sql/{doc => docs}/README.md | 0 .../sql/transfer-process-store-sql/{doc => docs}/ddl_postgres.sql | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename extensions/sql/transfer-process-store-sql/{doc => docs}/README.md (100%) rename extensions/sql/transfer-process-store-sql/{doc => docs}/ddl_postgres.sql (100%) diff --git a/extensions/sql/transfer-process-store-sql/doc/README.md b/extensions/sql/transfer-process-store-sql/docs/README.md similarity index 100% rename from extensions/sql/transfer-process-store-sql/doc/README.md rename to extensions/sql/transfer-process-store-sql/docs/README.md diff --git a/extensions/sql/transfer-process-store-sql/doc/ddl_postgres.sql b/extensions/sql/transfer-process-store-sql/docs/ddl_postgres.sql similarity index 100% rename from extensions/sql/transfer-process-store-sql/doc/ddl_postgres.sql rename to extensions/sql/transfer-process-store-sql/docs/ddl_postgres.sql