You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2024/02/25 10:24:22 UTC
(causeway) branch spring6 updated: CAUSEWAY-2297: batch org. imports (test packages)
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/causeway.git
The following commit(s) were added to refs/heads/spring6 by this push:
new 0b5e171661 CAUSEWAY-2297: batch org. imports (test packages)
0b5e171661 is described below
commit 0b5e17166108fd41213c2751e80ee5d6bd7fea83
Author: andi-huber <ah...@apache.org>
AuthorDate: Sun Feb 25 11:24:16 2024 +0100
CAUSEWAY-2297: batch org. imports (test packages)
---
.../testdomain/bootstrapping/AutoConfigurationTest.java | 9 +++++----
.../bootstrapping/SpringServiceInjectPriorityTest.java | 13 +++++++------
.../bootstrapping/SpringServiceProvisioningTest.java | 5 +++--
.../integtest/CmdExecAuditSessLog_IntegTestAbstract.java | 1 +
.../cmdexecauditsess/jdo/integtests/model/Counter.java | 3 ++-
.../causeway/testdomain/config/CausewayConfigBeanTest.java | 5 +++--
.../config/CausewayConfigBeanTest_usingHeadless.java | 5 +++--
.../testdomain/config/EmailServiceDefault_IntegTest.java | 7 ++++---
.../java/org/apache/causeway/testdomain/config/FooTest.java | 9 +++++----
.../integtests/CoreWrapperFactory_IntegTestAbstract.java | 1 +
.../integtests/WrapperFactory_async_IntegTest.java | 1 +
.../org/apache/causeway/testdomain/cucumber/StepDefs.java | 4 ++--
.../testdomain/domainmodel/AnnotationSyntesizerTest.java | 7 ++++---
.../testdomain/domainmodel/DomainModelTest_forEditing.java | 7 ++++---
.../domainmodel/DomainModelTest_usingBadDomain.java | 5 +++--
...DomainModelTest_usingBadDomain_noAnnotationEnforced.java | 5 +++--
.../domainmodel/DomainModelTest_usingGoodDomain.java | 8 ++++----
.../testdomain/domainmodel/MetaModelRegressionTest.java | 5 +++--
.../causeway/testdomain/domainmodel/SpecLoaderTest.java | 5 +++--
.../eventhandling/GenericEventPublishingTest.java | 5 +++--
.../causeway/testdomain/factory/ViewModelFactoryTest.java | 5 +++--
.../causeway/testdomain/interact/ActionInteractionTest.java | 5 +++--
.../ActionInteractionTest_notUsingAllowSafeSemantics.java | 7 ++++---
.../ActionInteractionTest_usingAllowSafeSemantics.java | 7 ++++---
.../testdomain/interact/CollectionInteractionTest.java | 5 +++--
.../causeway/testdomain/interact/CommandArgumentTest.java | 5 +++--
.../causeway/testdomain/interact/CustomContextTest.java | 5 +++--
.../interact/CustomContextWithNoPermissionChecksTest.java | 5 +++--
.../causeway/testdomain/interact/NewParameterModelTest.java | 5 +++--
.../causeway/testdomain/interact/PropertyBindingTest.java | 5 +++--
.../testdomain/interact/PropertyInteractionTest.java | 5 +++--
.../testdomain/interact/ScalarParamNegotiationTest.java | 5 +++--
.../testdomain/interact/WrapperInteractionTest.java | 5 +++--
.../testdomain/interact/WrapperInteractionTest2.java | 5 +++--
.../testdomain/interact/WrapperInteractionTest3.java | 5 +++--
.../testdomain/interact/WrapperInteractionTest4.java | 5 +++--
.../layouts/integtest/Layout_Counter_IntegTest.java | 8 ++++----
.../layouts/integtest/Layout_SimpleObject_IntegTest.java | 8 ++++----
.../testdomain/domainmodel/jdo/DomainModelTest.java | 8 +++++---
.../testdomain/injecting/jdo/JdoEntityInjectingTest.java | 7 ++++---
.../testdomain/persistence/jdo/JdoBootstrappingTest.java | 7 ++++---
.../jdo/JdoExceptionTranslationTest_usingTransactional.java | 11 ++++++-----
.../causeway/testdomain/persistence/jdo/JdoJaxbTest.java | 1 +
.../causeway/testdomain/persistence/jdo/JdoQueryTest.java | 7 ++++---
.../testdomain/persistence/jdo/_JdoExceptionTranslator.java | 3 ++-
.../testdomain/timestamping/jdo/JdoTimestampingTest.java | 5 +++--
.../JdoTransactionRollbackTest_usingTransactionService.java | 5 +++--
.../jdo/JdoTransactionRollbackTest_usingTransactional.java | 5 +++--
.../causeway/testdomain/wrapper/jdo/JdoWrapperSyncTest.java | 5 +++--
.../testdomain/injecting/jpa/JpaEntityInjectingTest.java | 7 ++++---
.../testdomain/persistence/jpa/JpaBootstrappingTest.java | 11 ++++++-----
.../persistence/jpa/JpaExceptionTranslationTest.java | 9 +++++----
.../jpa/JpaExceptionTranslationTest_usingTransactional.java | 13 +++++++------
.../causeway/testdomain/persistence/jpa/JpaJaxbTest.java | 1 +
.../causeway/testdomain/persistence/jpa/JpaQueryTest.java | 7 ++++---
.../JpaGeneratedLongIdEntityLifecycleTest.java | 7 ++++---
.../JpaNonGeneratedStringIdEntityLifecycleTest.java | 7 ++++---
.../jpa/springdata/SpringDataJpaBootstrappingTest.java | 11 ++++++-----
.../testdomain/transactions/jpa/CommitListener.java | 10 +++++-----
.../JpaTransactionRollbackTest_usingInteractionService.java | 7 ++++---
.../JpaTransactionRollbackTest_usingTransactionService.java | 7 ++++---
.../jpa/JpaTransactionRollbackTest_usingTransactional.java | 5 +++--
.../transactions/jpa/JpaTransactionScopeListenerTest.java | 5 +++--
.../causeway/testdomain/rest/JsonValueEncoderTest.java | 5 +++--
.../causeway/testdomain/rest/RestServiceStressTest.java | 9 +++++----
.../apache/causeway/testdomain/rest/RestServiceTest.java | 9 +++++----
.../causeway/testdomain/value/ValueSemanticsTest.java | 5 +++--
.../testdomain/viewers/common/wkt/InteractionTestWkt.java | 11 ++++++-----
.../testdomain/viewers/common/wkt/LoggerSetupTestWkt.java | 5 +++--
.../testdomain/viewers/jdo/wkt/InteractionTestJdoWkt.java | 5 +++--
.../testdomain/viewers/jpa/wkt/InteractionTestJpaWkt.java | 5 +++--
.../causeway/testdomain/conf/Configuration_usingWicket.java | 12 +++++++-----
.../causeway/testdomain/fixtures/EntityTestFixtures.java | 4 ++--
.../org/apache/causeway/testdomain/jdo/JdoInventoryDao.java | 6 +++---
.../org/apache/causeway/testdomain/jdo/JdoTestFixtures.java | 4 ++--
.../apache/causeway/testdomain/jdo/entities/JdoBook.java | 5 +++--
.../causeway/testdomain/jdo/entities/JdoInventory.java | 3 ++-
.../apache/causeway/testdomain/jdo/entities/JdoProduct.java | 3 ++-
.../causeway/testdomain/jdo/entities/JdoProductComment.java | 3 ++-
.../org/apache/causeway/testdomain/jpa/JpaInventoryDao.java | 6 +++---
.../org/apache/causeway/testdomain/jpa/JpaTestFixtures.java | 4 ++--
.../model/valuetypes/ValueTypeExampleService.java | 1 +
.../publishing/PublishingTestFactoryAbstract.java | 7 ++++---
.../testdomain/publishing/PublishingTestFactoryJdo.java | 7 ++++---
.../testdomain/publishing/PublishingTestFactoryJpa.java | 4 ++--
.../util/interaction/DomainObjectTesterFactory.java | 6 ++++--
.../util/interaction/InteractionBoundaryProbe.java | 1 +
.../util/interaction/InteractionTestAbstract.java | 4 ++--
.../apache/causeway/testdomain/wrapperfactory/Counter.java | 3 ++-
.../applib/classrules/ArchitectureJdoRules.java | 3 ++-
.../archtestsupport/applib/entity/jdo/dom/JdoEntity.java | 3 ++-
.../archtestsupport/applib/entity/jdo/dom/JdoEntity2.java | 1 +
.../applib/entity/jdo/dom/JdoEntitySubtype.java | 1 +
.../demoapp/demomodule/dom/FakeDataDemoObjectWithAll.java | 2 ++
.../integtests/FakeDataModuleIntegTestAbstract.java | 4 ++--
.../fakedata/integtests/tests/Bootstrap_IntegTest.java | 1 +
.../applib/CausewayIntegrationGwtAbstractWithFixtures.java | 3 ---
.../fixtures/applib/fixturescripts/FixtureScript.java | 1 +
.../fixtures/applib/fixturescripts/FixtureScripts.java | 1 +
.../applib/teardown/jdo/TeardownFixtureJdoAbstract.java | 3 ++-
.../testing/h2console/ui/webmodule/WebModuleH2Console.java | 2 ++
.../applib/CausewayIntegrationGwtAbstract.java | 3 ++-
.../causeway/testing/integtestsupport/applib/_Helper.java | 1 +
.../applib/validate/DomainModelValidator.java | 5 +++++
.../applib/integration/ObjectFactoryForIntegration.java | 3 ++-
.../unittestsupport/applib/jmocking/JUnitRuleMockery2.java | 3 ++-
106 files changed, 328 insertions(+), 230 deletions(-)
diff --git a/regressiontests/stable-bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/AutoConfigurationTest.java b/regressiontests/stable-bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/AutoConfigurationTest.java
index 9c2b7bdce1..10e01d5226 100644
--- a/regressiontests/stable-bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/AutoConfigurationTest.java
+++ b/regressiontests/stable-bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/AutoConfigurationTest.java
@@ -22,6 +22,11 @@ import jakarta.inject.Inject;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.boot.test.context.SpringBootTest;
@@ -29,10 +34,6 @@ import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Component;
import org.springframework.test.context.TestPropertySource;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
import org.apache.causeway.applib.services.registry.ServiceRegistry;
import org.apache.causeway.core.config.beans.CausewayBeanFactoryPostProcessorForSpring;
import org.apache.causeway.core.config.beans.CausewayBeanTypeRegistry;
diff --git a/regressiontests/stable-bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/SpringServiceInjectPriorityTest.java b/regressiontests/stable-bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/SpringServiceInjectPriorityTest.java
index 5c7085e584..663ca6763a 100644
--- a/regressiontests/stable-bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/SpringServiceInjectPriorityTest.java
+++ b/regressiontests/stable-bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/SpringServiceInjectPriorityTest.java
@@ -26,12 +26,6 @@ import jakarta.inject.Inject;
import jakarta.inject.Named;
import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-import org.springframework.stereotype.Service;
-import org.springframework.test.context.TestPropertySource;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
@@ -39,6 +33,13 @@ import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Service;
+import org.springframework.test.context.TestPropertySource;
+
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.inject.ServiceInjector;
diff --git a/regressiontests/stable-bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/SpringServiceProvisioningTest.java b/regressiontests/stable-bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/SpringServiceProvisioningTest.java
index 2e0324fbe4..70662b241f 100644
--- a/regressiontests/stable-bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/SpringServiceProvisioningTest.java
+++ b/regressiontests/stable-bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/SpringServiceProvisioningTest.java
@@ -28,12 +28,13 @@ import jakarta.inject.Inject;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+
import org.apache.causeway.applib.services.registry.ServiceRegistry;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.ioc._ManagedBeanAdapter;
diff --git a/regressiontests/stable-cmdexecauditsess/generic/src/main/java/org/apache/causeway/regressiontests/cmdexecauditsess/generic/integtest/CmdExecAuditSessLog_IntegTestAbstract.java b/regressiontests/stable-cmdexecauditsess/generic/src/main/java/org/apache/causeway/regressiontests/cmdexecauditsess/generic/integtest/CmdExecAuditSessLog_IntegTestAbstract.java
index edf3589619..d1032e3355 100644
--- a/regressiontests/stable-cmdexecauditsess/generic/src/main/java/org/apache/causeway/regressiontests/cmdexecauditsess/generic/integtest/CmdExecAuditSessLog_IntegTestAbstract.java
+++ b/regressiontests/stable-cmdexecauditsess/generic/src/main/java/org/apache/causeway/regressiontests/cmdexecauditsess/generic/integtest/CmdExecAuditSessLog_IntegTestAbstract.java
@@ -28,6 +28,7 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertThat;
import org.apache.causeway.applib.mixins.system.DomainChangeRecord;
import org.apache.causeway.applib.services.bookmark.Bookmark;
diff --git a/regressiontests/stable-cmdexecauditsess/persistence-jdo/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jdo/integtests/model/Counter.java b/regressiontests/stable-cmdexecauditsess/persistence-jdo/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jdo/integtests/model/Counter.java
index 166bf0bb58..d50a7180d7 100644
--- a/regressiontests/stable-cmdexecauditsess/persistence-jdo/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jdo/integtests/model/Counter.java
+++ b/regressiontests/stable-cmdexecauditsess/persistence-jdo/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jdo/integtests/model/Counter.java
@@ -20,12 +20,13 @@
package org.apache.causeway.regressiontests.cmdexecauditsess.jdo.integtests.model;
-import jakarta.inject.Named;
import javax.jdo.annotations.Column;
import javax.jdo.annotations.DatastoreIdentity;
import javax.jdo.annotations.IdGeneratorStrategy;
import javax.jdo.annotations.PersistenceCapable;
+import jakarta.inject.Named;
+
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.Publishing;
diff --git a/regressiontests/stable-config/src/test/java/org/apache/causeway/testdomain/config/CausewayConfigBeanTest.java b/regressiontests/stable-config/src/test/java/org/apache/causeway/testdomain/config/CausewayConfigBeanTest.java
index ae7b09735b..cfc8b8c009 100644
--- a/regressiontests/stable-config/src/test/java/org/apache/causeway/testdomain/config/CausewayConfigBeanTest.java
+++ b/regressiontests/stable-config/src/test/java/org/apache/causeway/testdomain/config/CausewayConfigBeanTest.java
@@ -21,12 +21,13 @@ package org.apache.causeway.testdomain.config;
import jakarta.inject.Inject;
import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.CausewayModuleCoreConfig;
import org.apache.causeway.core.config.presets.CausewayPresets;
diff --git a/regressiontests/stable-config/src/test/java/org/apache/causeway/testdomain/config/CausewayConfigBeanTest_usingHeadless.java b/regressiontests/stable-config/src/test/java/org/apache/causeway/testdomain/config/CausewayConfigBeanTest_usingHeadless.java
index 27e45cdeab..f06ed68a31 100644
--- a/regressiontests/stable-config/src/test/java/org/apache/causeway/testdomain/config/CausewayConfigBeanTest_usingHeadless.java
+++ b/regressiontests/stable-config/src/test/java/org/apache/causeway/testdomain/config/CausewayConfigBeanTest_usingHeadless.java
@@ -21,12 +21,13 @@ package org.apache.causeway.testdomain.config;
import jakarta.inject.Inject;
import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_headless;
diff --git a/regressiontests/stable-config/src/test/java/org/apache/causeway/testdomain/config/EmailServiceDefault_IntegTest.java b/regressiontests/stable-config/src/test/java/org/apache/causeway/testdomain/config/EmailServiceDefault_IntegTest.java
index e3cb243765..4b06f2a3d8 100644
--- a/regressiontests/stable-config/src/test/java/org/apache/causeway/testdomain/config/EmailServiceDefault_IntegTest.java
+++ b/regressiontests/stable-config/src/test/java/org/apache/causeway/testdomain/config/EmailServiceDefault_IntegTest.java
@@ -33,6 +33,10 @@ import com.icegreen.greenmail.util.ServerSetupTest;
import org.json.JSONException;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Bean;
@@ -41,9 +45,6 @@ import org.springframework.mail.javamail.JavaMailSender;
import org.springframework.mail.javamail.JavaMailSenderImpl;
import org.springframework.test.context.TestPropertySource;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.io.TextUtils;
import org.apache.causeway.core.config.presets.CausewayPresets;
diff --git a/regressiontests/stable-config/src/test/java/org/apache/causeway/testdomain/config/FooTest.java b/regressiontests/stable-config/src/test/java/org/apache/causeway/testdomain/config/FooTest.java
index 3fe1432fb9..6a74d40d72 100644
--- a/regressiontests/stable-config/src/test/java/org/apache/causeway/testdomain/config/FooTest.java
+++ b/regressiontests/stable-config/src/test/java/org/apache/causeway/testdomain/config/FooTest.java
@@ -25,6 +25,11 @@ import jakarta.inject.Inject;
import jakarta.inject.Named;
import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.SpringBootTest;
@@ -32,10 +37,6 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.TestPropertySource;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import org.apache.causeway.core.config.presets.CausewayPresets;
@SpringBootTest(
diff --git a/regressiontests/stable-core-wrapperfactory/src/test/java/org/apache/causeway/regressiontests/core/wrapperfactory/integtests/CoreWrapperFactory_IntegTestAbstract.java b/regressiontests/stable-core-wrapperfactory/src/test/java/org/apache/causeway/regressiontests/core/wrapperfactory/integtests/CoreWrapperFactory_IntegTestAbstract.java
index 4bde216c80..d5156ac149 100644
--- a/regressiontests/stable-core-wrapperfactory/src/test/java/org/apache/causeway/regressiontests/core/wrapperfactory/integtests/CoreWrapperFactory_IntegTestAbstract.java
+++ b/regressiontests/stable-core-wrapperfactory/src/test/java/org/apache/causeway/regressiontests/core/wrapperfactory/integtests/CoreWrapperFactory_IntegTestAbstract.java
@@ -21,6 +21,7 @@ package org.apache.causeway.regressiontests.core.wrapperfactory.integtests;
import jakarta.inject.Inject;
import org.junit.jupiter.api.BeforeAll;
+
import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
diff --git a/regressiontests/stable-core-wrapperfactory/src/test/java/org/apache/causeway/regressiontests/core/wrapperfactory/integtests/WrapperFactory_async_IntegTest.java b/regressiontests/stable-core-wrapperfactory/src/test/java/org/apache/causeway/regressiontests/core/wrapperfactory/integtests/WrapperFactory_async_IntegTest.java
index 832bcf04ed..6270b8b772 100644
--- a/regressiontests/stable-core-wrapperfactory/src/test/java/org/apache/causeway/regressiontests/core/wrapperfactory/integtests/WrapperFactory_async_IntegTest.java
+++ b/regressiontests/stable-core-wrapperfactory/src/test/java/org/apache/causeway/regressiontests/core/wrapperfactory/integtests/WrapperFactory_async_IntegTest.java
@@ -33,6 +33,7 @@ import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.causeway.applib.services.bookmark.Bookmark;
diff --git a/regressiontests/stable-cucumber/src/test/java/org/apache/causeway/testdomain/cucumber/StepDefs.java b/regressiontests/stable-cucumber/src/test/java/org/apache/causeway/testdomain/cucumber/StepDefs.java
index 8d82d58921..6c82a5aefa 100644
--- a/regressiontests/stable-cucumber/src/test/java/org/apache/causeway/testdomain/cucumber/StepDefs.java
+++ b/regressiontests/stable-cucumber/src/test/java/org/apache/causeway/testdomain/cucumber/StepDefs.java
@@ -18,10 +18,10 @@
*/
package org.apache.causeway.testdomain.cucumber;
-import org.springframework.boot.test.context.SpringBootTest;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.springframework.boot.test.context.SpringBootTest;
+
import org.apache.causeway.testdomain.conf.Configuration_headless;
import io.cucumber.java.en.Given;
diff --git a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/AnnotationSyntesizerTest.java b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/AnnotationSyntesizerTest.java
index 40d93ed5c7..b3107fc267 100644
--- a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/AnnotationSyntesizerTest.java
+++ b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/AnnotationSyntesizerTest.java
@@ -21,13 +21,14 @@ package org.apache.causeway.testdomain.domainmodel;
import jakarta.inject.Inject;
import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
-import org.springframework.util.ReflectionUtils;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.fail;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.util.ReflectionUtils;
+
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.events.domain.ActionDomainEvent;
import org.apache.causeway.applib.services.jaxb.JaxbService;
diff --git a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_forEditing.java b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_forEditing.java
index adb70b0966..7be2473f25 100644
--- a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_forEditing.java
+++ b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_forEditing.java
@@ -23,20 +23,21 @@ import jakarta.xml.bind.annotation.XmlRootElement;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
import static org.junit.Assert.assertTrue;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.services.wrapper.DisabledException;
import org.apache.causeway.applib.services.wrapper.WrapperFactory;
import org.apache.causeway.core.config.presets.CausewayPresets;
-import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
import org.apache.causeway.core.metamodel.spec.IntrospectionState;
+import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
import org.apache.causeway.testdomain.conf.Configuration_headless;
import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
diff --git a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_usingBadDomain.java b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
index b984d2942a..f37532e24e 100644
--- a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
+++ b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
@@ -30,13 +30,14 @@ import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import org.junit.jupiter.params.provider.ValueSource;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_usingBadDomain_noAnnotationEnforced.java b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_usingBadDomain_noAnnotationEnforced.java
index c26bd920b1..b9f15b2e75 100644
--- a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_usingBadDomain_noAnnotationEnforced.java
+++ b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_usingBadDomain_noAnnotationEnforced.java
@@ -21,12 +21,13 @@ package org.apache.causeway.testdomain.domainmodel;
import jakarta.inject.Inject;
import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.config.metamodel.specloader.IntrospectionMode;
diff --git a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
index 919b38e6aa..18186288e5 100644
--- a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
+++ b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
@@ -24,15 +24,11 @@ import java.util.stream.Stream;
import jakarta.inject.Inject;
-import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
-
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import org.junit.jupiter.params.provider.ValueSource;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -41,6 +37,9 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+
import org.apache.causeway.applib.annotation.Introspection.EncapsulationPolicy;
import org.apache.causeway.applib.annotation.Introspection.MemberAnnotationPolicy;
import org.apache.causeway.applib.id.LogicalType;
@@ -109,6 +108,7 @@ import org.apache.causeway.testdomain.model.good.ProperViewModelInferredFromNotB
import org.apache.causeway.testdomain.model.good.ViewModelWithAnnotationOptionalUsingPrivateSupport;
import org.apache.causeway.testdomain.model.good.ViewModelWithEncapsulatedMembers;
import org.apache.causeway.testdomain.util.interaction.DomainObjectTesterFactory;
+import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
import org.apache.causeway.testing.integtestsupport.applib.validate.DomainModelValidator;
import lombok.val;
diff --git a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/MetaModelRegressionTest.java b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/MetaModelRegressionTest.java
index dc95f868b7..58214b032f 100644
--- a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/MetaModelRegressionTest.java
+++ b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/MetaModelRegressionTest.java
@@ -28,11 +28,12 @@ import org.approvaltests.reporters.DiffReporter;
import org.approvaltests.reporters.UseReporter;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+
import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.services.metamodel.MetaModelServiceMenu;
import org.apache.causeway.applib.services.metamodel.MetaModelServiceMenu.ExportFormat;
diff --git a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/SpecLoaderTest.java b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/SpecLoaderTest.java
index 05ac4a1831..1b8a96c048 100644
--- a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/SpecLoaderTest.java
+++ b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/SpecLoaderTest.java
@@ -22,12 +22,13 @@ import jakarta.inject.Inject;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
import org.apache.causeway.testdomain.conf.Configuration_headless;
diff --git a/regressiontests/stable-eventhandling/src/test/java/org/apache/causeway/testdomain/eventhandling/GenericEventPublishingTest.java b/regressiontests/stable-eventhandling/src/test/java/org/apache/causeway/testdomain/eventhandling/GenericEventPublishingTest.java
index 054b81e91c..72631e6ae9 100644
--- a/regressiontests/stable-eventhandling/src/test/java/org/apache/causeway/testdomain/eventhandling/GenericEventPublishingTest.java
+++ b/regressiontests/stable-eventhandling/src/test/java/org/apache/causeway/testdomain/eventhandling/GenericEventPublishingTest.java
@@ -21,13 +21,14 @@ package org.apache.causeway.testdomain.eventhandling;
import jakarta.inject.Inject;
import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Service;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import org.apache.causeway.applib.services.eventbus.EventBusService;
import org.apache.causeway.core.runtimeservices.eventbus.EventBusServiceSpring;
diff --git a/regressiontests/stable-factory/src/test/java/org/apache/causeway/testdomain/factory/ViewModelFactoryTest.java b/regressiontests/stable-factory/src/test/java/org/apache/causeway/testdomain/factory/ViewModelFactoryTest.java
index fcb8625d10..b4ce26424c 100644
--- a/regressiontests/stable-factory/src/test/java/org/apache/causeway/testdomain/factory/ViewModelFactoryTest.java
+++ b/regressiontests/stable-factory/src/test/java/org/apache/causeway/testdomain/factory/ViewModelFactoryTest.java
@@ -22,13 +22,14 @@ import jakarta.annotation.PostConstruct;
import jakarta.inject.Inject;
import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+
import org.apache.causeway.applib.ViewModel;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Nature;
diff --git a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/ActionInteractionTest.java b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/ActionInteractionTest.java
index 99f2c35972..982803feea 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/ActionInteractionTest.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/ActionInteractionTest.java
@@ -22,14 +22,15 @@ import java.util.List;
import java.util.function.UnaryOperator;
import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.collections._Lists;
diff --git a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/ActionInteractionTest_notUsingAllowSafeSemantics.java b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/ActionInteractionTest_notUsingAllowSafeSemantics.java
index 66b07de1c5..713b2e5217 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/ActionInteractionTest_notUsingAllowSafeSemantics.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/ActionInteractionTest_notUsingAllowSafeSemantics.java
@@ -21,14 +21,15 @@ package org.apache.causeway.testdomain.interact;
import jakarta.inject.Named;
import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.stereotype.Service;
import org.springframework.test.context.TestPropertySource;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.annotation.Where;
diff --git a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/ActionInteractionTest_usingAllowSafeSemantics.java b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/ActionInteractionTest_usingAllowSafeSemantics.java
index bfe3242e09..f8e16de75e 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/ActionInteractionTest_usingAllowSafeSemantics.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/ActionInteractionTest_usingAllowSafeSemantics.java
@@ -21,14 +21,15 @@ package org.apache.causeway.testdomain.interact;
import jakarta.inject.Named;
import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.stereotype.Service;
import org.springframework.test.context.TestPropertySource;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.annotation.SemanticsOf;
diff --git a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CollectionInteractionTest.java b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CollectionInteractionTest.java
index fe45b12a1d..a6959fbdb2 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CollectionInteractionTest.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CollectionInteractionTest.java
@@ -22,11 +22,12 @@ import java.util.List;
import java.util.stream.Collectors;
import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.core.config.metamodel.facets.AssociationLayoutConfigOptions;
import org.apache.causeway.core.config.presets.CausewayPresets;
diff --git a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CommandArgumentTest.java b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CommandArgumentTest.java
index 4caa3f9f4f..45d5a70056 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CommandArgumentTest.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CommandArgumentTest.java
@@ -31,12 +31,13 @@ import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlType;
import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Nature;
diff --git a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CustomContextTest.java b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CustomContextTest.java
index 8d00a6ad65..40881c6b6c 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CustomContextTest.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CustomContextTest.java
@@ -25,13 +25,14 @@ import java.util.Locale;
import jakarta.inject.Inject;
import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants.DateTimeFormat;
diff --git a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CustomContextWithNoPermissionChecksTest.java b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CustomContextWithNoPermissionChecksTest.java
index a03043249d..c762928678 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CustomContextWithNoPermissionChecksTest.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CustomContextWithNoPermissionChecksTest.java
@@ -22,12 +22,13 @@ import jakarta.inject.Inject;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.TestPropertySource;
-import static org.assertj.core.api.Assertions.assertThat;
-
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_headless;
diff --git a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/NewParameterModelTest.java b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/NewParameterModelTest.java
index ef192a8c22..7977d645f0 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/NewParameterModelTest.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/NewParameterModelTest.java
@@ -23,13 +23,14 @@ import java.util.stream.Collectors;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.config.presets.CausewayPresets;
diff --git a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/PropertyBindingTest.java b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/PropertyBindingTest.java
index 6633a31e79..4cadd25fae 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/PropertyBindingTest.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/PropertyBindingTest.java
@@ -20,14 +20,15 @@ package org.apache.causeway.testdomain.interact;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.interactions.managed.PropertyNegotiationModel;
diff --git a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/PropertyInteractionTest.java b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/PropertyInteractionTest.java
index b0c88e0b63..0ac8896fad 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/PropertyInteractionTest.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/PropertyInteractionTest.java
@@ -19,11 +19,12 @@
package org.apache.causeway.testdomain.interact;
import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+
import org.apache.causeway.applib.annotation.LabelPosition;
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.core.config.presets.CausewayPresets;
diff --git a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/ScalarParamNegotiationTest.java b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/ScalarParamNegotiationTest.java
index 68787c3749..24a6435ade 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/ScalarParamNegotiationTest.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/ScalarParamNegotiationTest.java
@@ -20,13 +20,14 @@ package org.apache.causeway.testdomain.interact;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.interactions.managed.ParameterNegotiationModel;
diff --git a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteractionTest.java b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteractionTest.java
index 8b3cb6b9a3..b941d09341 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteractionTest.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteractionTest.java
@@ -21,14 +21,15 @@ package org.apache.causeway.testdomain.interact;
import jakarta.inject.Inject;
import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Nature;
diff --git a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteractionTest2.java b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteractionTest2.java
index 7c86754194..77c22c7876 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteractionTest2.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteractionTest2.java
@@ -21,14 +21,15 @@ package org.apache.causeway.testdomain.interact;
import jakarta.inject.Inject;
import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Nature;
diff --git a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteractionTest3.java b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteractionTest3.java
index 6b2ae2c994..ecd92ff9d2 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteractionTest3.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteractionTest3.java
@@ -26,13 +26,14 @@ import jakarta.inject.Inject;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Nature;
diff --git a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteractionTest4.java b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteractionTest4.java
index 81c29f5199..b4b56f2abe 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteractionTest4.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteractionTest4.java
@@ -26,13 +26,14 @@ import jakarta.inject.Inject;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Nature;
diff --git a/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_Counter_IntegTest.java b/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_Counter_IntegTest.java
index 262fd7b3db..a93da91518 100644
--- a/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_Counter_IntegTest.java
+++ b/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_Counter_IntegTest.java
@@ -26,12 +26,13 @@ import java.util.stream.Collectors;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
-import org.apache.causeway.persistence.commons.CausewayModulePersistenceCommons;
-
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
@@ -47,8 +48,6 @@ import org.springframework.transaction.TransactionException;
import org.springframework.transaction.support.AbstractPlatformTransactionManager;
import org.springframework.transaction.support.DefaultTransactionStatus;
-import static org.assertj.core.api.Assertions.assertThat;
-
import org.apache.causeway.applib.CausewayModuleApplibMixins;
import org.apache.causeway.applib.annotation.ActionLayout;
import org.apache.causeway.applib.layout.LayoutConstants;
@@ -66,6 +65,7 @@ import org.apache.causeway.core.metamodel.spec.feature.MixedIn;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
+import org.apache.causeway.persistence.commons.CausewayModulePersistenceCommons;
import org.apache.causeway.regressiontests.layouts.integtest.model.Counter;
import org.apache.causeway.regressiontests.layouts.integtest.model.LayoutTestDomainModel;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
diff --git a/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_SimpleObject_IntegTest.java b/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_SimpleObject_IntegTest.java
index 8def05c74a..ec1c43c9d8 100644
--- a/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_SimpleObject_IntegTest.java
+++ b/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_SimpleObject_IntegTest.java
@@ -24,11 +24,12 @@ import java.util.stream.Collectors;
import jakarta.inject.Inject;
-import org.apache.causeway.persistence.commons.CausewayModulePersistenceCommons;
-
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
@@ -38,8 +39,6 @@ import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
-import static org.assertj.core.api.Assertions.assertThat;
-
import org.apache.causeway.applib.CausewayModuleApplibMixins;
import org.apache.causeway.applib.annotation.ActionLayout;
import org.apache.causeway.applib.layout.LayoutConstants;
@@ -56,6 +55,7 @@ import org.apache.causeway.core.metamodel.spec.feature.MixedIn;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
+import org.apache.causeway.persistence.commons.CausewayModulePersistenceCommons;
import org.apache.causeway.regressiontests.layouts.integtest.model.LayoutTestDomainModel;
import org.apache.causeway.regressiontests.layouts.integtest.model.SimpleObject;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
diff --git a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/domainmodel/jdo/DomainModelTest.java b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/domainmodel/jdo/DomainModelTest.java
index dc0fb47a22..eeb9f272cc 100644
--- a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/domainmodel/jdo/DomainModelTest.java
+++ b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/domainmodel/jdo/DomainModelTest.java
@@ -18,18 +18,20 @@
*/
package org.apache.causeway.testdomain.domainmodel.jdo;
-import jakarta.inject.Inject;
import javax.jdo.annotations.IdGeneratorStrategy;
import javax.jdo.annotations.IdentityType;
+import jakarta.inject.Inject;
+
import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+
import org.apache.causeway.applib.services.metamodel.BeanSort;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
import org.apache.causeway.core.config.presets.CausewayPresets;
diff --git a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/injecting/jdo/JdoEntityInjectingTest.java b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/injecting/jdo/JdoEntityInjectingTest.java
index 6ea0d4db15..17bbba944e 100644
--- a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/injecting/jdo/JdoEntityInjectingTest.java
+++ b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/injecting/jdo/JdoEntityInjectingTest.java
@@ -24,14 +24,15 @@ import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.Commit;
import org.springframework.test.context.TestPropertySource;
import org.springframework.transaction.annotation.Transactional;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.causeway.commons.internal.primitives._Longs.Bound;
diff --git a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoBootstrappingTest.java b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoBootstrappingTest.java
index 3939f3a753..10c3abd680 100644
--- a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoBootstrappingTest.java
+++ b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoBootstrappingTest.java
@@ -27,14 +27,15 @@ import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.Commit;
import org.springframework.test.context.TestPropertySource;
import org.springframework.transaction.annotation.Transactional;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
diff --git a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoExceptionTranslationTest_usingTransactional.java b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoExceptionTranslationTest_usingTransactional.java
index 9f78e35e00..ece0557689 100644
--- a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoExceptionTranslationTest_usingTransactional.java
+++ b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoExceptionTranslationTest_usingTransactional.java
@@ -28,6 +28,12 @@ import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
+
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.test.annotation.Commit;
@@ -35,11 +41,6 @@ import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.TestPropertySources;
import org.springframework.transaction.annotation.Transactional;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.fail;
-
import org.apache.causeway.commons.functional.ThrowingRunnable;
import org.apache.causeway.commons.functional.Try;
import org.apache.causeway.core.config.presets.CausewayPresets;
diff --git a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoJaxbTest.java b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoJaxbTest.java
index 1672c018f2..8ee6db5276 100644
--- a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoJaxbTest.java
+++ b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoJaxbTest.java
@@ -21,6 +21,7 @@ package org.apache.causeway.testdomain.persistence.jdo;
import jakarta.inject.Inject;
import org.junit.jupiter.api.Test;
+
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
diff --git a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoQueryTest.java b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoQueryTest.java
index bbf2e92dd9..a5b70f5239 100644
--- a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoQueryTest.java
+++ b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoQueryTest.java
@@ -26,13 +26,14 @@ import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
-import org.springframework.transaction.annotation.Transactional;
import static org.junit.Assert.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.transaction.annotation.Transactional;
+
import org.apache.causeway.applib.query.Query;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
diff --git a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/_JdoExceptionTranslator.java b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/_JdoExceptionTranslator.java
index 3c5f6db144..25a2da0237 100644
--- a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/_JdoExceptionTranslator.java
+++ b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/_JdoExceptionTranslator.java
@@ -25,10 +25,11 @@ import javax.jdo.JDOException;
import org.datanucleus.api.jdo.JDOAdapter;
import org.datanucleus.exceptions.NucleusException;
-import org.springframework.dao.DataAccessException;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.springframework.dao.DataAccessException;
+
import org.apache.causeway.commons.functional.Try;
import org.apache.causeway.persistence.jdo.spring.integration.JdoTransactionManager;
diff --git a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/timestamping/jdo/JdoTimestampingTest.java b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/timestamping/jdo/JdoTimestampingTest.java
index 8d73ea04b3..fd3b7aaf3c 100644
--- a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/timestamping/jdo/JdoTimestampingTest.java
+++ b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/timestamping/jdo/JdoTimestampingTest.java
@@ -21,12 +21,13 @@ package org.apache.causeway.testdomain.timestamping.jdo;
import jakarta.inject.Inject;
import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.transaction.annotation.Transactional;
import static org.junit.Assert.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.transaction.annotation.Transactional;
+
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
import org.apache.causeway.testdomain.jdo.RegressionTestWithJdoFixtures;
diff --git a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/transactions/jdo/JdoTransactionRollbackTest_usingTransactionService.java b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/transactions/jdo/JdoTransactionRollbackTest_usingTransactionService.java
index 647f9282d7..f99b1578b1 100644
--- a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/transactions/jdo/JdoTransactionRollbackTest_usingTransactionService.java
+++ b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/transactions/jdo/JdoTransactionRollbackTest_usingTransactionService.java
@@ -23,12 +23,13 @@ import jakarta.inject.Inject;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.applib.services.xactn.TransactionService;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
diff --git a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/transactions/jdo/JdoTransactionRollbackTest_usingTransactional.java b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/transactions/jdo/JdoTransactionRollbackTest_usingTransactional.java
index cbbf09bb91..d36c159423 100644
--- a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/transactions/jdo/JdoTransactionRollbackTest_usingTransactional.java
+++ b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/transactions/jdo/JdoTransactionRollbackTest_usingTransactional.java
@@ -24,13 +24,14 @@ import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.Commit;
import org.springframework.test.annotation.Rollback;
import org.springframework.transaction.annotation.Transactional;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.commons.internal.debug._Probe;
diff --git a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/wrapper/jdo/JdoWrapperSyncTest.java b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/wrapper/jdo/JdoWrapperSyncTest.java
index d7b09ab91e..23c282f2dc 100644
--- a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/wrapper/jdo/JdoWrapperSyncTest.java
+++ b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/wrapper/jdo/JdoWrapperSyncTest.java
@@ -25,11 +25,12 @@ import jakarta.inject.Inject;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+
import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.applib.services.wrapper.WrapperFactory;
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/injecting/jpa/JpaEntityInjectingTest.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/injecting/jpa/JpaEntityInjectingTest.java
index 37801bd08e..e1b0e73e57 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/injecting/jpa/JpaEntityInjectingTest.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/injecting/jpa/JpaEntityInjectingTest.java
@@ -24,14 +24,15 @@ import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.Commit;
import org.springframework.test.context.TestPropertySource;
import org.springframework.transaction.annotation.Transactional;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.causeway.commons.internal.primitives._Longs.Bound;
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaBootstrappingTest.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaBootstrappingTest.java
index c27d528056..083abf7645 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaBootstrappingTest.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaBootstrappingTest.java
@@ -28,6 +28,12 @@ import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.Rollback;
import org.springframework.test.context.TestPropertySource;
@@ -35,11 +41,6 @@ import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.support.DefaultTransactionDefinition;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaExceptionTranslationTest.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaExceptionTranslationTest.java
index c33000b7a0..011cd87f4f 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaExceptionTranslationTest.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaExceptionTranslationTest.java
@@ -22,15 +22,16 @@ import java.sql.SQLException;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.dao.DataAccessException;
-import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.TestPropertySources;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.dao.DataAccessException;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.TestPropertySources;
+
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJpa;
import org.apache.causeway.testdomain.jpa.RegressionTestWithJpaFixtures;
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaExceptionTranslationTest_usingTransactional.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaExceptionTranslationTest_usingTransactional.java
index 312fc8a7f5..4a9028a18b 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaExceptionTranslationTest_usingTransactional.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaExceptionTranslationTest_usingTransactional.java
@@ -28,12 +28,6 @@ import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.dao.DataIntegrityViolationException;
-import org.springframework.test.annotation.Rollback;
-import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.TestPropertySources;
-import org.springframework.transaction.annotation.Transactional;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -41,6 +35,13 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.test.annotation.Rollback;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.TestPropertySources;
+import org.springframework.transaction.annotation.Transactional;
+
import org.apache.causeway.commons.functional.ThrowingRunnable;
import org.apache.causeway.commons.functional.Try;
import org.apache.causeway.core.config.presets.CausewayPresets;
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaJaxbTest.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaJaxbTest.java
index 635ee3faed..833689e05b 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaJaxbTest.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaJaxbTest.java
@@ -21,6 +21,7 @@ package org.apache.causeway.testdomain.persistence.jpa;
import jakarta.inject.Inject;
import org.junit.jupiter.api.Test;
+
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaQueryTest.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaQueryTest.java
index 0eb4a21045..f6ec956c02 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaQueryTest.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaQueryTest.java
@@ -30,15 +30,16 @@ import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.Commit;
import org.springframework.test.context.TestPropertySource;
import org.springframework.transaction.annotation.Transactional;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import org.apache.causeway.applib.query.Query;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.core.config.presets.CausewayPresets;
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/entitylifecycle/JpaGeneratedLongIdEntityLifecycleTest.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/entitylifecycle/JpaGeneratedLongIdEntityLifecycleTest.java
index c86b7d3014..0ed9cde673 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/entitylifecycle/JpaGeneratedLongIdEntityLifecycleTest.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/entitylifecycle/JpaGeneratedLongIdEntityLifecycleTest.java
@@ -26,14 +26,15 @@ import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.Commit;
import org.springframework.test.context.TestPropertySource;
import org.springframework.transaction.annotation.Transactional;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import org.apache.causeway.applib.services.repository.EntityState;
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/entitylifecycle/JpaNonGeneratedStringIdEntityLifecycleTest.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/entitylifecycle/JpaNonGeneratedStringIdEntityLifecycleTest.java
index 016fc37ec1..be9400d243 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/entitylifecycle/JpaNonGeneratedStringIdEntityLifecycleTest.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/entitylifecycle/JpaNonGeneratedStringIdEntityLifecycleTest.java
@@ -26,14 +26,15 @@ import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.Commit;
import org.springframework.test.context.TestPropertySource;
import org.springframework.transaction.annotation.Transactional;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import org.apache.causeway.applib.services.repository.EntityState;
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
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 55de1b71f2..f9ebf921c8 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
@@ -26,6 +26,12 @@ import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
import org.springframework.test.annotation.DirtiesContext;
@@ -35,11 +41,6 @@ import org.springframework.test.context.TestPropertySource;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.support.DefaultTransactionDefinition;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/CommitListener.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/CommitListener.java
index 6ed6c3cd19..fcfe89fcb4 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/CommitListener.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/CommitListener.java
@@ -18,18 +18,18 @@
*/
package org.apache.causeway.testdomain.transactions.jpa;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-
import java.util.Optional;
import java.util.function.Consumer;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.support.TransactionSynchronization;
+
import org.apache.causeway.applib.annotation.TransactionScope;
import org.apache.causeway.applib.annotation.Value;
import org.apache.causeway.core.transaction.events.TransactionCompletionStatus;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.support.TransactionSynchronization;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
@Service
@TransactionScope
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingInteractionService.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingInteractionService.java
index 4322307d78..dacba357b7 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingInteractionService.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingInteractionService.java
@@ -24,13 +24,14 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.TestPropertySource;
+
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.applib.services.xactn.TransactionService;
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactionService.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactionService.java
index 67f5b4dae3..d604a03a4f 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactionService.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactionService.java
@@ -24,13 +24,14 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.TestPropertySource;
+
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.applib.services.xactn.TransactionService;
import org.apache.causeway.commons.internal.base._Refs;
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactional.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactional.java
index f37f03e27c..23df6b8b4c 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactional.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactional.java
@@ -24,13 +24,14 @@ import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.Commit;
import org.springframework.test.context.TestPropertySource;
import org.springframework.transaction.annotation.Transactional;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJpa;
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionScopeListenerTest.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionScopeListenerTest.java
index 9a21fea56e..606ddfa842 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionScopeListenerTest.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionScopeListenerTest.java
@@ -24,12 +24,13 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.TestPropertySource;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.applib.services.xactn.TransactionService;
diff --git a/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/JsonValueEncoderTest.java b/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/JsonValueEncoderTest.java
index cc97d43f8a..30cae9991b 100644
--- a/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/JsonValueEncoderTest.java
+++ b/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/JsonValueEncoderTest.java
@@ -26,14 +26,15 @@ import java.util.function.Consumer;
import jakarta.inject.Inject;
import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.nullValue;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+
import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.applib.value.Clob;
import org.apache.causeway.applib.value.NamedWithMimeType.CommonMimeType;
diff --git a/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceStressTest.java b/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceStressTest.java
index cdadfd75e8..90094a4115 100644
--- a/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceStressTest.java
+++ b/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceStressTest.java
@@ -25,15 +25,16 @@ import jakarta.inject.Inject;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.web.server.LocalServerPort;
-import org.springframework.context.annotation.Import;
-import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.context.annotation.Import;
+import org.springframework.test.context.TestPropertySource;
+
import org.apache.causeway.commons.internal.base._Timing;
import org.apache.causeway.commons.internal.debug.swt._Swt;
import org.apache.causeway.core.config.presets.CausewayPresets;
diff --git a/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceTest.java b/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceTest.java
index 77eeef6646..9dde851fb8 100644
--- a/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceTest.java
+++ b/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceTest.java
@@ -24,15 +24,16 @@ import jakarta.xml.bind.JAXBException;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.web.server.LocalServerPort;
-import org.springframework.context.annotation.Import;
-import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.context.annotation.Import;
+import org.springframework.test.context.TestPropertySource;
+
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.extensions.fullcalendar.applib.value.CalendarEventSemantics;
import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
diff --git a/regressiontests/stable-value/src/test/java/org/apache/causeway/testdomain/value/ValueSemanticsTest.java b/regressiontests/stable-value/src/test/java/org/apache/causeway/testdomain/value/ValueSemanticsTest.java
index a129129b04..1f536fbe52 100644
--- a/regressiontests/stable-value/src/test/java/org/apache/causeway/testdomain/value/ValueSemanticsTest.java
+++ b/regressiontests/stable-value/src/test/java/org/apache/causeway/testdomain/value/ValueSemanticsTest.java
@@ -30,12 +30,13 @@ import org.junit.jupiter.api.TestInstance.Lifecycle;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+
import org.apache.causeway.applib.graph.tree.TreeNode;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.inject.ServiceInjector;
diff --git a/regressiontests/stable-viewers-common/src/test/java/org/apache/causeway/testdomain/viewers/common/wkt/InteractionTestWkt.java b/regressiontests/stable-viewers-common/src/test/java/org/apache/causeway/testdomain/viewers/common/wkt/InteractionTestWkt.java
index ef147cfa1b..608dde1f94 100644
--- a/regressiontests/stable-viewers-common/src/test/java/org/apache/causeway/testdomain/viewers/common/wkt/InteractionTestWkt.java
+++ b/regressiontests/stable-viewers-common/src/test/java/org/apache/causeway/testdomain/viewers/common/wkt/InteractionTestWkt.java
@@ -26,17 +26,18 @@ import org.apache.wicket.util.tester.WicketTester;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.annotation.DirtiesContext.ClassMode;
-import org.springframework.test.annotation.DirtiesContext.MethodMode;
-import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.ClassMode;
+import org.springframework.test.annotation.DirtiesContext.MethodMode;
+import org.springframework.test.context.TestPropertySource;
+
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.commons.internal.base._Refs;
import org.apache.causeway.core.config.presets.CausewayPresets;
diff --git a/regressiontests/stable-viewers-common/src/test/java/org/apache/causeway/testdomain/viewers/common/wkt/LoggerSetupTestWkt.java b/regressiontests/stable-viewers-common/src/test/java/org/apache/causeway/testdomain/viewers/common/wkt/LoggerSetupTestWkt.java
index 536a29b8a7..57cebe264f 100644
--- a/regressiontests/stable-viewers-common/src/test/java/org/apache/causeway/testdomain/viewers/common/wkt/LoggerSetupTestWkt.java
+++ b/regressiontests/stable-viewers-common/src/test/java/org/apache/causeway/testdomain/viewers/common/wkt/LoggerSetupTestWkt.java
@@ -21,12 +21,13 @@ package org.apache.causeway.testdomain.viewers.common.wkt;
import org.apache.wicket.page.PartialPageUpdate;
import org.junit.jupiter.api.Test;
import org.slf4j.LoggerFactory;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.TestPropertySource;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-
import org.apache.causeway.core.config.presets.CausewayPresets;
import lombok.val;
diff --git a/regressiontests/stable-viewers-jdo/src/test/java/org/apache/causeway/testdomain/viewers/jdo/wkt/InteractionTestJdoWkt.java b/regressiontests/stable-viewers-jdo/src/test/java/org/apache/causeway/testdomain/viewers/jdo/wkt/InteractionTestJdoWkt.java
index a609cc38fe..f7ccb7d8c5 100644
--- a/regressiontests/stable-viewers-jdo/src/test/java/org/apache/causeway/testdomain/viewers/jdo/wkt/InteractionTestJdoWkt.java
+++ b/regressiontests/stable-viewers-jdo/src/test/java/org/apache/causeway/testdomain/viewers/jdo/wkt/InteractionTestJdoWkt.java
@@ -27,13 +27,14 @@ import org.datanucleus.PropertyNames;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+
import org.apache.causeway.applib.exceptions.unrecoverable.ObjectNotFoundException;
import org.apache.causeway.applib.id.LogicalType;
import org.apache.causeway.applib.services.bookmark.Bookmark;
diff --git a/regressiontests/stable-viewers-jpa/src/test/java/org/apache/causeway/testdomain/viewers/jpa/wkt/InteractionTestJpaWkt.java b/regressiontests/stable-viewers-jpa/src/test/java/org/apache/causeway/testdomain/viewers/jpa/wkt/InteractionTestJpaWkt.java
index 4d0c4cdd68..313a30b343 100644
--- a/regressiontests/stable-viewers-jpa/src/test/java/org/apache/causeway/testdomain/viewers/jpa/wkt/InteractionTestJpaWkt.java
+++ b/regressiontests/stable-viewers-jpa/src/test/java/org/apache/causeway/testdomain/viewers/jpa/wkt/InteractionTestJpaWkt.java
@@ -26,13 +26,14 @@ import org.apache.wicket.markup.html.basic.Label;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+
import org.apache.causeway.applib.exceptions.unrecoverable.ObjectNotFoundException;
import org.apache.causeway.applib.id.LogicalType;
import org.apache.causeway.applib.services.bookmark.Bookmark;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingWicket.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingWicket.java
index 3ddfa56225..a9eb73b2c6 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingWicket.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingWicket.java
@@ -38,12 +38,13 @@ import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.tester.WicketTester;
import org.junit.jupiter.api.function.ThrowingConsumer;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
@@ -64,9 +65,6 @@ import org.apache.causeway.viewer.wicket.ui.pages.entity.EntityPage;
import org.apache.causeway.viewer.wicket.viewer.CausewayModuleViewerWicketViewer;
import org.apache.causeway.viewer.wicket.viewer.wicketapp.CausewayWicketAjaxRequestListenerUtil;
-import de.agilecoders.wicket.core.Bootstrap;
-import de.agilecoders.wicket.core.settings.BootstrapSettings;
-import de.agilecoders.wicket.core.settings.IBootstrapSettings;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@@ -74,6 +72,10 @@ import lombok.SneakyThrows;
import lombok.val;
import lombok.experimental.Accessors;
+import de.agilecoders.wicket.core.Bootstrap;
+import de.agilecoders.wicket.core.settings.BootstrapSettings;
+import de.agilecoders.wicket.core.settings.IBootstrapSettings;
+
@Configuration
@Import({
CausewayModuleViewerWicketViewer.class,
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/fixtures/EntityTestFixtures.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/fixtures/EntityTestFixtures.java
index 46e29c2d47..cff89d0168 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/fixtures/EntityTestFixtures.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/fixtures/EntityTestFixtures.java
@@ -28,12 +28,12 @@ import java.util.stream.IntStream;
import jakarta.inject.Inject;
-import org.springframework.beans.factory.DisposableBean;
-
import static org.junit.Assert.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.springframework.beans.factory.DisposableBean;
+
import org.apache.causeway.applib.events.metamodel.MetamodelListener;
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.bookmark.BookmarkService;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/JdoInventoryDao.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/JdoInventoryDao.java
index 19931da8e5..9c52b4b3ee 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/JdoInventoryDao.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/JdoInventoryDao.java
@@ -20,13 +20,13 @@ package org.apache.causeway.testdomain.jdo;
import jakarta.inject.Inject;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.testdomain.jdo.entities.JdoBook;
import org.apache.causeway.testdomain.jdo.entities.JdoInventory;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/JdoTestFixtures.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/JdoTestFixtures.java
index 8d6dcf2a18..5bfadcc2d5 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/JdoTestFixtures.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/JdoTestFixtures.java
@@ -21,10 +21,10 @@ package org.apache.causeway.testdomain.jdo;
import java.util.SortedSet;
import java.util.TreeSet;
-import org.springframework.stereotype.Service;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.springframework.stereotype.Service;
+
import org.apache.causeway.testdomain.fixtures.EntityTestFixtures;
import org.apache.causeway.testdomain.fixtures.InventoryJaxbVm;
import org.apache.causeway.testdomain.jdo.entities.JdoBook;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/entities/JdoBook.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/entities/JdoBook.java
index e330f4561d..ed7844a4c9 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/entities/JdoBook.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/entities/JdoBook.java
@@ -18,12 +18,13 @@
*/
package org.apache.causeway.testdomain.jdo.entities;
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
import javax.jdo.annotations.Column;
import javax.jdo.annotations.Discriminator;
import javax.jdo.annotations.PersistenceCapable;
import javax.jdo.annotations.Query;
+
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.causeway.applib.CausewayModuleApplib;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/entities/JdoInventory.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/entities/JdoInventory.java
index 652298e63c..4f73c7bafb 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/entities/JdoInventory.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/entities/JdoInventory.java
@@ -20,7 +20,6 @@ package org.apache.causeway.testdomain.jdo.entities;
import java.util.Set;
-import jakarta.inject.Named;
import javax.jdo.annotations.Column;
import javax.jdo.annotations.DatastoreIdentity;
import javax.jdo.annotations.Element;
@@ -30,6 +29,8 @@ import javax.jdo.annotations.IdentityType;
import javax.jdo.annotations.PersistenceCapable;
import javax.jdo.annotations.Version;
import javax.jdo.annotations.VersionStrategy;
+
+import jakarta.inject.Named;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.causeway.applib.annotation.Collection;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/entities/JdoProduct.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/entities/JdoProduct.java
index cfb2f3de46..5095e73235 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/entities/JdoProduct.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/entities/JdoProduct.java
@@ -20,7 +20,6 @@ package org.apache.causeway.testdomain.jdo.entities;
import java.util.List;
-import jakarta.inject.Named;
import javax.jdo.annotations.Column;
import javax.jdo.annotations.DatastoreIdentity;
import javax.jdo.annotations.Discriminator;
@@ -31,6 +30,8 @@ import javax.jdo.annotations.InheritanceStrategy;
import javax.jdo.annotations.PersistenceCapable;
import javax.jdo.annotations.Persistent;
+import jakarta.inject.Named;
+
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.Collection;
import org.apache.causeway.applib.annotation.DomainObject;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/entities/JdoProductComment.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/entities/JdoProductComment.java
index 8c3c053364..6d5c07afb6 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/entities/JdoProductComment.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/entities/JdoProductComment.java
@@ -20,12 +20,13 @@ package org.apache.causeway.testdomain.jdo.entities;
import java.sql.Timestamp;
-import jakarta.inject.Named;
import javax.jdo.annotations.Column;
import javax.jdo.annotations.DatastoreIdentity;
import javax.jdo.annotations.IdGeneratorStrategy;
import javax.jdo.annotations.PersistenceCapable;
+import jakarta.inject.Named;
+
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.mixins.updates.OnUpdatedByAndAt;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/JpaInventoryDao.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/JpaInventoryDao.java
index d32dbdccb5..33597e6f88 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/JpaInventoryDao.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/JpaInventoryDao.java
@@ -20,13 +20,13 @@ package org.apache.causeway.testdomain.jpa;
import jakarta.inject.Inject;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.testdomain.jpa.entities.JpaBook;
import org.apache.causeway.testdomain.jpa.entities.JpaInventory;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/JpaTestFixtures.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/JpaTestFixtures.java
index c98d3244e5..784bc57fc1 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/JpaTestFixtures.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/JpaTestFixtures.java
@@ -21,10 +21,10 @@ package org.apache.causeway.testdomain.jpa;
import java.util.SortedSet;
import java.util.TreeSet;
-import org.springframework.stereotype.Service;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.springframework.stereotype.Service;
+
import org.apache.causeway.testdomain.fixtures.EntityTestFixtures;
import org.apache.causeway.testdomain.fixtures.InventoryJaxbVm;
import org.apache.causeway.testdomain.jpa.entities.JpaBook;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/valuetypes/ValueTypeExampleService.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/valuetypes/ValueTypeExampleService.java
index 63f9af6695..229a47149f 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/valuetypes/ValueTypeExampleService.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/valuetypes/ValueTypeExampleService.java
@@ -26,6 +26,7 @@ import java.util.stream.Stream;
import jakarta.inject.Inject;
import org.junit.jupiter.params.provider.Arguments;
+
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.value.semantics.ValueSemanticsResolver;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/PublishingTestFactoryAbstract.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/PublishingTestFactoryAbstract.java
index 87b3e18989..249f43c533 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/PublishingTestFactoryAbstract.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/PublishingTestFactoryAbstract.java
@@ -25,15 +25,16 @@ import java.util.concurrent.TimeoutException;
import java.util.function.BiConsumer;
import org.junit.jupiter.api.DynamicTest;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.support.TransactionSynchronization;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.fail;
import static org.junit.jupiter.api.DynamicTest.dynamicTest;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.support.TransactionSynchronization;
+
import org.apache.causeway.applib.annotation.TransactionScope;
import org.apache.causeway.applib.services.iactn.Interaction;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/PublishingTestFactoryJdo.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/PublishingTestFactoryJdo.java
index 6a419814fd..3bbc6a40ee 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/PublishingTestFactoryJdo.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/PublishingTestFactoryJdo.java
@@ -22,15 +22,16 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
+import javax.jdo.PersistenceManagerFactory;
+
import jakarta.inject.Inject;
import jakarta.inject.Named;
-import javax.jdo.PersistenceManagerFactory;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import org.springframework.context.annotation.Import;
import org.springframework.stereotype.Component;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/PublishingTestFactoryJpa.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/PublishingTestFactoryJpa.java
index 51260fd364..22a839fc01 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/PublishingTestFactoryJpa.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/PublishingTestFactoryJpa.java
@@ -25,11 +25,11 @@ import java.util.concurrent.TimeoutException;
import jakarta.inject.Inject;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
import org.springframework.context.annotation.Import;
import org.springframework.stereotype.Component;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/interaction/DomainObjectTesterFactory.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/interaction/DomainObjectTesterFactory.java
index 6b17753fe5..4a7c507e53 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/interaction/DomainObjectTesterFactory.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/interaction/DomainObjectTesterFactory.java
@@ -28,14 +28,16 @@ import java.util.stream.Stream;
import jakarta.inject.Inject;
import org.junit.jupiter.api.function.ThrowingSupplier;
-import org.springframework.lang.Nullable;
-import org.springframework.stereotype.Service;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
+import static org.mockito.Mockito.when;
+
+import org.springframework.lang.Nullable;
+import org.springframework.stereotype.Service;
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.annotation.Where;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/interaction/InteractionBoundaryProbe.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/interaction/InteractionBoundaryProbe.java
index 61fe082c07..99e590a562 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/interaction/InteractionBoundaryProbe.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/interaction/InteractionBoundaryProbe.java
@@ -23,6 +23,7 @@ import java.util.function.Supplier;
import jakarta.inject.Inject;
import org.junit.jupiter.api.Assertions;
+
import org.springframework.stereotype.Service;
import org.springframework.transaction.support.TransactionSynchronization;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/interaction/InteractionTestAbstract.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/interaction/InteractionTestAbstract.java
index 9649997981..7a2c3ead0a 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/interaction/InteractionTestAbstract.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/interaction/InteractionTestAbstract.java
@@ -27,11 +27,11 @@ import java.util.stream.Collectors;
import jakarta.inject.Inject;
-import org.springframework.lang.Nullable;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.wrapper.WrapperFactory;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/wrapperfactory/Counter.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/wrapperfactory/Counter.java
index 0108dd29a6..b2118fe696 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/wrapperfactory/Counter.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/wrapperfactory/Counter.java
@@ -20,12 +20,13 @@
package org.apache.causeway.testdomain.wrapperfactory;
-import jakarta.inject.Named;
import javax.jdo.annotations.Column;
import javax.jdo.annotations.DatastoreIdentity;
import javax.jdo.annotations.IdGeneratorStrategy;
import javax.jdo.annotations.PersistenceCapable;
+import jakarta.inject.Named;
+
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Editing;
diff --git a/testing/archtestsupport/applib/src/main/java/org/apache/causeway/testing/archtestsupport/applib/classrules/ArchitectureJdoRules.java b/testing/archtestsupport/applib/src/main/java/org/apache/causeway/testing/archtestsupport/applib/classrules/ArchitectureJdoRules.java
index 528aeb716a..f3d9a53aa2 100644
--- a/testing/archtestsupport/applib/src/main/java/org/apache/causeway/testing/archtestsupport/applib/classrules/ArchitectureJdoRules.java
+++ b/testing/archtestsupport/applib/src/main/java/org/apache/causeway/testing/archtestsupport/applib/classrules/ArchitectureJdoRules.java
@@ -20,11 +20,12 @@ package org.apache.causeway.testing.archtestsupport.applib.classrules;
import java.util.Objects;
-import jakarta.inject.Inject;
import javax.jdo.annotations.Discriminator;
import javax.jdo.annotations.NotPersistent;
import javax.jdo.annotations.PersistenceCapable;
+import jakarta.inject.Inject;
+
import com.tngtech.archunit.base.DescribedPredicate;
import com.tngtech.archunit.core.domain.JavaAnnotation;
import com.tngtech.archunit.core.domain.JavaClass;
diff --git a/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jdo/dom/JdoEntity.java b/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jdo/dom/JdoEntity.java
index d746ba3c1b..80d14bfd58 100644
--- a/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jdo/dom/JdoEntity.java
+++ b/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jdo/dom/JdoEntity.java
@@ -20,7 +20,6 @@ package org.apache.causeway.testing.archtestsupport.applib.entity.jdo.dom;
import java.util.Comparator;
-import jakarta.inject.Inject;
import javax.jdo.annotations.DatastoreIdentity;
import javax.jdo.annotations.IdGeneratorStrategy;
import javax.jdo.annotations.IdentityType;
@@ -30,6 +29,8 @@ import javax.jdo.annotations.Unique;
import javax.jdo.annotations.Uniques;
import javax.jdo.annotations.Version;
import javax.jdo.annotations.VersionStrategy;
+
+import jakarta.inject.Inject;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.causeway.applib.annotation.DomainObject;
diff --git a/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jdo/dom/JdoEntity2.java b/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jdo/dom/JdoEntity2.java
index 2d48ccf664..363ddafdce 100644
--- a/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jdo/dom/JdoEntity2.java
+++ b/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jdo/dom/JdoEntity2.java
@@ -25,6 +25,7 @@ import javax.jdo.annotations.IdentityType;
import javax.jdo.annotations.PersistenceCapable;
import javax.jdo.annotations.Unique;
import javax.jdo.annotations.Version;
+
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.causeway.applib.annotation.DomainObject;
diff --git a/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jdo/dom/JdoEntitySubtype.java b/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jdo/dom/JdoEntitySubtype.java
index e858aebadc..e338e8681f 100644
--- a/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jdo/dom/JdoEntitySubtype.java
+++ b/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jdo/dom/JdoEntitySubtype.java
@@ -20,6 +20,7 @@ package org.apache.causeway.testing.archtestsupport.applib.entity.jdo.dom;
import javax.jdo.annotations.IdentityType;
import javax.jdo.annotations.PersistenceCapable;
+
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.causeway.applib.annotation.DomainObject;
diff --git a/testing/fakedata/fixtures/src/main/java/org/apache/causeway/testing/fakedata/fixtures/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.java b/testing/fakedata/fixtures/src/main/java/org/apache/causeway/testing/fakedata/fixtures/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.java
index 9065f8e7c1..b2af6aa4e0 100644
--- a/testing/fakedata/fixtures/src/main/java/org/apache/causeway/testing/fakedata/fixtures/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.java
+++ b/testing/fakedata/fixtures/src/main/java/org/apache/causeway/testing/fakedata/fixtures/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.java
@@ -28,11 +28,13 @@ import java.util.UUID;
import javax.jdo.annotations.Column;
import javax.jdo.annotations.IdentityType;
import javax.jdo.annotations.VersionStrategy;
+
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.joda.time.DateTime;
import org.joda.time.LocalDate;
import org.joda.time.LocalDateTime;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.annotation.Action;
diff --git a/testing/fakedata/integtests/src/test/java/org/apache/causeway/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java b/testing/fakedata/integtests/src/test/java/org/apache/causeway/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
index 7dd45659f2..aa5cc1c730 100644
--- a/testing/fakedata/integtests/src/test/java/org/apache/causeway/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
+++ b/testing/fakedata/integtests/src/test/java/org/apache/causeway/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
@@ -18,6 +18,8 @@
*/
package org.apache.causeway.testing.fakedata.integtests;
+import jakarta.transaction.Transactional;
+
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
@@ -34,8 +36,6 @@ import org.apache.causeway.testing.fakedata.fixtures.CausewayModuleTestingFakeDa
import org.apache.causeway.testing.fixtures.applib.CausewayIntegrationTestAbstractWithFixtures;
import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib;
-import jakarta.transaction.Transactional;
-
@SpringBootTest(
classes = FakeDataModuleIntegTestAbstract.TestManifest.class
)
diff --git a/testing/fakedata/integtests/src/test/java/org/apache/causeway/testing/fakedata/integtests/tests/Bootstrap_IntegTest.java b/testing/fakedata/integtests/src/test/java/org/apache/causeway/testing/fakedata/integtests/tests/Bootstrap_IntegTest.java
index 4c98a735b2..798efc264a 100644
--- a/testing/fakedata/integtests/src/test/java/org/apache/causeway/testing/fakedata/integtests/tests/Bootstrap_IntegTest.java
+++ b/testing/fakedata/integtests/src/test/java/org/apache/causeway/testing/fakedata/integtests/tests/Bootstrap_IntegTest.java
@@ -20,6 +20,7 @@ package org.apache.causeway.testing.fakedata.integtests.tests;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+
import org.springframework.transaction.annotation.Transactional;
import org.apache.causeway.testing.fakedata.integtests.FakeDataModuleIntegTestAbstract;
diff --git a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/CausewayIntegrationGwtAbstractWithFixtures.java b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/CausewayIntegrationGwtAbstractWithFixtures.java
index a85c81ed07..3e676f6966 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/CausewayIntegrationGwtAbstractWithFixtures.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/CausewayIntegrationGwtAbstractWithFixtures.java
@@ -23,9 +23,6 @@ import jakarta.inject.Inject;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.causeway.testing.fixtures.applib.modules.ModuleWithFixturesService;
diff --git a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScript.java b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScript.java
index 7c965228b8..d35d4535b2 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScript.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScript.java
@@ -32,6 +32,7 @@ import jakarta.inject.Inject;
import org.joda.time.LocalDate;
import org.joda.time.LocalDateTime;
+
import org.springframework.lang.Nullable;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.support.TransactionTemplate;
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 e099c6970d..524e59a37b 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
@@ -60,6 +60,7 @@ import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib;
import org.apache.causeway.testing.fixtures.applib.events.FixturesInstalledEvent;
import org.apache.causeway.testing.fixtures.applib.events.FixturesInstallingEvent;
+import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript.ExecutionContext;
import org.apache.causeway.testing.fixtures.applib.personas.BuilderScriptAbstract;
import org.apache.causeway.testing.fixtures.applib.personas.PersonaWithBuilderScript;
diff --git a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/teardown/jdo/TeardownFixtureJdoAbstract.java b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/teardown/jdo/TeardownFixtureJdoAbstract.java
index 0d81954496..8fc7c19bcc 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/teardown/jdo/TeardownFixtureJdoAbstract.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/teardown/jdo/TeardownFixtureJdoAbstract.java
@@ -18,7 +18,6 @@
*/
package org.apache.causeway.testing.fixtures.applib.teardown.jdo;
-import jakarta.inject.Inject;
import javax.jdo.PersistenceManagerFactory;
import javax.jdo.annotations.DiscriminatorStrategy;
import javax.jdo.annotations.InheritanceStrategy;
@@ -26,6 +25,8 @@ import javax.jdo.metadata.DiscriminatorMetadata;
import javax.jdo.metadata.InheritanceMetadata;
import javax.jdo.metadata.TypeMetadata;
+import jakarta.inject.Inject;
+
import org.apache.causeway.applib.annotation.Programmatic;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.persistence.jdo.applib.services.JdoSupportService;
diff --git a/testing/h2console/ui/src/main/java/org/apache/causeway/testing/h2console/ui/webmodule/WebModuleH2Console.java b/testing/h2console/ui/src/main/java/org/apache/causeway/testing/h2console/ui/webmodule/WebModuleH2Console.java
index d372aa8b0f..a7ecda92f0 100644
--- a/testing/h2console/ui/src/main/java/org/apache/causeway/testing/h2console/ui/webmodule/WebModuleH2Console.java
+++ b/testing/h2console/ui/src/main/java/org/apache/causeway/testing/h2console/ui/webmodule/WebModuleH2Console.java
@@ -26,6 +26,7 @@ import jakarta.servlet.ServletException;
import org.h2.server.web.ConnectionInfo;
import org.h2.server.web.H2WebServletForJakarta;
+
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
import org.springframework.stereotype.Service;
@@ -42,6 +43,7 @@ import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.security.authentication.standard.RandomCodeGenerator;
import org.apache.causeway.core.webapp.modules.WebModuleAbstract;
import org.apache.causeway.core.webapp.modules.WebModuleContext;
+import org.apache.causeway.testing.h2console.ui.webmodule.WebModuleH2Console.H2WebServlet;
import lombok.Getter;
import lombok.val;
diff --git a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayIntegrationGwtAbstract.java b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayIntegrationGwtAbstract.java
index dd7bf54676..68af7957bb 100644
--- a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayIntegrationGwtAbstract.java
+++ b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayIntegrationGwtAbstract.java
@@ -20,10 +20,11 @@ package org.apache.causeway.testing.integtestsupport.applib;
import java.util.concurrent.Callable;
+import org.junit.jupiter.api.extension.ExtendWith;
+
import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
import org.apache.causeway.commons.functional.ThrowingRunnable;
import org.apache.causeway.commons.functional.Try;
-import org.junit.jupiter.api.extension.ExtendWith;
/**
* Convenient base class to extend for integration tests.
diff --git a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/_Helper.java b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/_Helper.java
index 8a4f36feea..1890df8fb0 100644
--- a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/_Helper.java
+++ b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/_Helper.java
@@ -21,6 +21,7 @@ package org.apache.causeway.testing.integtestsupport.applib;
import java.util.Optional;
import org.junit.jupiter.api.extension.ExtensionContext;
+
import org.springframework.context.ApplicationContext;
import org.apache.causeway.applib.services.exceprecog.ExceptionRecognizerService;
diff --git a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/validate/DomainModelValidator.java b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/validate/DomainModelValidator.java
index 7638c3dfa8..43e8d68b27 100644
--- a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/validate/DomainModelValidator.java
+++ b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/validate/DomainModelValidator.java
@@ -30,8 +30,13 @@ import jakarta.inject.Inject;
import org.junit.jupiter.api.Assertions;
import org.opentest4j.AssertionFailedError;
+
+import static org.assertj.core.api.Assertions.filter;
+
import org.springframework.lang.Nullable;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.log;
+
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.exceptions.unrecoverable.DomainModelException;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
diff --git a/testing/specsupport/applib/src/main/java/org/apache/causeway/testing/specsupport/applib/integration/ObjectFactoryForIntegration.java b/testing/specsupport/applib/src/main/java/org/apache/causeway/testing/specsupport/applib/integration/ObjectFactoryForIntegration.java
index d061f0f70a..f3a5e37124 100644
--- a/testing/specsupport/applib/src/main/java/org/apache/causeway/testing/specsupport/applib/integration/ObjectFactoryForIntegration.java
+++ b/testing/specsupport/applib/src/main/java/org/apache/causeway/testing/specsupport/applib/integration/ObjectFactoryForIntegration.java
@@ -24,9 +24,10 @@ import java.util.Map;
import org.apache.causeway.applib.services.inject.ServiceInjector;
import org.apache.causeway.commons.internal.collections._Maps;
+import lombok.RequiredArgsConstructor;
+
import io.cucumber.core.backend.ObjectFactory;
import io.cucumber.core.exception.CucumberException;
-import lombok.RequiredArgsConstructor;
/**
* @since 2.0 {@index}
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2.java b/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2.java
index 08d3ae87de..3ea7d9ed21 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2.java
@@ -44,9 +44,10 @@ import static org.junit.Assert.fail;
import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.commons.internal.reflection._Reflect;
-import junit.framework.AssertionFailedError;
import lombok.RequiredArgsConstructor;
+import junit.framework.AssertionFailedError;
+
/**
* Use as a <tt>@Rule</tt>, meaning that the <tt>@RunWith(JMock.class)</tt> can