From 84f2442d4d3399e827df412e036f126396bd6d75 Mon Sep 17 00:00:00 2001 From: Christophe Loiseau Date: Mon, 29 Jul 2024 09:51:22 +0200 Subject: [PATCH] Remove Builder reference --- .../sovity/edc/e2e/AlwaysTrueMigrationReversedTest.java | 2 +- .../java/de/sovity/edc/e2e/AlwaysTrueMigrationTest.java | 2 +- .../e2e/extension/CeE2eTestExtensionConfigFactory.java | 8 ++++---- .../de/sovity/edc/extension/e2e/extension/Helpers.java | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/src/test/java/de/sovity/edc/e2e/AlwaysTrueMigrationReversedTest.java b/tests/src/test/java/de/sovity/edc/e2e/AlwaysTrueMigrationReversedTest.java index ccf0da7de..525e5669d 100644 --- a/tests/src/test/java/de/sovity/edc/e2e/AlwaysTrueMigrationReversedTest.java +++ b/tests/src/test/java/de/sovity/edc/e2e/AlwaysTrueMigrationReversedTest.java @@ -17,7 +17,7 @@ class AlwaysTrueMigrationReversedTest { @RegisterExtension private static final E2eTestExtension E2E_TEST_EXTENSION = new E2eTestExtension( - defaultBuilder() + defaultBuilder().toBuilder() .consumerConfigCustomizer(config -> config.getProperties() .put("edc.flyway.additional.migration.locations", "classpath:db/additional-test-data/always-true-policy-legacy")) .providerConfigCustomizer(config -> config.getProperties() diff --git a/tests/src/test/java/de/sovity/edc/e2e/AlwaysTrueMigrationTest.java b/tests/src/test/java/de/sovity/edc/e2e/AlwaysTrueMigrationTest.java index f48f0a628..e1d08fabd 100644 --- a/tests/src/test/java/de/sovity/edc/e2e/AlwaysTrueMigrationTest.java +++ b/tests/src/test/java/de/sovity/edc/e2e/AlwaysTrueMigrationTest.java @@ -44,7 +44,7 @@ class AlwaysTrueMigrationTest { @RegisterExtension private static final E2eTestExtension E2E_TEST_EXTENSION = new E2eTestExtension( - withModule(":launchers:connectors:sovity-dev") + withModule(":launchers:connectors:sovity-dev").toBuilder() .consumerConfigCustomizer(config -> config.getProperties() .put("edc.flyway.additional.migration.locations", "classpath:db/additional-test-data/always-true-policy-migrated")) .providerConfigCustomizer(config -> config.getProperties() diff --git a/utils/test-utils/src/main/java/de/sovity/edc/extension/e2e/extension/CeE2eTestExtensionConfigFactory.java b/utils/test-utils/src/main/java/de/sovity/edc/extension/e2e/extension/CeE2eTestExtensionConfigFactory.java index 3142798f7..e096e2895 100644 --- a/utils/test-utils/src/main/java/de/sovity/edc/extension/e2e/extension/CeE2eTestExtensionConfigFactory.java +++ b/utils/test-utils/src/main/java/de/sovity/edc/extension/e2e/extension/CeE2eTestExtensionConfigFactory.java @@ -19,11 +19,11 @@ @UtilityClass public class CeE2eTestExtensionConfigFactory { - public static E2eTestExtensionConfig.E2eTestExtensionConfigBuilder defaultBuilder() { - return E2eTestExtensionConfig.builder().moduleName(":launchers:connectors:sovity-dev"); + public static E2eTestExtensionConfig defaultBuilder() { + return E2eTestExtensionConfig.builder().moduleName(":launchers:connectors:sovity-dev").build(); } - public static E2eTestExtensionConfig.E2eTestExtensionConfigBuilder withModule(String module) { - return defaultBuilder().moduleName(module); + public static E2eTestExtensionConfig withModule(String module) { + return defaultBuilder().toBuilder().moduleName(module).build(); } } diff --git a/utils/test-utils/src/main/java/de/sovity/edc/extension/e2e/extension/Helpers.java b/utils/test-utils/src/main/java/de/sovity/edc/extension/e2e/extension/Helpers.java index ea02d4cc7..4fa3ae399 100644 --- a/utils/test-utils/src/main/java/de/sovity/edc/extension/e2e/extension/Helpers.java +++ b/utils/test-utils/src/main/java/de/sovity/edc/extension/e2e/extension/Helpers.java @@ -21,6 +21,6 @@ @UtilityClass public class Helpers { public static E2eTestExtension defaultE2eTestExtension() { - return new E2eTestExtension(withModule(":launchers:connectors:sovity-dev").build()); + return new E2eTestExtension(withModule(":launchers:connectors:sovity-dev")); } }