diff --git a/core/common/boot/src/test/java/org/eclipse/edc/boot/system/DefaultServiceExtensionContextTest.java b/core/common/boot/src/test/java/org/eclipse/edc/boot/system/DefaultServiceExtensionContextTest.java index e3666272920..a12f4b703f1 100644 --- a/core/common/boot/src/test/java/org/eclipse/edc/boot/system/DefaultServiceExtensionContextTest.java +++ b/core/common/boot/src/test/java/org/eclipse/edc/boot/system/DefaultServiceExtensionContextTest.java @@ -17,10 +17,8 @@ import org.eclipse.edc.spi.EdcException; import org.eclipse.edc.spi.monitor.Monitor; -import org.eclipse.edc.spi.system.ConfigurationExtension; import org.eclipse.edc.spi.system.configuration.Config; import org.eclipse.edc.spi.system.configuration.ConfigFactory; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -42,15 +40,10 @@ class DefaultServiceExtensionContextTest { - private final ConfigurationExtension configuration = mock(); private final Monitor monitor = mock(); private final Config config = mock(); - private DefaultServiceExtensionContext context; - @BeforeEach - void setUp() { - context = new DefaultServiceExtensionContext(monitor, config); - } + private DefaultServiceExtensionContext context = new DefaultServiceExtensionContext(monitor, config); @Test void get_setting_returns_the_setting_from_the_configuration_extension() { @@ -90,8 +83,8 @@ void shouldReturnRandomUuid_whenNotConfigured() { context.initialize(); var runtimeId = context.getRuntimeId(); - assertThat(UUID.fromString(runtimeId)).isNotNull(); + assertThat(UUID.fromString(runtimeId)).isNotNull(); verify(monitor, times(1)).warning(and(isA(String.class), argThat(message -> !message.contains(RUNTIME_ID)))); } @@ -137,7 +130,7 @@ void shouldUseConfiguredValue_whenBothAreConfigured() { var componentId = context.getComponentId(); var runtimeId = context.getRuntimeId(); - assertThat(UUID.fromString(runtimeId)).isNotNull(); + assertThat(runtimeId).isEqualTo("runtime-id"); assertThat(componentId).isEqualTo("component-id"); verify(monitor).warning(and(isA(String.class), argThat(message -> !message.contains(RUNTIME_ID)))); } diff --git a/core/common/lib/sql-lib/build.gradle.kts b/core/common/lib/sql-lib/build.gradle.kts new file mode 100644 index 00000000000..4d1c00cada3 --- /dev/null +++ b/core/common/lib/sql-lib/build.gradle.kts @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2024 Cofinity-X + * + * This program and the accompanying materials are made available under the + * terms of the Apache License, Version 2.0 which is available at + * https://www.apache.org/licenses/LICENSE-2.0 + * + * SPDX-License-Identifier: Apache-2.0 + * + * Contributors: + * Cofinity-X - initial API and implementation + * + */ + +plugins { + `java-library` +} + +dependencies { + api(project(":spi:common:core-spi")) + implementation(project(":core:common:lib:util-lib")) + + testImplementation(project(":core:common:junit")) + testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures"))) +} + + diff --git a/extensions/common/sql/sql-core/src/main/java/org/eclipse/edc/sql/ArgumentHandler.java b/core/common/lib/sql-lib/src/main/java/org/eclipse/edc/sql/ArgumentHandler.java similarity index 100% rename from extensions/common/sql/sql-core/src/main/java/org/eclipse/edc/sql/ArgumentHandler.java rename to core/common/lib/sql-lib/src/main/java/org/eclipse/edc/sql/ArgumentHandler.java diff --git a/extensions/common/sql/sql-core/src/main/java/org/eclipse/edc/sql/ArgumentHandlers.java b/core/common/lib/sql-lib/src/main/java/org/eclipse/edc/sql/ArgumentHandlers.java similarity index 100% rename from extensions/common/sql/sql-core/src/main/java/org/eclipse/edc/sql/ArgumentHandlers.java rename to core/common/lib/sql-lib/src/main/java/org/eclipse/edc/sql/ArgumentHandlers.java diff --git a/extensions/common/sql/sql-core/src/main/java/org/eclipse/edc/sql/ConnectionFactory.java b/core/common/lib/sql-lib/src/main/java/org/eclipse/edc/sql/ConnectionFactory.java similarity index 100% rename from extensions/common/sql/sql-core/src/main/java/org/eclipse/edc/sql/ConnectionFactory.java rename to core/common/lib/sql-lib/src/main/java/org/eclipse/edc/sql/ConnectionFactory.java diff --git a/extensions/common/sql/sql-core/src/main/java/org/eclipse/edc/sql/DoorKeeper.java b/core/common/lib/sql-lib/src/main/java/org/eclipse/edc/sql/DoorKeeper.java similarity index 100% rename from extensions/common/sql/sql-core/src/main/java/org/eclipse/edc/sql/DoorKeeper.java rename to core/common/lib/sql-lib/src/main/java/org/eclipse/edc/sql/DoorKeeper.java diff --git a/extensions/common/sql/sql-core/src/main/java/org/eclipse/edc/sql/DriverManagerConnectionFactory.java b/core/common/lib/sql-lib/src/main/java/org/eclipse/edc/sql/DriverManagerConnectionFactory.java similarity index 100% rename from extensions/common/sql/sql-core/src/main/java/org/eclipse/edc/sql/DriverManagerConnectionFactory.java rename to core/common/lib/sql-lib/src/main/java/org/eclipse/edc/sql/DriverManagerConnectionFactory.java diff --git a/extensions/common/sql/sql-core/src/main/java/org/eclipse/edc/sql/QueryExecutor.java b/core/common/lib/sql-lib/src/main/java/org/eclipse/edc/sql/QueryExecutor.java similarity index 100% rename from extensions/common/sql/sql-core/src/main/java/org/eclipse/edc/sql/QueryExecutor.java rename to core/common/lib/sql-lib/src/main/java/org/eclipse/edc/sql/QueryExecutor.java diff --git a/extensions/common/sql/sql-core/src/main/java/org/eclipse/edc/sql/ResultSetMapper.java b/core/common/lib/sql-lib/src/main/java/org/eclipse/edc/sql/ResultSetMapper.java similarity index 100% rename from extensions/common/sql/sql-core/src/main/java/org/eclipse/edc/sql/ResultSetMapper.java rename to core/common/lib/sql-lib/src/main/java/org/eclipse/edc/sql/ResultSetMapper.java diff --git a/extensions/common/sql/sql-core/src/main/java/org/eclipse/edc/sql/SqlQueryExecutor.java b/core/common/lib/sql-lib/src/main/java/org/eclipse/edc/sql/SqlQueryExecutor.java similarity index 100% rename from extensions/common/sql/sql-core/src/main/java/org/eclipse/edc/sql/SqlQueryExecutor.java rename to core/common/lib/sql-lib/src/main/java/org/eclipse/edc/sql/SqlQueryExecutor.java diff --git a/extensions/common/sql/sql-core/src/main/java/org/eclipse/edc/sql/SqlQueryExecutorConfiguration.java b/core/common/lib/sql-lib/src/main/java/org/eclipse/edc/sql/SqlQueryExecutorConfiguration.java similarity index 90% rename from extensions/common/sql/sql-core/src/main/java/org/eclipse/edc/sql/SqlQueryExecutorConfiguration.java rename to core/common/lib/sql-lib/src/main/java/org/eclipse/edc/sql/SqlQueryExecutorConfiguration.java index f26d5c88ba3..21959adedb1 100644 --- a/extensions/common/sql/sql-core/src/main/java/org/eclipse/edc/sql/SqlQueryExecutorConfiguration.java +++ b/core/common/lib/sql-lib/src/main/java/org/eclipse/edc/sql/SqlQueryExecutorConfiguration.java @@ -14,13 +14,13 @@ package org.eclipse.edc.sql; -import static org.eclipse.edc.sql.SqlCoreExtension.DEFAULT_EDC_SQL_FETCH_SIZE; - /** * Configuration class for {@link SqlQueryExecutor} */ public record SqlQueryExecutorConfiguration(int fetchSize) { + public static final String DEFAULT_EDC_SQL_FETCH_SIZE = "5000"; + public static SqlQueryExecutorConfiguration ofDefaults() { return new SqlQueryExecutorConfiguration(Integer.parseInt(DEFAULT_EDC_SQL_FETCH_SIZE)); } diff --git a/extensions/common/sql/sql-core/src/main/java/org/eclipse/edc/sql/datasource/ConnectionFactoryDataSource.java b/core/common/lib/sql-lib/src/main/java/org/eclipse/edc/sql/datasource/ConnectionFactoryDataSource.java similarity index 100% rename from extensions/common/sql/sql-core/src/main/java/org/eclipse/edc/sql/datasource/ConnectionFactoryDataSource.java rename to core/common/lib/sql-lib/src/main/java/org/eclipse/edc/sql/datasource/ConnectionFactoryDataSource.java diff --git a/extensions/common/sql/sql-core/src/main/java/org/eclipse/edc/sql/datasource/ConnectionPoolDataSource.java b/core/common/lib/sql-lib/src/main/java/org/eclipse/edc/sql/datasource/ConnectionPoolDataSource.java similarity index 100% rename from extensions/common/sql/sql-core/src/main/java/org/eclipse/edc/sql/datasource/ConnectionPoolDataSource.java rename to core/common/lib/sql-lib/src/main/java/org/eclipse/edc/sql/datasource/ConnectionPoolDataSource.java diff --git a/extensions/common/sql/sql-core/src/main/java/org/eclipse/edc/sql/datasource/PooledDataSourceConnection.java b/core/common/lib/sql-lib/src/main/java/org/eclipse/edc/sql/datasource/PooledDataSourceConnection.java similarity index 100% rename from extensions/common/sql/sql-core/src/main/java/org/eclipse/edc/sql/datasource/PooledDataSourceConnection.java rename to core/common/lib/sql-lib/src/main/java/org/eclipse/edc/sql/datasource/PooledDataSourceConnection.java diff --git a/extensions/common/sql/sql-core/src/main/java/org/eclipse/edc/sql/pool/ConnectionPool.java b/core/common/lib/sql-lib/src/main/java/org/eclipse/edc/sql/pool/ConnectionPool.java similarity index 100% rename from extensions/common/sql/sql-core/src/main/java/org/eclipse/edc/sql/pool/ConnectionPool.java rename to core/common/lib/sql-lib/src/main/java/org/eclipse/edc/sql/pool/ConnectionPool.java diff --git a/extensions/common/sql/sql-core/src/test/java/org/eclipse/edc/sql/DoorKeeperTest.java b/core/common/lib/sql-lib/src/test/java/org/eclipse/edc/sql/DoorKeeperTest.java similarity index 100% rename from extensions/common/sql/sql-core/src/test/java/org/eclipse/edc/sql/DoorKeeperTest.java rename to core/common/lib/sql-lib/src/test/java/org/eclipse/edc/sql/DoorKeeperTest.java diff --git a/extensions/common/sql/sql-core/src/test/java/org/eclipse/edc/sql/SqlQueryExecutorIntegrationTest.java b/core/common/lib/sql-lib/src/test/java/org/eclipse/edc/sql/SqlQueryExecutorIntegrationTest.java similarity index 100% rename from extensions/common/sql/sql-core/src/test/java/org/eclipse/edc/sql/SqlQueryExecutorIntegrationTest.java rename to core/common/lib/sql-lib/src/test/java/org/eclipse/edc/sql/SqlQueryExecutorIntegrationTest.java diff --git a/extensions/common/sql/sql-core/src/test/java/org/eclipse/edc/sql/SqlQueryExecutorTest.java b/core/common/lib/sql-lib/src/test/java/org/eclipse/edc/sql/SqlQueryExecutorTest.java similarity index 100% rename from extensions/common/sql/sql-core/src/test/java/org/eclipse/edc/sql/SqlQueryExecutorTest.java rename to core/common/lib/sql-lib/src/test/java/org/eclipse/edc/sql/SqlQueryExecutorTest.java diff --git a/extensions/common/sql/sql-core/src/test/java/org/eclipse/edc/sql/datasource/ConnectionFactoryDataSourceTest.java b/core/common/lib/sql-lib/src/test/java/org/eclipse/edc/sql/datasource/ConnectionFactoryDataSourceTest.java similarity index 100% rename from extensions/common/sql/sql-core/src/test/java/org/eclipse/edc/sql/datasource/ConnectionFactoryDataSourceTest.java rename to core/common/lib/sql-lib/src/test/java/org/eclipse/edc/sql/datasource/ConnectionFactoryDataSourceTest.java diff --git a/extensions/common/sql/sql-core/src/test/java/org/eclipse/edc/sql/datasource/ConnectionPoolDataSourceTest.java b/core/common/lib/sql-lib/src/test/java/org/eclipse/edc/sql/datasource/ConnectionPoolDataSourceTest.java similarity index 100% rename from extensions/common/sql/sql-core/src/test/java/org/eclipse/edc/sql/datasource/ConnectionPoolDataSourceTest.java rename to core/common/lib/sql-lib/src/test/java/org/eclipse/edc/sql/datasource/ConnectionPoolDataSourceTest.java diff --git a/extensions/common/sql/sql-core/src/test/java/org/eclipse/edc/sql/datasource/PooledDataSourceConnectionTest.java b/core/common/lib/sql-lib/src/test/java/org/eclipse/edc/sql/datasource/PooledDataSourceConnectionTest.java similarity index 100% rename from extensions/common/sql/sql-core/src/test/java/org/eclipse/edc/sql/datasource/PooledDataSourceConnectionTest.java rename to core/common/lib/sql-lib/src/test/java/org/eclipse/edc/sql/datasource/PooledDataSourceConnectionTest.java diff --git a/extensions/common/sql/sql-bootstrapper/build.gradle.kts b/extensions/common/sql/sql-bootstrapper/build.gradle.kts index e3b44eccb87..7bf1b80a19e 100644 --- a/extensions/common/sql/sql-bootstrapper/build.gradle.kts +++ b/extensions/common/sql/sql-bootstrapper/build.gradle.kts @@ -22,7 +22,7 @@ dependencies { api(project(":spi:common:core-spi")) api(project(":spi:common:transaction-spi")) implementation(project(":spi:common:transaction-datasource-spi")) - implementation(project(":extensions:common:sql:sql-core")) // SqlQueryExecutor + implementation(project(":core:common:lib:sql-lib")) // testImplementation(project(":core:common:junit")) testImplementation(libs.assertj) diff --git a/extensions/common/sql/sql-bootstrapper/src/test/java/org/eclipse/edc/sql/bootstrapper/SqlSchemaBootstrapperExtensionTest.java b/extensions/common/sql/sql-bootstrapper/src/test/java/org/eclipse/edc/sql/bootstrapper/SqlSchemaBootstrapperExtensionTest.java index a0dc78cbd53..fa0bf14e31e 100644 --- a/extensions/common/sql/sql-bootstrapper/src/test/java/org/eclipse/edc/sql/bootstrapper/SqlSchemaBootstrapperExtensionTest.java +++ b/extensions/common/sql/sql-bootstrapper/src/test/java/org/eclipse/edc/sql/bootstrapper/SqlSchemaBootstrapperExtensionTest.java @@ -14,20 +14,21 @@ package org.eclipse.edc.sql.bootstrapper; +import org.eclipse.edc.boot.system.injection.ObjectFactory; import org.eclipse.edc.junit.annotations.ComponentTest; import org.eclipse.edc.junit.extensions.DependencyInjectionExtension; import org.eclipse.edc.spi.result.Result; import org.eclipse.edc.spi.system.ServiceExtensionContext; -import org.eclipse.edc.spi.system.configuration.Config; +import org.eclipse.edc.spi.system.configuration.ConfigFactory; import org.eclipse.edc.transaction.spi.TransactionContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import java.util.Map; + import static org.assertj.core.api.Assertions.assertThatNoException; import static org.eclipse.edc.sql.bootstrapper.SqlSchemaBootstrapperExtension.SCHEMA_AUTOCREATE_PROPERTY; -import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.isA; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -46,20 +47,20 @@ void setUp(ServiceExtensionContext context) { } @Test - void prepare_autocreateDisabled(SqlSchemaBootstrapperExtension extension, ServiceExtensionContext context) { - var config = mock(Config.class); - when(config.getBoolean(eq("edc.sql.schema.autocreate"), anyBoolean())).thenReturn(false); - when(context.getConfig()).thenReturn(config); + void shouldNotCreateSchema_whenSettingIsDisabled(ObjectFactory objectFactory, ServiceExtensionContext context) { + var extension = objectFactory.constructInstance(SqlSchemaBootstrapperExtension.class); + when(context.getConfig()).thenReturn(ConfigFactory.fromMap(Map.of(SCHEMA_AUTOCREATE_PROPERTY, "false"))); + extension.initialize(context); extension.prepare(); + verifyNoInteractions(transactionContext); } @Test - void prepare(SqlSchemaBootstrapperExtension extension, ServiceExtensionContext context) { - var config = mock(Config.class); - when(config.getBoolean(eq(SCHEMA_AUTOCREATE_PROPERTY), anyBoolean())).thenReturn(true); - when(context.getConfig()).thenReturn(config); + void shouldCreateSchema_whenSettingIsEnabled(ServiceExtensionContext context, ObjectFactory objectFactory) { + when(context.getConfig()).thenReturn(ConfigFactory.fromMap(Map.of(SCHEMA_AUTOCREATE_PROPERTY, "true"))); + var extension = objectFactory.constructInstance(SqlSchemaBootstrapperExtension.class); when(transactionContext.execute(isA(TransactionContext.ResultTransactionBlock.class))) .thenReturn(Result.success("foobar")); @@ -69,4 +70,4 @@ void prepare(SqlSchemaBootstrapperExtension extension, ServiceExtensionContext c verify(transactionContext).execute(isA(TransactionContext.ResultTransactionBlock.class)); } -} \ No newline at end of file +} diff --git a/extensions/common/sql/sql-core/build.gradle.kts b/extensions/common/sql/sql-core/build.gradle.kts index 5bad4da0335..58f951de95f 100644 --- a/extensions/common/sql/sql-core/build.gradle.kts +++ b/extensions/common/sql/sql-core/build.gradle.kts @@ -22,20 +22,12 @@ plugins { dependencies { api(project(":spi:common:core-spi")) api(project(":spi:common:transaction-spi")) + api(project(":spi:common:transaction-datasource-spi")) + implementation(project(":core:common:lib:sql-lib")) implementation(project(":core:common:lib:util-lib")) - implementation(project(":spi:common:transaction-datasource-spi")) - testImplementation(project(":core:common:junit")) - testFixturesImplementation(project(":spi:common:transaction-datasource-spi")) - testFixturesImplementation(project(":core:common:junit")) - testFixturesImplementation(libs.junit.jupiter.api) - testFixturesImplementation(libs.mockito.core) - testFixturesImplementation(libs.postgres) - - testFixturesImplementation(libs.testcontainers.junit) - testFixturesImplementation(libs.testcontainers.postgres) - + testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures"))) } diff --git a/extensions/common/sql/sql-core/src/main/java/org/eclipse/edc/sql/SqlCoreExtension.java b/extensions/common/sql/sql-core/src/main/java/org/eclipse/edc/sql/SqlCoreExtension.java index ec40c4ceff6..2438dc2ae32 100644 --- a/extensions/common/sql/sql-core/src/main/java/org/eclipse/edc/sql/SqlCoreExtension.java +++ b/extensions/common/sql/sql-core/src/main/java/org/eclipse/edc/sql/SqlCoreExtension.java @@ -24,12 +24,13 @@ import org.eclipse.edc.transaction.spi.NoopTransactionContext; import org.eclipse.edc.transaction.spi.TransactionContext; +import static org.eclipse.edc.sql.SqlQueryExecutorConfiguration.DEFAULT_EDC_SQL_FETCH_SIZE; + @Extension(value = SqlCoreExtension.NAME) public class SqlCoreExtension implements ServiceExtension { public static final String NAME = "SQL Core"; - public static final String DEFAULT_EDC_SQL_FETCH_SIZE = "5000"; @Setting(description = "Fetch size value used in SQL queries", defaultValue = DEFAULT_EDC_SQL_FETCH_SIZE, key = "edc.sql.fetch.size") private int fetchSize; diff --git a/extensions/common/sql/sql-lease/build.gradle.kts b/extensions/common/sql/sql-lease/build.gradle.kts index 1c80b56b738..51da2eb8fcc 100644 --- a/extensions/common/sql/sql-lease/build.gradle.kts +++ b/extensions/common/sql/sql-lease/build.gradle.kts @@ -22,16 +22,16 @@ dependencies { api(project(":spi:common:core-spi")) api(project(":spi:common:transaction-spi")) implementation(project(":spi:common:transaction-datasource-spi")) - implementation(project(":extensions:common:sql:sql-core")) + implementation(project(":core:common:lib:sql-lib")) testImplementation(project(":core:common:junit")) testImplementation(project(":extensions:common:transaction:transaction-local")) testImplementation(testFixtures(project(":extensions:common:sql:sql-lease"))) - testImplementation(testFixtures(project(":extensions:common:sql:sql-core"))) + testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures"))) testImplementation(libs.postgres) testImplementation(libs.assertj) - testFixturesImplementation(project(":extensions:common:sql:sql-core")) + testFixturesImplementation(project(":core:common:lib:sql-lib")) // TODO: these fixtures could finish in sql-testfixtures module } diff --git a/extensions/common/sql/sql-pool/sql-pool-apache-commons/build.gradle.kts b/extensions/common/sql/sql-pool/sql-pool-apache-commons/build.gradle.kts index 42f4fbffdb7..9a359f4e7fd 100644 --- a/extensions/common/sql/sql-pool/sql-pool-apache-commons/build.gradle.kts +++ b/extensions/common/sql/sql-pool/sql-pool-apache-commons/build.gradle.kts @@ -21,7 +21,8 @@ plugins { dependencies { api(project(":spi:common:transaction-datasource-spi")) - api(project(":extensions:common:sql:sql-core")) + + implementation(project(":core:common:lib:sql-lib")) implementation(libs.apache.commons.pool) diff --git a/extensions/common/sql/sql-test-fixtures/build.gradle.kts b/extensions/common/sql/sql-test-fixtures/build.gradle.kts new file mode 100644 index 00000000000..22618ff4f9f --- /dev/null +++ b/extensions/common/sql/sql-test-fixtures/build.gradle.kts @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2024 Cofinity-X + * + * This program and the accompanying materials are made available under the + * terms of the Apache License, Version 2.0 which is available at + * https://www.apache.org/licenses/LICENSE-2.0 + * + * SPDX-License-Identifier: Apache-2.0 + * + * Contributors: + * Cofinity-X - Initial build file + * + */ + +plugins { + `java-library` + `java-test-fixtures` +} + +dependencies { + testFixturesImplementation(project(":spi:common:transaction-datasource-spi")) + testFixturesImplementation(project(":spi:common:transaction-spi")) + testFixturesImplementation(project(":core:common:junit")) + testFixturesImplementation(project(":core:common:lib:sql-lib")) + + testFixturesImplementation(libs.junit.jupiter.api) + testFixturesImplementation(libs.mockito.core) + testFixturesImplementation(libs.postgres) + testFixturesImplementation(libs.testcontainers.junit) + testFixturesImplementation(libs.testcontainers.postgres) +} + + diff --git a/extensions/common/sql/sql-core/src/testFixtures/java/org/eclipse/edc/sql/testfixtures/PostgresqlEndToEndInstance.java b/extensions/common/sql/sql-test-fixtures/src/testFixtures/java/org/eclipse/edc/sql/testfixtures/PostgresqlEndToEndInstance.java similarity index 100% rename from extensions/common/sql/sql-core/src/testFixtures/java/org/eclipse/edc/sql/testfixtures/PostgresqlEndToEndInstance.java rename to extensions/common/sql/sql-test-fixtures/src/testFixtures/java/org/eclipse/edc/sql/testfixtures/PostgresqlEndToEndInstance.java diff --git a/extensions/common/sql/sql-core/src/testFixtures/java/org/eclipse/edc/sql/testfixtures/PostgresqlLocalInstance.java b/extensions/common/sql/sql-test-fixtures/src/testFixtures/java/org/eclipse/edc/sql/testfixtures/PostgresqlLocalInstance.java similarity index 100% rename from extensions/common/sql/sql-core/src/testFixtures/java/org/eclipse/edc/sql/testfixtures/PostgresqlLocalInstance.java rename to extensions/common/sql/sql-test-fixtures/src/testFixtures/java/org/eclipse/edc/sql/testfixtures/PostgresqlLocalInstance.java diff --git a/extensions/common/sql/sql-core/src/testFixtures/java/org/eclipse/edc/sql/testfixtures/PostgresqlStoreSetupExtension.java b/extensions/common/sql/sql-test-fixtures/src/testFixtures/java/org/eclipse/edc/sql/testfixtures/PostgresqlStoreSetupExtension.java similarity index 100% rename from extensions/common/sql/sql-core/src/testFixtures/java/org/eclipse/edc/sql/testfixtures/PostgresqlStoreSetupExtension.java rename to extensions/common/sql/sql-test-fixtures/src/testFixtures/java/org/eclipse/edc/sql/testfixtures/PostgresqlStoreSetupExtension.java diff --git a/extensions/common/store/sql/edr-index-sql/build.gradle.kts b/extensions/common/store/sql/edr-index-sql/build.gradle.kts index 37ea97af1fe..1b4ca935647 100644 --- a/extensions/common/store/sql/edr-index-sql/build.gradle.kts +++ b/extensions/common/store/sql/edr-index-sql/build.gradle.kts @@ -20,12 +20,12 @@ dependencies { api(project(":spi:common:core-spi")) api(project(":spi:common:transaction-spi")) - implementation(project(":extensions:common:sql:sql-core")) + implementation(project(":core:common:lib:sql-lib")) implementation(project(":extensions:common:sql:sql-bootstrapper")) implementation(project(":spi:common:edr-store-spi")) implementation(project(":spi:common:transaction-datasource-spi")) testImplementation(project(":core:common:junit")) - testImplementation(testFixtures(project(":extensions:common:sql:sql-core"))) + testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures"))) testImplementation(testFixtures(project(":spi:common:edr-store-spi"))) -} \ No newline at end of file +} diff --git a/extensions/common/store/sql/jti-validation-store-sql/build.gradle.kts b/extensions/common/store/sql/jti-validation-store-sql/build.gradle.kts index 1649ed8187a..8ce9adb8f68 100644 --- a/extensions/common/store/sql/jti-validation-store-sql/build.gradle.kts +++ b/extensions/common/store/sql/jti-validation-store-sql/build.gradle.kts @@ -20,11 +20,11 @@ dependencies { api(project(":spi:common:jwt-spi")) api(project(":spi:common:transaction-spi")) - implementation(project(":extensions:common:sql:sql-core")) + implementation(project(":core:common:lib:sql-lib")) implementation(project(":extensions:common:sql:sql-bootstrapper")) implementation(project(":spi:common:transaction-datasource-spi")) testImplementation(project(":core:common:junit")) - testImplementation(testFixtures(project(":extensions:common:sql:sql-core"))) + testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures"))) testImplementation(testFixtures(project(":spi:common:jwt-spi"))) -} \ No newline at end of file +} diff --git a/extensions/common/store/sql/sts-client-store-sql/build.gradle.kts b/extensions/common/store/sql/sts-client-store-sql/build.gradle.kts index b65fd58bb00..a22d1e52859 100644 --- a/extensions/common/store/sql/sts-client-store-sql/build.gradle.kts +++ b/extensions/common/store/sql/sts-client-store-sql/build.gradle.kts @@ -20,12 +20,12 @@ dependencies { api(project(":spi:common:core-spi")) api(project(":spi:common:transaction-spi")) - implementation(project(":extensions:common:sql:sql-core")) + implementation(project(":core:common:lib:sql-lib")) implementation(project(":extensions:common:sql:sql-bootstrapper")) implementation(project(":spi:common:identity-trust-sts-spi")) implementation(project(":spi:common:transaction-datasource-spi")) testImplementation(project(":core:common:junit")) - testImplementation(testFixtures(project(":extensions:common:sql:sql-core"))) + testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures"))) testImplementation(testFixtures(project(":spi:common:identity-trust-sts-spi"))) -} \ No newline at end of file +} diff --git a/extensions/common/transaction/transaction-local/build.gradle.kts b/extensions/common/transaction/transaction-local/build.gradle.kts index 75d08644a36..4cc6a6b7704 100644 --- a/extensions/common/transaction/transaction-local/build.gradle.kts +++ b/extensions/common/transaction/transaction-local/build.gradle.kts @@ -24,7 +24,7 @@ dependencies { testImplementation(project(":tests:junit-base")); - testImplementation(testFixtures(project(":extensions:common:sql:sql-core"))) + testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures"))) } 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 index 6fbf99ff276..1730aa23ab4 100644 --- a/extensions/control-plane/store/sql/asset-index-sql/build.gradle.kts +++ b/extensions/control-plane/store/sql/asset-index-sql/build.gradle.kts @@ -23,7 +23,7 @@ dependencies { api(project(":spi:control-plane:asset-spi")) implementation(project(":spi:common:transaction-datasource-spi")) - implementation(project(":extensions:common:sql:sql-core")) + implementation(project(":core:common:lib:sql-lib")) implementation(project(":extensions:common:sql:sql-bootstrapper")) implementation(project(":core:common:lib:util-lib")) @@ -32,7 +32,7 @@ dependencies { testImplementation(project(":spi:common:policy-model")) testImplementation(libs.assertj) testImplementation(testFixtures(project(":spi:control-plane:asset-spi"))) - testImplementation(testFixtures(project(":extensions:common:sql:sql-core"))) + testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures"))) testImplementation(libs.postgres) testImplementation(libs.testcontainers.junit) diff --git a/extensions/control-plane/store/sql/contract-definition-store-sql/build.gradle.kts b/extensions/control-plane/store/sql/contract-definition-store-sql/build.gradle.kts index d467c8da676..8b359e625be 100644 --- a/extensions/control-plane/store/sql/contract-definition-store-sql/build.gradle.kts +++ b/extensions/control-plane/store/sql/contract-definition-store-sql/build.gradle.kts @@ -22,13 +22,13 @@ dependencies { api(project(":spi:control-plane:contract-spi")) api(project(":spi:common:transaction-spi")) implementation(project(":spi:common:transaction-datasource-spi")) - implementation(project(":extensions:common:sql:sql-core")) + implementation(project(":core:common:lib:sql-lib")) implementation(project(":extensions:common:sql:sql-bootstrapper")) testImplementation(project(":core:common:junit")) testImplementation(project(":spi:common:policy-model")) testImplementation(libs.assertj) - testImplementation(testFixtures(project(":extensions:common:sql:sql-core"))) + testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures"))) testImplementation(testFixtures(project(":spi:control-plane:contract-spi"))) testImplementation(libs.postgres) } diff --git a/extensions/control-plane/store/sql/contract-negotiation-store-sql/build.gradle.kts b/extensions/control-plane/store/sql/contract-negotiation-store-sql/build.gradle.kts index f940ceb420c..caaa36000da 100644 --- a/extensions/control-plane/store/sql/contract-negotiation-store-sql/build.gradle.kts +++ b/extensions/control-plane/store/sql/contract-negotiation-store-sql/build.gradle.kts @@ -22,7 +22,7 @@ dependencies { api(project(":spi:control-plane:contract-spi")) api(project(":spi:common:transaction-spi")) implementation(project(":spi:common:transaction-datasource-spi")) - implementation(project(":extensions:common:sql:sql-core")) + implementation(project(":core:common:lib:sql-lib")) implementation(project(":extensions:common:sql:sql-lease")) implementation(project(":extensions:common:sql:sql-bootstrapper")) @@ -31,7 +31,7 @@ dependencies { testImplementation(testFixtures(project(":extensions:common:sql:sql-lease"))) testImplementation(libs.assertj) testImplementation(testFixtures(project(":spi:control-plane:contract-spi"))) - testImplementation(testFixtures(project(":extensions:common:sql:sql-core"))) + testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures"))) testImplementation(libs.postgres) } diff --git a/extensions/control-plane/store/sql/control-plane-sql/build.gradle.kts b/extensions/control-plane/store/sql/control-plane-sql/build.gradle.kts index 7b59a818936..0798ff22c6d 100644 --- a/extensions/control-plane/store/sql/control-plane-sql/build.gradle.kts +++ b/extensions/control-plane/store/sql/control-plane-sql/build.gradle.kts @@ -30,7 +30,7 @@ dependencies { testImplementation(project(":core:control-plane:control-plane-catalog")) testImplementation(project(":core:control-plane:control-plane-contract")) testImplementation(project(":core:control-plane:control-plane-core")) - testImplementation(testFixtures(project(":extensions:common:sql:sql-core"))) + testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures"))) } diff --git a/extensions/control-plane/store/sql/policy-definition-store-sql/build.gradle.kts b/extensions/control-plane/store/sql/policy-definition-store-sql/build.gradle.kts index 2fb33da6292..65f1218bbc8 100644 --- a/extensions/control-plane/store/sql/policy-definition-store-sql/build.gradle.kts +++ b/extensions/control-plane/store/sql/policy-definition-store-sql/build.gradle.kts @@ -22,14 +22,14 @@ dependencies { api(project(":spi:control-plane:contract-spi")) api(project(":spi:common:transaction-spi")) implementation(project(":spi:common:transaction-datasource-spi")) - implementation(project(":extensions:common:sql:sql-core")) + implementation(project(":core:common:lib:sql-lib")) implementation(project(":extensions:common:sql:sql-bootstrapper")) testImplementation(project(":core:common:junit")) testImplementation(libs.postgres) testImplementation(testFixtures(project(":spi:control-plane:policy-spi"))) - testImplementation(testFixtures(project(":extensions:common:sql:sql-core"))) + testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures"))) } diff --git a/extensions/control-plane/store/sql/transfer-process-store-sql/build.gradle.kts b/extensions/control-plane/store/sql/transfer-process-store-sql/build.gradle.kts index 58ac60f0355..369d59961a2 100644 --- a/extensions/control-plane/store/sql/transfer-process-store-sql/build.gradle.kts +++ b/extensions/control-plane/store/sql/transfer-process-store-sql/build.gradle.kts @@ -23,7 +23,7 @@ dependencies { api(project(":spi:control-plane:transfer-spi")) api(project(":spi:common:transaction-spi")) implementation(project(":spi:common:transaction-datasource-spi")) - implementation(project(":extensions:common:sql:sql-core")) + implementation(project(":core:common:lib:sql-lib")) implementation(project(":extensions:common:sql:sql-lease")) implementation(project(":extensions:common:sql:sql-bootstrapper")) @@ -33,7 +33,7 @@ dependencies { testImplementation(libs.postgres) testImplementation(testFixtures(project(":spi:control-plane:transfer-spi"))) testImplementation(testFixtures(project(":extensions:common:sql:sql-lease"))) - testImplementation(testFixtures(project(":extensions:common:sql:sql-core"))) + testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures"))) } diff --git a/extensions/data-plane-selector/store/sql/data-plane-instance-store-sql/build.gradle.kts b/extensions/data-plane-selector/store/sql/data-plane-instance-store-sql/build.gradle.kts index 6c12010dd8d..39bfb4e898c 100644 --- a/extensions/data-plane-selector/store/sql/data-plane-instance-store-sql/build.gradle.kts +++ b/extensions/data-plane-selector/store/sql/data-plane-instance-store-sql/build.gradle.kts @@ -9,13 +9,13 @@ dependencies { api(project(":spi:data-plane-selector:data-plane-selector-spi")) implementation(project(":spi:common:transaction-datasource-spi")) - implementation(project(":extensions:common:sql:sql-core")) + implementation(project(":core:common:lib:sql-lib")) implementation(project(":extensions:common:sql:sql-lease")) implementation(project(":extensions:common:sql:sql-bootstrapper")) testImplementation(project(":core:common:junit")) testImplementation(testFixtures(project(":spi:data-plane-selector:data-plane-selector-spi"))) - testImplementation(testFixtures(project(":extensions:common:sql:sql-core"))) + testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures"))) testImplementation(testFixtures(project(":extensions:common:sql:sql-lease"))) } diff --git a/extensions/data-plane/store/sql/accesstokendata-store-sql/build.gradle.kts b/extensions/data-plane/store/sql/accesstokendata-store-sql/build.gradle.kts index b758e2ca9ae..eac9f3572b7 100644 --- a/extensions/data-plane/store/sql/accesstokendata-store-sql/build.gradle.kts +++ b/extensions/data-plane/store/sql/accesstokendata-store-sql/build.gradle.kts @@ -22,13 +22,13 @@ dependencies { api(project(":spi:data-plane:data-plane-spi")) implementation(project(":spi:common:transaction-datasource-spi")) - implementation(project(":extensions:common:sql:sql-core")) + implementation(project(":core:common:lib:sql-lib")) implementation(project(":extensions:common:sql:sql-bootstrapper")) testImplementation(project(":core:common:junit")) testImplementation(testFixtures(project(":spi:data-plane:data-plane-spi"))) testImplementation(testFixtures(project(":extensions:common:sql:sql-lease"))) - testImplementation(testFixtures(project(":extensions:common:sql:sql-core"))) + testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures"))) } diff --git a/extensions/data-plane/store/sql/data-plane-store-sql/build.gradle.kts b/extensions/data-plane/store/sql/data-plane-store-sql/build.gradle.kts index e2cf4277dc6..0ab9ba2cdda 100644 --- a/extensions/data-plane/store/sql/data-plane-store-sql/build.gradle.kts +++ b/extensions/data-plane/store/sql/data-plane-store-sql/build.gradle.kts @@ -8,14 +8,14 @@ dependencies { api(project(":spi:data-plane:data-plane-spi")) implementation(project(":spi:common:transaction-datasource-spi")) - implementation(project(":extensions:common:sql:sql-core")) + implementation(project(":core:common:lib:sql-lib")) implementation(project(":extensions:common:sql:sql-lease")) implementation(project(":extensions:common:sql:sql-bootstrapper")) testImplementation(project(":core:common:junit")) testImplementation(testFixtures(project(":spi:data-plane:data-plane-spi"))) testImplementation(testFixtures(project(":extensions:common:sql:sql-lease"))) - testImplementation(testFixtures(project(":extensions:common:sql:sql-core"))) + testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures"))) } diff --git a/extensions/policy-monitor/store/sql/policy-monitor-store-sql/build.gradle.kts b/extensions/policy-monitor/store/sql/policy-monitor-store-sql/build.gradle.kts index dc7d2b9c91a..ef1a965e2ef 100644 --- a/extensions/policy-monitor/store/sql/policy-monitor-store-sql/build.gradle.kts +++ b/extensions/policy-monitor/store/sql/policy-monitor-store-sql/build.gradle.kts @@ -22,14 +22,14 @@ dependencies { api(project(":spi:policy-monitor:policy-monitor-spi")) implementation(project(":spi:common:transaction-datasource-spi")) - implementation(project(":extensions:common:sql:sql-core")) + implementation(project(":core:common:lib:sql-lib")) implementation(project(":extensions:common:sql:sql-lease")) implementation(project(":extensions:common:sql:sql-bootstrapper")) testImplementation(project(":core:common:junit")) testImplementation(testFixtures(project(":spi:policy-monitor:policy-monitor-spi"))) testImplementation(testFixtures(project(":extensions:common:sql:sql-lease"))) - testImplementation(testFixtures(project(":extensions:common:sql:sql-core"))) + testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures"))) } diff --git a/settings.gradle.kts b/settings.gradle.kts index 0852091a239..f8e81ba97d8 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -48,20 +48,21 @@ include(":core:common:token-core") include(":core:common:edr-store-core") include(":core:common:lib:boot-lib") -include(":core:common:lib:policy-evaluator-lib") -include(":core:common:lib:policy-engine-lib") +include(":core:common:lib:crypto-common-lib") include(":core:common:lib:http-lib") +include(":core:common:lib:json-ld-lib") +include(":core:common:lib:json-lib") include(":core:common:lib:keys-lib") +include(":core:common:lib:policy-engine-lib") +include(":core:common:lib:policy-evaluator-lib") include(":core:common:lib:query-lib") +include(":core:common:lib:sql-lib") +include(":core:common:lib:state-machine-lib") include(":core:common:lib:store-lib") include(":core:common:lib:token-lib") -include(":core:common:lib:state-machine-lib") -include(":core:common:lib:crypto-common-lib") -include(":core:common:lib:json-lib") -include(":core:common:lib:json-ld-lib") include(":core:common:lib:transform-lib") -include(":core:common:lib:validator-lib") include(":core:common:lib:util-lib") +include(":core:common:lib:validator-lib") include(":core:control-plane:control-plane-catalog") include(":core:control-plane:control-plane-contract") @@ -154,6 +155,7 @@ include(":extensions:common:monitor:monitor-jdk-logger") include(":extensions:common:sql:sql-core") include(":extensions:common:sql:sql-lease") include(":extensions:common:sql:sql-bootstrapper") +include(":extensions:common:sql:sql-test-fixtures") include(":extensions:common:sql:sql-pool:sql-pool-apache-commons") include(":extensions:common:transaction") include(":extensions:common:transaction:transaction-atomikos") diff --git a/system-tests/e2e-dataplane-tests/tests/build.gradle.kts b/system-tests/e2e-dataplane-tests/tests/build.gradle.kts index 51a874984c2..adddd997af6 100644 --- a/system-tests/e2e-dataplane-tests/tests/build.gradle.kts +++ b/system-tests/e2e-dataplane-tests/tests/build.gradle.kts @@ -25,7 +25,7 @@ dependencies { testImplementation(project(":extensions:common:json-ld")) testImplementation(project(":extensions:data-plane:data-plane-signaling:data-plane-signaling-transform")) testImplementation(testFixtures(project(":extensions:control-plane:api:management-api:management-api-test-fixtures"))) - testImplementation(testFixtures(project(":extensions:common:sql:sql-core"))) + testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures"))) testImplementation(libs.restAssured) testImplementation(libs.assertj) @@ -35,7 +35,6 @@ dependencies { testImplementation(libs.mockserver.client) testImplementation(libs.testcontainers.postgres) - testCompileOnly(project(":dist:bom:dataplane-feature-sql-bom")) testCompileOnly(project(":system-tests:e2e-dataplane-tests:runtimes:data-plane")) } diff --git a/system-tests/e2e-dataplane-tests/tests/src/test/java/org/eclipse/edc/test/e2e/extension/PollingHttpExtension.java b/system-tests/e2e-dataplane-tests/tests/src/test/java/org/eclipse/edc/test/e2e/extension/PollingHttpExtension.java index c26c0e92d6d..9dc5b71dab5 100644 --- a/system-tests/e2e-dataplane-tests/tests/src/test/java/org/eclipse/edc/test/e2e/extension/PollingHttpExtension.java +++ b/system-tests/e2e-dataplane-tests/tests/src/test/java/org/eclipse/edc/test/e2e/extension/PollingHttpExtension.java @@ -45,7 +45,7 @@ */ public class PollingHttpExtension implements ServiceExtension { - @Inject + @Inject(required = false) private PipelineService pipelineService; @Inject @@ -53,7 +53,9 @@ public class PollingHttpExtension implements ServiceExtension { @Override public void initialize(ServiceExtensionContext context) { - pipelineService.registerFactory(new PollingHttpDataSourceFactory(edcHttpClient)); + if (pipelineService != null) { + pipelineService.registerFactory(new PollingHttpDataSourceFactory(edcHttpClient)); + } } private record PollingHttpDataSourceFactory(EdcHttpClient edcHttpClient) implements DataSourceFactory { diff --git a/system-tests/e2e-transfer-test/runner/build.gradle.kts b/system-tests/e2e-transfer-test/runner/build.gradle.kts index fd04418fd6e..c45073c8cd8 100644 --- a/system-tests/e2e-transfer-test/runner/build.gradle.kts +++ b/system-tests/e2e-transfer-test/runner/build.gradle.kts @@ -26,7 +26,7 @@ dependencies { testImplementation(project(":core:common:connector-core")) testImplementation(project(":core:common:junit")) testImplementation(testFixtures(project(":core:common:lib:http-lib"))) - testImplementation(testFixtures(project(":extensions:common:sql:sql-core"))) + testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures"))) testImplementation(testFixtures(project(":extensions:control-plane:api:management-api:management-api-test-fixtures"))) testImplementation(project(":extensions:common:json-ld")) diff --git a/system-tests/management-api/management-api-test-runner/build.gradle.kts b/system-tests/management-api/management-api-test-runner/build.gradle.kts index 2a91d8a3f83..9ac353d78c8 100644 --- a/system-tests/management-api/management-api-test-runner/build.gradle.kts +++ b/system-tests/management-api/management-api-test-runner/build.gradle.kts @@ -39,7 +39,7 @@ dependencies { testImplementation(libs.assertj) testImplementation(libs.awaitility) testImplementation(libs.junit.jupiter.api) - testImplementation(testFixtures(project(":extensions:common:sql:sql-core"))) + testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures"))) testImplementation(project(":extensions:common:transaction:transaction-local")) testImplementation(libs.testcontainers.junit) testImplementation(libs.testcontainers.postgres) diff --git a/system-tests/sts-api/sts-api-test-runner/build.gradle.kts b/system-tests/sts-api/sts-api-test-runner/build.gradle.kts index 5ed1534baad..b0f172c5b29 100644 --- a/system-tests/sts-api/sts-api-test-runner/build.gradle.kts +++ b/system-tests/sts-api/sts-api-test-runner/build.gradle.kts @@ -29,7 +29,7 @@ dependencies { testCompileOnly(project(":system-tests:sts-api:sts-api-test-runtime")) testImplementation(testFixtures(project(":spi:common:identity-trust-sts-spi"))) - testImplementation(testFixtures(project(":extensions:common:sql:sql-core"))) + testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures"))) testImplementation(project(":extensions:common:transaction:transaction-local")) testImplementation(libs.nimbus.jwt) testImplementation(libs.bouncyCastle.bcpkixJdk18on) diff --git a/system-tests/version-api/version-api-test-runner/build.gradle.kts b/system-tests/version-api/version-api-test-runner/build.gradle.kts index 08e3328a725..c518a27ec6e 100644 --- a/system-tests/version-api/version-api-test-runner/build.gradle.kts +++ b/system-tests/version-api/version-api-test-runner/build.gradle.kts @@ -40,7 +40,7 @@ dependencies { testImplementation(libs.assertj) testImplementation(libs.awaitility) testImplementation(libs.junit.jupiter.api) - testImplementation(testFixtures(project(":extensions:common:sql:sql-core"))) + testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures"))) testImplementation(project(":extensions:common:transaction:transaction-local")) testImplementation(libs.testcontainers.junit) testImplementation(libs.testcontainers.postgres)