fix tests

eclipse-tractusx · Dec 20, 2024 · 8b22538 · 8b22538
1 parent dabf141
commit 8b22538
Show file tree

Hide file tree

Showing 15 changed files with 38 additions and 22 deletions.
diff --git a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/build.gradle.kts b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/build.gradle.kts
@@ -37,6 +37,7 @@ dependencies {
     runtimeOnly(libs.edc.transaction.local)
     runtimeOnly(libs.edc.sql.pool)
     runtimeOnly(libs.edc.core.controlplane)
+    runtimeOnly(libs.edc.core.sql)
     runtimeOnly(libs.postgres)
 }
 

diff --git a/edc-dataplane/edc-dataplane-hashicorp-vault/build.gradle.kts b/edc-dataplane/edc-dataplane-hashicorp-vault/build.gradle.kts
@@ -33,6 +33,7 @@ dependencies {
     runtimeOnly(libs.edc.sql.edrindex)
     runtimeOnly(libs.edc.sql.dataplane)
     runtimeOnly(libs.postgres)
+    runtimeOnly(libs.edc.core.sql)
 }
 
 tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {

diff --git a/edc-extensions/agreements/retirement-evaluation-store-sql/build.gradle.kts b/edc-extensions/agreements/retirement-evaluation-store-sql/build.gradle.kts
@@ -28,13 +28,13 @@ dependencies {
     implementation(libs.edc.spi.core)
     implementation(libs.edc.spi.transaction.datasource)
     implementation(libs.edc.spi.transactionspi)
-    implementation(libs.edc.core.sql)
+    implementation(libs.edc.lib.sql)
     implementation(libs.edc.sql.contract.negotiation)
     implementation(libs.edc.spi.controlplane)
 
 
     testImplementation(libs.edc.transaction.local)
-    testImplementation(testFixtures(libs.edc.core.sql))
+    testImplementation(testFixtures(libs.edc.sql.test.fixtures))
     testImplementation(testFixtures(libs.edc.junit))
     testImplementation(testFixtures(project(":edc-extensions:agreements:retirement-evaluation-core")))
 }
diff --git a/edc-extensions/bpn-validation/business-partner-store-sql/build.gradle.kts b/edc-extensions/bpn-validation/business-partner-store-sql/build.gradle.kts
@@ -28,11 +28,11 @@ dependencies {
     implementation(libs.edc.spi.core)
     implementation(libs.edc.spi.transaction.datasource)
     implementation(libs.edc.spi.transactionspi)
-    implementation(libs.edc.core.sql)
+    implementation(libs.edc.lib.sql)
 
 
     testImplementation(libs.edc.transaction.local)
-    testImplementation(testFixtures(libs.edc.core.sql))
+    testImplementation(testFixtures(libs.edc.sql.test.fixtures))
     testImplementation(testFixtures(libs.edc.junit))
     testImplementation(testFixtures(project(":edc-extensions:bpn-validation:bpn-validation-core")))
 }
diff --git a/.../tractusx/edc/validation/businesspartner/store/SqlBusinessPartnerGroupStoreExtension.java b/.../tractusx/edc/validation/businesspartner/store/SqlBusinessPartnerGroupStoreExtension.java
@@ -27,7 +27,6 @@
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
 import org.eclipse.edc.spi.types.TypeManager;
 import org.eclipse.edc.sql.QueryExecutor;
-import org.eclipse.edc.sql.configuration.DataSourceName;
 import org.eclipse.edc.transaction.datasource.spi.DataSourceRegistry;
 import org.eclipse.edc.transaction.spi.TransactionContext;
 import org.eclipse.tractusx.edc.validation.businesspartner.spi.BusinessPartnerStore;
@@ -59,7 +58,7 @@ public class SqlBusinessPartnerGroupStoreExtension implements ServiceExtension {
 
     @Provider
     public BusinessPartnerStore sqlStore(ServiceExtensionContext context) {
-        var dataSourceName = DataSourceName.getDataSourceName(DATASOURCE_NAME, DATASOURCE_SETTING_NAME, context.getConfig(), context.getMonitor());
+        var dataSourceName = context.getConfig().getString(DATASOURCE_NAME, DataSourceRegistry.DEFAULT_DATASOURCE);
         return new SqlBusinessPartnerStore(dataSourceRegistry, dataSourceName, transactionContext, typeManager.getMapper(), queryExecutor, getStatements());
     }
 

diff --git a/...eclipse/tractusx/edc/dataplane/proxy/consumer/api/DataPlaneProxyConsumerApiExtension.java b/...eclipse/tractusx/edc/dataplane/proxy/consumer/api/DataPlaneProxyConsumerApiExtension.java
@@ -108,7 +108,7 @@ public void initialize(ServiceExtensionContext context) {
         var port = propertyCompatibility(context, CONSUMER_PORT, CONSUMER_PORT_DEPRECATED, DEFAULT_PROXY_PORT);
         var config = context.getConfig(CONSUMER_CONFIG_KEY);
 
-        configurer.configure(config, webServer, createApiContext(port));
+        configurer.configure(config, createApiContext(port));
 
         var poolSize = propertyCompatibility(context, THREAD_POOL_SIZE, THREAD_POOL_SIZE_DEPRECATED, DEFAULT_THREAD_POOL);
         executorService = newFixedThreadPool(poolSize);
@@ -144,7 +144,6 @@ private WebServiceSettings createApiContext(int port) {
                 .contextAlias(CONSUMER_API_ALIAS)
                 .defaultPath(CONSUMER_CONTEXT_PATH)
                 .defaultPort(port)
-                .name(NAME)
                 .build();
     }
 

diff --git a/edc-extensions/edr/edr-index-lock-sql/build.gradle.kts b/edc-extensions/edr/edr-index-lock-sql/build.gradle.kts
@@ -25,7 +25,7 @@ plugins {
 dependencies {
 
     implementation(libs.edc.lib.util)
-    implementation(libs.edc.sql.core)
+    implementation(libs.edc.lib.sql)
     implementation(libs.edc.sql.edrindex)
     implementation(libs.edc.spi.transactionspi)
     implementation(libs.edc.spi.transaction.datasource)
@@ -37,6 +37,6 @@ dependencies {
     implementation(project(":spi:edr-spi"))
 
     testImplementation(testFixtures(project(":spi:edr-spi")))
-    testImplementation(testFixtures(libs.edc.core.sql))
+    testImplementation(testFixtures(libs.edc.sql.test.fixtures))
     testImplementation(testFixtures(libs.edc.junit))
 }
diff --git a/...ck-sql/src/main/java/org/eclipse/tractusx/edc/edr/index/sql/lock/SqlEdrLockExtension.java b/...ck-sql/src/main/java/org/eclipse/tractusx/edc/edr/index/sql/lock/SqlEdrLockExtension.java
@@ -29,7 +29,6 @@
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
 import org.eclipse.edc.spi.types.TypeManager;
 import org.eclipse.edc.sql.QueryExecutor;
-import org.eclipse.edc.sql.configuration.DataSourceName;
 import org.eclipse.edc.transaction.datasource.spi.DataSourceRegistry;
 import org.eclipse.edc.transaction.spi.TransactionContext;
 import org.eclipse.tractusx.edc.edr.spi.index.lock.EndpointDataReferenceLock;
@@ -61,7 +60,7 @@ public class SqlEdrLockExtension implements ServiceExtension {
 
     @Override
     public void initialize(ServiceExtensionContext context) {
-        var dataSourceName = DataSourceName.getDataSourceName(DATASOURCE_NAME, DATASOURCE_SETTING_NAME, context.getConfig(), context.getMonitor());
+        var dataSourceName = context.getConfig().getString(DATASOURCE_NAME, DataSourceRegistry.DEFAULT_DATASOURCE);
 
         var statements = new PostgresEdrLockStatements();
         var sqlStore = new SqlEdrLock(dataSourceRegistry, dataSourceName, transactionContext, typeManager.getMapper(), queryExecutor, statements);

diff --git a/edc-extensions/migrations/control-plane-migration/build.gradle.kts b/edc-extensions/migrations/control-plane-migration/build.gradle.kts
@@ -27,7 +27,7 @@ dependencies {
     implementation(libs.edc.spi.core)
     implementation(libs.edc.spi.transaction.datasource)
     implementation(libs.edc.sql.assetindex)
-    implementation(libs.edc.sql.core)
+    implementation(libs.edc.lib.sql)
     runtimeOnly(libs.postgres)
 
     implementation(libs.flyway.core)
@@ -37,5 +37,5 @@ dependencies {
     runtimeOnly(libs.flyway.database.postgres)
 
     testImplementation(libs.edc.junit)
-    testImplementation(testFixtures(libs.edc.sql.core))
+    testImplementation(testFixtures(libs.edc.sql.test.fixtures))
 }
diff --git a/edc-extensions/migrations/data-plane-migration/build.gradle.kts b/edc-extensions/migrations/data-plane-migration/build.gradle.kts
@@ -27,7 +27,7 @@ dependencies {
     implementation(libs.edc.spi.core)
     implementation(libs.edc.spi.transaction.datasource)
     implementation(libs.edc.sql.assetindex)
-    implementation(libs.edc.sql.core)
+    implementation(libs.edc.lib.sql)
     runtimeOnly(libs.postgres)
 
     implementation(libs.flyway.core)
@@ -37,5 +37,5 @@ dependencies {
     runtimeOnly(libs.flyway.database.postgres)
 
     testImplementation(libs.edc.junit)
-    testImplementation(testFixtures(libs.edc.sql.core))
+    testImplementation(testFixtures(libs.edc.sql.test.fixtures))
 }
diff --git a/...ipse/tractusx/edc/postgresql/migration/dataplane/V0_0_4__Alter_Dataplane_AddRuntimeId.sql b/...ipse/tractusx/edc/postgresql/migration/dataplane/V0_0_4__Alter_Dataplane_AddRuntimeId.sql
@@ -0,0 +1,16 @@
+--
+--  Copyright (c) 2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+--
+--  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:
+--       Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - initial API and implementation
+--
+
+
+ALTER TABLE edc_data_plane
+    ADD COLUMN runtime_id VARCHAR;
diff --git a/edc-extensions/migrations/postgresql-migration-lib/build.gradle.kts b/edc-extensions/migrations/postgresql-migration-lib/build.gradle.kts
@@ -27,7 +27,7 @@ dependencies {
     implementation(libs.edc.spi.core)
     implementation(libs.edc.spi.transaction.datasource)
     implementation(libs.edc.sql.assetindex)
-    implementation(libs.edc.sql.core)
+    implementation(libs.edc.lib.sql)
     runtimeOnly(libs.postgres)
 
     implementation(libs.flyway.core)

diff --git a/...e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/aws/MinioExtension.java b/...e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/aws/MinioExtension.java
@@ -55,7 +55,7 @@ private static class MinioContainer extends GenericContainer<MinioContainer> {
         private final String accessKeyId = "test-access-key";
         private final String secretAccessKey = UUID.randomUUID().toString();
 
-        public MinioContainer() {
+        MinioContainer() {
             super("bitnami/minio");
             addEnv("MINIO_ROOT_USER", accessKeyId);
             addEnv("MINIO_ROOT_PASSWORD", secretAccessKey);

diff --git a/...fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/azure/AzuriteExtension.java b/...fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/azure/AzuriteExtension.java
@@ -58,7 +58,7 @@ private static class AzuriteContainer extends GenericContainer<AzuriteContainer>
         private static final String IMAGE_NAME = "mcr.microsoft.com/azure-storage/azurite";
         private final int containerPort = 10_000;
 
-        public AzuriteContainer(int azuriteHostPort, Account... accounts) {
+        AzuriteContainer(int azuriteHostPort, Account... accounts) {
             super(IMAGE_NAME);
             addEnv("AZURITE_ACCOUNTS", stream(accounts).map(it -> "%s:%s".formatted(it.name(), it.key())).collect(joining(";")));
             setPortBindings(List.of("%d:%d".formatted(azuriteHostPort, containerPort)));

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 format.version = "1.1"
 
 [versions]
-edc = "0.11.0-20241213-SNAPSHOT"
+edc = "0.11.0-SNAPSHOT"
 assertj = "3.26.3"
 awaitility = "4.2.2"
 aws = "2.29.29"
@@ -56,9 +56,9 @@ edc-core-controlplane = { module = "org.eclipse.edc:control-plane-core", version
 edc-core-connector = { module = "org.eclipse.edc:connector-core", version.ref = "edc" }
 edc-core-jersey = { module = "org.eclipse.edc:jersey-core", version.ref = "edc" }
 edc-core-policy-monitor = { module = "org.eclipse.edc:policy-monitor-core", version.ref = "edc" }
-edc-core-sql = { module = "org.eclipse.edc:sql-core", version.ref = "edc" }
 edc-core-token = { module = "org.eclipse.edc:token-core", version.ref = "edc" }
 edc-core-edrstore = { module = "org.eclipse.edc:edr-store-core", version.ref = "edc" }
+edc-core-sql = { module = "org.eclipse.edc:sql-core", version.ref = "edc" }
 edc-controlplane-callback-staticendpoint = { module = "org.eclipse.edc:callback-static-endpoint", version.ref = "edc" }
 edc-junit = { module = "org.eclipse.edc:junit", version.ref = "edc" }
 edc-api-management-config = { module = "org.eclipse.edc:management-api-configuration", version.ref = "edc" }
@@ -92,19 +92,20 @@ edc-lib-token = { module = "org.eclipse.edc:token-lib", version.ref = "edc" }
 edc-lib-transform = { module = "org.eclipse.edc:transform-lib", version.ref = "edc" }
 edc-lib-util = { module = "org.eclipse.edc:util-lib", version.ref = "edc" }
 edc-lib-validator = { module = "org.eclipse.edc:validator-lib", version.ref = "edc" }
+edc-lib-sql = { module = "org.eclipse.edc:sql-lib", version.ref = "edc" }
 
 # implementations
 edc-sql-assetindex = { module = "org.eclipse.edc:asset-index-sql", version.ref = "edc" }
 edc-sql-contract-definition = { module = "org.eclipse.edc:contract-definition-store-sql", version.ref = "edc" }
 edc-sql-contract-negotiation = { module = "org.eclipse.edc:contract-negotiation-store-sql", version.ref = "edc" }
 edc-sql-transferprocess = { module = "org.eclipse.edc:transfer-process-store-sql", version.ref = "edc" }
 edc-sql-policydef = { module = "org.eclipse.edc:policy-definition-store-sql", version.ref = "edc" }
-edc-sql-core = { module = "org.eclipse.edc:sql-core", version.ref = "edc" }
 edc-sql-pool = { module = "org.eclipse.edc:sql-pool-apache-commons", version.ref = "edc" }
 edc-sql-policy-monitor = { module = "org.eclipse.edc:policy-monitor-store-sql", version.ref = "edc" }
 edc-sql-edrindex = { module = "org.eclipse.edc:edr-index-sql", version.ref = "edc" }
 edc-sql-accesstokendata = { module = "org.eclipse.edc:accesstokendata-store-sql", version.ref = "edc" }
 edc-sql-dataplane = { module = "org.eclipse.edc:data-plane-store-sql", version.ref = "edc" }
+edc-sql-test-fixtures = { module = "org.eclipse.edc:sql-test-fixtures", version.ref = "edc" }
 
 # azure stuff
 azure-storage-blob = { module = "com.azure:azure-storage-blob", version.ref = "azure-storage-blob" }