You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/12/14 11:34:53 UTC
[isis] branch spring6 updated: ISIS-3275: FixtureScripts autoconfig fixes
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch spring6
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/spring6 by this push:
new f5db15efd8 ISIS-3275: FixtureScripts autoconfig fixes
f5db15efd8 is described below
commit f5db15efd8fe680ec771026d0392620eef383d6e
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Dec 14 12:34:46 2022 +0100
ISIS-3275: FixtureScripts autoconfig fixes
---
.../demo/domain/src/main/java/demoapp/dom/DemoModuleCommon.java | 5 -----
.../extensions/commandlog/jpa/integtests/AppManifest.java | 4 ----
.../executionlog/jdo/integtests/ExecutionLog_IntegTest.java | 5 -----
.../executionlog/jpa/integtests/ExecutionLog_IntegTest.java | 5 -----
.../jpa/integtests/ExecutionOutbox_IntegTest.java | 5 -----
.../restclient/integtests/OutboxRestClient_IntegTest.java | 5 -----
.../audittrail/jdo/integtests/AuditTrail_IntegTest.java | 5 -----
.../audittrail/jpa/integtests/AuditTrail_IntegTest.java | 9 ++-------
.../dom/ApplicationPermissionRepository_IntegTest.java | 6 ------
.../dom/ApplicationPermissionRepository_IntegTest.java | 5 -----
.../sessionlog/jdo/integtests/SessionLog_IntegTest.java | 5 -----
.../sessionlog/jpa/integtests/SessionLog_IntegTest.java | 5 -----
.../jdo/integtests/CmdExecAuditSessLog_IntegTest.java | 5 -----
.../jpa/integtests/CmdExecAuditSessLog_IntegTest.java | 5 -----
.../jpa/springdata/SpringDataJpaBootstrappingTest.java | 4 ----
.../apache/causeway/testdomain/conf/Configuration_usingJdo.java | 6 ------
.../apache/causeway/testdomain/conf/Configuration_usingJpa.java | 6 ------
.../testdomain/jpa/springdata/SpringDataJpaTestModule.java | 7 -------
.../causeway/testdomain/wrapperfactory/WrapperTestFixtures.java | 8 --------
.../testing/fixtures/applib/fixturescripts/FixtureScripts.java | 6 ++++++
20 files changed, 8 insertions(+), 103 deletions(-)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleCommon.java b/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleCommon.java
index 11135a85bc..e1027d6f01 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleCommon.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleCommon.java
@@ -29,8 +29,6 @@ import org.apache.causeway.applib.CausewayModuleApplibMixins;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration;
@Configuration
@Import({
@@ -38,9 +36,6 @@ import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScripts
CausewayModuleApplibMixins.class,
CausewayModuleCoreRuntimeServices.class,
CausewayModuleTestingFixturesApplib.class,
- // Auto Configuration
- FixtureScriptsSpecificationProviderAutoConfiguration.class,
- ExecutionParametersServiceAutoConfiguration.class,
})
@PropertySources({
@PropertySource(CausewayPresets.NoTranslations),
diff --git a/extensions/core/commandlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/commandlog/jpa/integtests/AppManifest.java b/extensions/core/commandlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/commandlog/jpa/integtests/AppManifest.java
index a6314e8cbc..6dc732c472 100644
--- a/extensions/core/commandlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/commandlog/jpa/integtests/AppManifest.java
+++ b/extensions/core/commandlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/commandlog/jpa/integtests/AppManifest.java
@@ -32,8 +32,6 @@ import org.apache.causeway.extensions.commandlog.applib.integtest.model.CommandL
import org.apache.causeway.extensions.commandlog.jpa.CausewayModuleExtCommandLogPersistenceJpa;
import org.apache.causeway.extensions.commandlog.jpa.integtests.model.Counter;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration;
@SpringBootConfiguration
@EnableAutoConfiguration
@@ -42,8 +40,6 @@ import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScripts
CausewayModuleSecurityBypass.class,
CausewayModuleExtCommandLogPersistenceJpa.class,
- FixtureScriptsSpecificationProviderAutoConfiguration.class, // because something? disables autoconfiguration
- ExecutionParametersServiceAutoConfiguration.class // because something? disables autoconfiguration
})
@PropertySources({
@PropertySource(CausewayPresets.UseLog4j2Test)
diff --git a/extensions/core/executionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionlog/jdo/integtests/ExecutionLog_IntegTest.java b/extensions/core/executionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionlog/jdo/integtests/ExecutionLog_IntegTest.java
index b4576c0395..516bc3657c 100644
--- a/extensions/core/executionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionlog/jdo/integtests/ExecutionLog_IntegTest.java
+++ b/extensions/core/executionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionlog/jdo/integtests/ExecutionLog_IntegTest.java
@@ -34,8 +34,6 @@ import org.apache.causeway.extensions.executionlog.applib.integtest.model.Execut
import org.apache.causeway.extensions.executionlog.jdo.CausewayModuleExtExecutionLogPersistenceJdo;
import org.apache.causeway.extensions.executionlog.jdo.integtests.model.Counter;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration;
@SpringBootTest(
classes = ExecutionLog_IntegTest.AppManifest.class
@@ -49,9 +47,6 @@ public class ExecutionLog_IntegTest extends ExecutionLog_IntegTestAbstract {
CausewayModuleCoreRuntimeServices.class,
CausewayModuleSecurityBypass.class,
CausewayModuleExtExecutionLogPersistenceJdo.class,
- // Auto Configuration
- FixtureScriptsSpecificationProviderAutoConfiguration.class,
- ExecutionParametersServiceAutoConfiguration.class,
})
@PropertySources({
@PropertySource(CausewayPresets.UseLog4j2Test)
diff --git a/extensions/core/executionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionlog/jpa/integtests/ExecutionLog_IntegTest.java b/extensions/core/executionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionlog/jpa/integtests/ExecutionLog_IntegTest.java
index a49039758d..9a974a207e 100644
--- a/extensions/core/executionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionlog/jpa/integtests/ExecutionLog_IntegTest.java
+++ b/extensions/core/executionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionlog/jpa/integtests/ExecutionLog_IntegTest.java
@@ -35,8 +35,6 @@ import org.apache.causeway.extensions.executionlog.applib.integtest.model.Execut
import org.apache.causeway.extensions.executionlog.jpa.CausewayModuleExtExecutionLogPersistenceJpa;
import org.apache.causeway.extensions.executionlog.jpa.integtests.model.Counter;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration;
@SpringBootTest(
classes = ExecutionLog_IntegTest.AppManifest.class
@@ -50,9 +48,6 @@ public class ExecutionLog_IntegTest extends ExecutionLog_IntegTestAbstract {
CausewayModuleCoreRuntimeServices.class,
CausewayModuleSecurityBypass.class,
CausewayModuleExtExecutionLogPersistenceJpa.class,
-
- FixtureScriptsSpecificationProviderAutoConfiguration.class, // because something? disables autoconfiguration
- ExecutionParametersServiceAutoConfiguration.class // because something? disables autoconfiguration
})
@PropertySources({
@PropertySource(CausewayPresets.UseLog4j2Test)
diff --git a/extensions/core/executionoutbox/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionoutbox/jpa/integtests/ExecutionOutbox_IntegTest.java b/extensions/core/executionoutbox/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionoutbox/jpa/integtests/ExecutionOutbox_IntegTest.java
index 29d15ac929..b56c54915c 100644
--- a/extensions/core/executionoutbox/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionoutbox/jpa/integtests/ExecutionOutbox_IntegTest.java
+++ b/extensions/core/executionoutbox/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionoutbox/jpa/integtests/ExecutionOutbox_IntegTest.java
@@ -35,8 +35,6 @@ import org.apache.causeway.extensions.executionoutbox.applib.integtest.model.Exe
import org.apache.causeway.extensions.executionoutbox.jpa.CausewayModuleExtExecutionOutboxPersistenceJpa;
import org.apache.causeway.extensions.executionoutbox.jpa.integtests.model.Counter;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration;
@SpringBootTest(
classes = ExecutionOutbox_IntegTest.AppManifest.class
@@ -50,9 +48,6 @@ public class ExecutionOutbox_IntegTest extends ExecutionOutbox_IntegTestAbstract
CausewayModuleCoreRuntimeServices.class,
CausewayModuleSecurityBypass.class,
CausewayModuleExtExecutionOutboxPersistenceJpa.class,
-
- FixtureScriptsSpecificationProviderAutoConfiguration.class, // because something? disables autoconfiguration
- ExecutionParametersServiceAutoConfiguration.class // because something? disables autoconfiguration
})
@PropertySources({
@PropertySource(CausewayPresets.UseLog4j2Test)
diff --git a/extensions/core/executionoutbox/restclient/src/test/java/org/apache/causeway/extensions/executionoutbox/restclient/integtests/OutboxRestClient_IntegTest.java b/extensions/core/executionoutbox/restclient/src/test/java/org/apache/causeway/extensions/executionoutbox/restclient/integtests/OutboxRestClient_IntegTest.java
index b07a02ef36..af82242914 100644
--- a/extensions/core/executionoutbox/restclient/src/test/java/org/apache/causeway/extensions/executionoutbox/restclient/integtests/OutboxRestClient_IntegTest.java
+++ b/extensions/core/executionoutbox/restclient/src/test/java/org/apache/causeway/extensions/executionoutbox/restclient/integtests/OutboxRestClient_IntegTest.java
@@ -59,8 +59,6 @@ import org.apache.causeway.persistence.jpa.eclipselink.CausewayModulePersistence
import org.apache.causeway.schema.ixn.v2.InteractionDto;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration;
import org.apache.causeway.viewer.restfulobjects.jaxrsresteasy.CausewayModuleViewerRestfulObjectsJaxrsResteasy;
@SpringBootTest(
@@ -84,9 +82,6 @@ public class OutboxRestClient_IntegTest {
// mixins
Counter_bumpUsingMixin.class,
Counter_bumpUsingMixinWithExecutionPublishingDisabled.class,
-
- FixtureScriptsSpecificationProviderAutoConfiguration.class, // because something? disables autoconfiguration
- ExecutionParametersServiceAutoConfiguration.class // because something? disables autoconfiguration
})
@PropertySources({
@PropertySource(CausewayPresets.UseLog4j2Test)
diff --git a/extensions/security/audittrail/persistence-jdo/src/test/java/org/apache/causeway/extensions/audittrail/jdo/integtests/AuditTrail_IntegTest.java b/extensions/security/audittrail/persistence-jdo/src/test/java/org/apache/causeway/extensions/audittrail/jdo/integtests/AuditTrail_IntegTest.java
index 61ec8950cb..c7fffc95a8 100644
--- a/extensions/security/audittrail/persistence-jdo/src/test/java/org/apache/causeway/extensions/audittrail/jdo/integtests/AuditTrail_IntegTest.java
+++ b/extensions/security/audittrail/persistence-jdo/src/test/java/org/apache/causeway/extensions/audittrail/jdo/integtests/AuditTrail_IntegTest.java
@@ -35,8 +35,6 @@ import org.apache.causeway.extensions.audittrail.jdo.CausewayModuleExtAuditTrail
import org.apache.causeway.extensions.audittrail.jdo.integtests.model.Counter;
import org.apache.causeway.extensions.audittrail.jdo.integtests.model.CounterRepository;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration;
@SpringBootTest(
classes = AuditTrail_IntegTest.AppManifest.class
@@ -51,9 +49,6 @@ public class AuditTrail_IntegTest extends AuditTrail_IntegTestAbstract {
CausewayModuleCoreRuntimeServices.class,
CausewayModuleSecurityBypass.class,
CausewayModuleExtAuditTrailPersistenceJdo.class,
- // Auto Configuration
- FixtureScriptsSpecificationProviderAutoConfiguration.class,
- ExecutionParametersServiceAutoConfiguration.class,
})
@PropertySources({
@PropertySource(CausewayPresets.UseLog4j2Test),
diff --git a/extensions/security/audittrail/persistence-jpa/src/test/java/org/apache/causeway/extensions/audittrail/jpa/integtests/AuditTrail_IntegTest.java b/extensions/security/audittrail/persistence-jpa/src/test/java/org/apache/causeway/extensions/audittrail/jpa/integtests/AuditTrail_IntegTest.java
index e483f51781..afaf9e7a56 100644
--- a/extensions/security/audittrail/persistence-jpa/src/test/java/org/apache/causeway/extensions/audittrail/jpa/integtests/AuditTrail_IntegTest.java
+++ b/extensions/security/audittrail/persistence-jpa/src/test/java/org/apache/causeway/extensions/audittrail/jpa/integtests/AuditTrail_IntegTest.java
@@ -18,6 +18,8 @@
*/
package org.apache.causeway.extensions.audittrail.jpa.integtests;
+import jakarta.inject.Inject;
+
import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.domain.EntityScan;
@@ -37,10 +39,6 @@ import org.apache.causeway.extensions.audittrail.jpa.CausewayModuleExtAuditTrail
import org.apache.causeway.extensions.audittrail.jpa.integtests.model.Counter;
import org.apache.causeway.extensions.audittrail.jpa.integtests.model.CounterRepository;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration;
-
-import jakarta.inject.Inject;
@SpringBootTest(
classes = AuditTrail_IntegTest.AppManifest.class,
@@ -59,9 +57,6 @@ public class AuditTrail_IntegTest extends AuditTrail_IntegTestAbstract {
CausewayModuleSecurityBypass.class,
CausewayModuleExtAuditTrailPersistenceJpa.class,
- FixtureScriptsSpecificationProviderAutoConfiguration.class, // because something? disables autoconfiguration
- ExecutionParametersServiceAutoConfiguration.class, // because something? disables autoconfiguration
-
// entities, eager meta-model introspection
Counter.class,
})
diff --git a/extensions/security/secman/persistence-jdo/src/test/java/org/apache/causeway/extensions/secman/jdo/permission/dom/ApplicationPermissionRepository_IntegTest.java b/extensions/security/secman/persistence-jdo/src/test/java/org/apache/causeway/extensions/secman/jdo/permission/dom/ApplicationPermissionRepository_IntegTest.java
index e853f33da3..72310b9a93 100644
--- a/extensions/security/secman/persistence-jdo/src/test/java/org/apache/causeway/extensions/secman/jdo/permission/dom/ApplicationPermissionRepository_IntegTest.java
+++ b/extensions/security/secman/persistence-jdo/src/test/java/org/apache/causeway/extensions/secman/jdo/permission/dom/ApplicationPermissionRepository_IntegTest.java
@@ -32,8 +32,6 @@ import org.apache.causeway.extensions.secman.applib.ApplicationPermissionReposit
import org.apache.causeway.extensions.secman.applib.mmm.MmmModule;
import org.apache.causeway.extensions.secman.jdo.CausewayModuleExtSecmanPersistenceJdo;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration;
@SpringBootTest(
classes = ApplicationPermissionRepository_IntegTest.AppManifest.class
@@ -49,10 +47,6 @@ class ApplicationPermissionRepository_IntegTest extends ApplicationPermissionRep
CausewayModuleExtSecmanPersistenceJdo.class,
MmmModule.class,
-
- // Auto Configuration
- FixtureScriptsSpecificationProviderAutoConfiguration.class,
- ExecutionParametersServiceAutoConfiguration.class,
})
@PropertySources({
@PropertySource(CausewayPresets.UseLog4j2Test),
diff --git a/extensions/security/secman/persistence-jpa/src/test/java/org/apache/causeway/extensions/secman/jpa/permission/dom/ApplicationPermissionRepository_IntegTest.java b/extensions/security/secman/persistence-jpa/src/test/java/org/apache/causeway/extensions/secman/jpa/permission/dom/ApplicationPermissionRepository_IntegTest.java
index 7301d5e76d..af8a49b55d 100644
--- a/extensions/security/secman/persistence-jpa/src/test/java/org/apache/causeway/extensions/secman/jpa/permission/dom/ApplicationPermissionRepository_IntegTest.java
+++ b/extensions/security/secman/persistence-jpa/src/test/java/org/apache/causeway/extensions/secman/jpa/permission/dom/ApplicationPermissionRepository_IntegTest.java
@@ -32,8 +32,6 @@ import org.apache.causeway.extensions.secman.applib.ApplicationPermissionReposit
import org.apache.causeway.extensions.secman.applib.mmm.MmmModule;
import org.apache.causeway.extensions.secman.jpa.CausewayModuleExtSecmanPersistenceJpa;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration;
@SpringBootTest(
classes = ApplicationPermissionRepository_IntegTest.AppManifest.class
@@ -48,9 +46,6 @@ class ApplicationPermissionRepository_IntegTest extends ApplicationPermissionRep
CausewayModuleSecurityBypass.class,
CausewayModuleExtSecmanPersistenceJpa.class,
- FixtureScriptsSpecificationProviderAutoConfiguration.class, // because something? disables autoconfiguration
- ExecutionParametersServiceAutoConfiguration.class, // because something? disables autoconfiguration
-
MmmModule.class,
})
@PropertySources({
diff --git a/extensions/security/sessionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/sessionlog/jdo/integtests/SessionLog_IntegTest.java b/extensions/security/sessionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/sessionlog/jdo/integtests/SessionLog_IntegTest.java
index 64bee62f02..58c3ecbb00 100644
--- a/extensions/security/sessionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/sessionlog/jdo/integtests/SessionLog_IntegTest.java
+++ b/extensions/security/sessionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/sessionlog/jdo/integtests/SessionLog_IntegTest.java
@@ -31,8 +31,6 @@ import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeService
import org.apache.causeway.extensions.sessionlog.applib.integtests.SessionLogIntegTestAbstract;
import org.apache.causeway.extensions.sessionlog.jdo.CausewayModuleExtSessionLogPersistenceJdo;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration;
@SpringBootTest(
classes = SessionLog_IntegTest.AppManifest.class
@@ -47,9 +45,6 @@ public class SessionLog_IntegTest extends SessionLogIntegTestAbstract {
CausewayModuleCoreRuntimeServices.class,
CausewayModuleSecurityBypass.class,
CausewayModuleExtSessionLogPersistenceJdo.class,
- // Auto Configuration
- FixtureScriptsSpecificationProviderAutoConfiguration.class,
- ExecutionParametersServiceAutoConfiguration.class,
})
@PropertySources({
@PropertySource(CausewayPresets.UseLog4j2Test),
diff --git a/extensions/security/sessionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/sessionlog/jpa/integtests/SessionLog_IntegTest.java b/extensions/security/sessionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/sessionlog/jpa/integtests/SessionLog_IntegTest.java
index a1f05c76c3..885a19025d 100644
--- a/extensions/security/sessionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/sessionlog/jpa/integtests/SessionLog_IntegTest.java
+++ b/extensions/security/sessionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/sessionlog/jpa/integtests/SessionLog_IntegTest.java
@@ -31,8 +31,6 @@ import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeService
import org.apache.causeway.extensions.sessionlog.applib.integtests.SessionLogIntegTestAbstract;
import org.apache.causeway.extensions.sessionlog.jpa.CausewayModuleExtSessionLogPersistenceJpa;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration;
@SpringBootTest(
classes = SessionLog_IntegTest.AppManifest.class
@@ -47,9 +45,6 @@ public class SessionLog_IntegTest extends SessionLogIntegTestAbstract {
CausewayModuleCoreRuntimeServices.class,
CausewayModuleSecurityBypass.class,
CausewayModuleExtSessionLogPersistenceJpa.class,
-
- FixtureScriptsSpecificationProviderAutoConfiguration.class, // because something? disables autoconfiguration
- ExecutionParametersServiceAutoConfiguration.class // because something? disables autoconfiguration
})
@PropertySources({
@PropertySource(CausewayPresets.UseLog4j2Test),
diff --git a/regressiontests/stable-cmdexecauditsess/persistence-jdo/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jdo/integtests/CmdExecAuditSessLog_IntegTest.java b/regressiontests/stable-cmdexecauditsess/persistence-jdo/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jdo/integtests/CmdExecAuditSessLog_IntegTest.java
index cea09321bd..a84b593df7 100644
--- a/regressiontests/stable-cmdexecauditsess/persistence-jdo/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jdo/integtests/CmdExecAuditSessLog_IntegTest.java
+++ b/regressiontests/stable-cmdexecauditsess/persistence-jdo/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jdo/integtests/CmdExecAuditSessLog_IntegTest.java
@@ -39,8 +39,6 @@ import org.apache.causeway.regressiontests.cmdexecauditsess.generic.integtest.mo
import org.apache.causeway.regressiontests.cmdexecauditsess.jdo.integtests.model.Counter;
import org.apache.causeway.regressiontests.cmdexecauditsess.jdo.integtests.model.CounterRepository;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration;
@SpringBootTest(
classes = CmdExecAuditSessLog_IntegTest.AppManifest.class
@@ -59,9 +57,6 @@ public class CmdExecAuditSessLog_IntegTest extends CmdExecAuditSessLog_IntegTest
CausewayModuleExtExecutionOutboxPersistenceJdo.class,
CausewayModuleExtAuditTrailPersistenceJdo.class,
CausewayModuleExtSessionLogPersistenceJdo.class,
- // Auto Configuration
- FixtureScriptsSpecificationProviderAutoConfiguration.class,
- ExecutionParametersServiceAutoConfiguration.class,
})
@PropertySources({
@PropertySource(CausewayPresets.UseLog4j2Test)
diff --git a/regressiontests/stable-cmdexecauditsess/persistence-jpa/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jpa/integtests/CmdExecAuditSessLog_IntegTest.java b/regressiontests/stable-cmdexecauditsess/persistence-jpa/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jpa/integtests/CmdExecAuditSessLog_IntegTest.java
index d71eaba46a..8064f7368f 100644
--- a/regressiontests/stable-cmdexecauditsess/persistence-jpa/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jpa/integtests/CmdExecAuditSessLog_IntegTest.java
+++ b/regressiontests/stable-cmdexecauditsess/persistence-jpa/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jpa/integtests/CmdExecAuditSessLog_IntegTest.java
@@ -39,8 +39,6 @@ import org.apache.causeway.regressiontests.cmdexecauditsess.generic.integtest.Cm
import org.apache.causeway.regressiontests.cmdexecauditsess.generic.integtest.model.CmdExecAuditSessTestDomainModel;
import org.apache.causeway.regressiontests.cmdexecauditsess.jpa.integtests.model.Counter;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration;
@SpringBootTest(
classes = CmdExecAuditSessLog_IntegTest.AppManifest.class
@@ -59,9 +57,6 @@ public class CmdExecAuditSessLog_IntegTest extends CmdExecAuditSessLog_IntegTest
CausewayModuleExtExecutionOutboxPersistenceJpa.class,
CausewayModuleExtAuditTrailPersistenceJpa.class,
CausewayModuleExtSessionLogPersistenceJpa.class,
- // Auto Configuration
- FixtureScriptsSpecificationProviderAutoConfiguration.class,
- ExecutionParametersServiceAutoConfiguration.class,
})
@PropertySources({
@PropertySource(CausewayPresets.UseLog4j2Test)
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/springdata/SpringDataJpaBootstrappingTest.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/springdata/SpringDataJpaBootstrappingTest.java
index fab60c0bc2..0def9c2551 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/springdata/SpringDataJpaBootstrappingTest.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/springdata/SpringDataJpaBootstrappingTest.java
@@ -47,8 +47,6 @@ import org.apache.causeway.testdomain.conf.Configuration_usingSpringDataJpa;
import org.apache.causeway.testdomain.jpa.springdata.Employee;
import org.apache.causeway.testdomain.jpa.springdata.EmployeeRepository;
import org.apache.causeway.testdomain.jpa.springdata.SpringDataJpaTestModule;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration;
import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
import lombok.val;
@@ -56,8 +54,6 @@ import lombok.val;
@DataJpaTest
@ContextConfiguration(classes = {
Configuration_usingSpringDataJpa.class,
- FixtureScriptsSpecificationProviderAutoConfiguration.class, // because @DataJpaTest disables autoconfiguration
- ExecutionParametersServiceAutoConfiguration.class // because @DataJpaTest disables autoconfiguration
})
@TestPropertySource(CausewayPresets.UseLog4j2Test)
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingJdo.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingJdo.java
index 0dd6ddf159..27af3e9727 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingJdo.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingJdo.java
@@ -32,8 +32,6 @@ import org.apache.causeway.testdomain.jdo.JdoTestDomainModule;
import org.apache.causeway.testdomain.model.stereotypes.MyService;
import org.apache.causeway.testdomain.util.kv.KVStoreForTesting;
import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration;
@Configuration
@Import({
@@ -46,10 +44,6 @@ import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScripts
KVStoreForTesting.class, // Helper for JUnit Tests
JdoTestDomainModule.class,
-
- // Auto Configuration
- FixtureScriptsSpecificationProviderAutoConfiguration.class,
- ExecutionParametersServiceAutoConfiguration.class,
})
@PropertySources({
@PropertySource(CausewayPresets.NoTranslations),
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingJpa.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingJpa.java
index c48cc11bdb..e23947baad 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingJpa.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingJpa.java
@@ -32,8 +32,6 @@ import org.apache.causeway.testdomain.jpa.JpaTestDomainModule;
import org.apache.causeway.testdomain.model.stereotypes.MyService;
import org.apache.causeway.testdomain.util.kv.KVStoreForTesting;
import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration;
@SpringBootConfiguration
@EnableAutoConfiguration
@@ -46,10 +44,6 @@ import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScripts
KVStoreForTesting.class, // Helper for JUnit Tests
JpaTestDomainModule.class,
-
- // Auto Configuration
- FixtureScriptsSpecificationProviderAutoConfiguration.class,
- ExecutionParametersServiceAutoConfiguration.class,
})
@PropertySources({
@PropertySource(CausewayPresets.NoTranslations),
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/springdata/SpringDataJpaTestModule.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/springdata/SpringDataJpaTestModule.java
index e15d758f8d..5272d8b582 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/springdata/SpringDataJpaTestModule.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/springdata/SpringDataJpaTestModule.java
@@ -20,18 +20,11 @@ package org.apache.causeway.testdomain.jpa.springdata;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.apache.causeway.applib.services.factory.FactoryService;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration;
@Configuration
-@Import({
- FixtureScriptsSpecificationProviderAutoConfiguration.class, // because @DataJpaTest disables autoconfiguration
- ExecutionParametersServiceAutoConfiguration.class // because @DataJpaTest disables autoconfiguration
-})
@EnableJpaRepositories(basePackageClasses = EmployeeRepository.class)
@EntityScan(basePackageClasses = Employee.class)
public class SpringDataJpaTestModule {
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/wrapperfactory/WrapperTestFixtures.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/wrapperfactory/WrapperTestFixtures.java
index 5898b10492..0bf46652f0 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/wrapperfactory/WrapperTestFixtures.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/wrapperfactory/WrapperTestFixtures.java
@@ -22,20 +22,12 @@ package org.apache.causeway.testdomain.wrapperfactory;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration;
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration;
import org.apache.causeway.testing.fixtures.applib.modules.ModuleWithFixtures;
import org.apache.causeway.testing.fixtures.applib.teardown.jdo.TeardownFixtureJdoAbstract;
@Configuration
-@Import({
- // Auto Configuration
- FixtureScriptsSpecificationProviderAutoConfiguration.class,
- ExecutionParametersServiceAutoConfiguration.class,
-})
@ComponentScan
public class WrapperTestFixtures implements ModuleWithFixtures {
diff --git a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScripts.java b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScripts.java
index 26a0ecd623..e6cceea8ed 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScripts.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScripts.java
@@ -31,6 +31,8 @@ import jakarta.inject.Inject;
import jakarta.inject.Named;
import jakarta.xml.bind.annotation.XmlRootElement;
+import org.springframework.context.annotation.Import;
+
import org.apache.causeway.applib.ViewModel;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
@@ -81,6 +83,10 @@ import lombok.val;
named="Prototyping",
menuBar = DomainServiceLayout.MenuBar.SECONDARY
)
+@Import({
+ // Auto Configuration
+ FixtureScriptsSpecificationProviderAutoConfiguration.class,
+ ExecutionParametersServiceAutoConfiguration.class})
@jakarta.annotation.Priority(PriorityPrecedence.EARLY)
public class FixtureScripts {