You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/10/25 08:15:56 UTC
[isis] branch master updated: ISIS-3142: batch organize imports: testing/persistence sources
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 9970f23111 ISIS-3142: batch organize imports: testing/persistence sources
9970f23111 is described below
commit 9970f231111e141438ba6134142cc8a7e7ff2726
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Oct 25 10:15:46 2022 +0200
ISIS-3142: batch organize imports: testing/persistence sources
---
.../commons/CausewayModulePersistenceCommons.java | 5 +++--
.../changetracking/EntityChangeTrackerDefault.java | 13 +++++++------
.../jpa/integration/changetracking/_Xray.java | 3 +--
.../jdo/applib/services/JdoSupportService.java | 2 +-
.../CausewayModulePersistenceJdoDatanucleus.java | 4 ++--
...sewayModulePersistenceJdoDatanucleusMixins.java | 7 ++++---
.../changetracking/JdoLifecycleListener.java | 2 +-
.../jdo/datanucleus/changetracking/_Utils.java | 2 +-
.../jdo/datanucleus/dialect/DnJdoDialect.java | 7 ++++---
.../entities/DnEntityStateProvider.java | 4 ++--
.../entities/DnObjectProviderForCauseway.java | 4 ++--
.../jdosupport/JdoSupportServiceDefault.java | 9 +++++----
.../metamodel/facets/entity/JdoEntityFacet.java | 13 ++++++-------
.../mixins/Persistable_downloadJdoMetadata.java | 3 ++-
.../applib/CausewayBookmarkConverter.java | 2 +-
.../JavaAwtBufferedImageByteArrayConverter.java | 5 +++--
.../time/OffsetDateTimeConverterForJdo.java | 3 ++-
.../time/OffsetTimeConverterForJdo.java | 3 ++-
.../time/ZonedDateTimeConverterForJdo.java | 3 ++-
.../valuetypes/DnByteIdValueSemantics.java | 2 +-
.../valuetypes/DnCharIdValueSemantics.java | 2 +-
.../DnDatastoreIdImplValueSemantics.java | 2 +-
.../valuetypes/DnIntIdValueSemantics.java | 2 +-
.../valuetypes/DnLongIdValueSemantics.java | 2 +-
.../valuetypes/DnObjectIdValueSemantics.java | 2 +-
.../valuetypes/DnShortIdValueSemantics.java | 2 +-
.../valuetypes/DnStringIdValueSemantics.java | 2 +-
.../valuetypes/JdoByteIdentityValueSemantics.java | 2 +-
.../valuetypes/JdoCharIdentityValueSemantics.java | 2 +-
.../valuetypes/JdoDatastoreIdValueSemantics.java | 6 +++---
.../valuetypes/JdoIntIdentityValueSemantics.java | 2 +-
.../valuetypes/JdoLongIdentityValueSemantics.java | 2 +-
.../JdoObjectIdentityValueSemantics.java | 2 +-
.../valuetypes/JdoShortIdentityValueSemantics.java | 2 +-
.../JdoStringIdentityValueSemantics.java | 2 +-
.../oid/IdStringifierForByteIdentity_Test.java | 3 ++-
...erForDatastoreId_DatastoreIdImpl_long_Test.java | 3 ++-
...atastoreId_DatastoreUniqueLongId_long_Test.java | 3 ++-
...DatastoreId_DatastoreUniqueLongId_str_Test.java | 3 ++-
.../oid/IdStringifierForIntId_Test.java | 3 ++-
.../oid/IdStringifierForIntIdentity_Test.java | 3 ++-
.../oid/IdStringifierForLongId_Test.java | 3 ++-
.../oid/IdStringifierForLongIdentity_Test.java | 3 ++-
.../oid/IdStringifierForObjectIdentity_Test.java | 3 ++-
.../oid/IdStringifierForShortIdentity_Test.java | 3 ++-
.../datanucleus/test/ConfigurationExample1.java | 7 ++++---
.../CausewayModulePersistenceJdoIntegration.java | 5 +++--
.../CausewayModulePersistenceJdoMetamodel.java | 2 +-
.../jdo/metamodel/JdoProgrammingModel.java | 5 ++---
.../jdo/metamodel/beans/JdoBeanTypeClassifier.java | 5 ++---
...JdoDatastoreIdentityAnnotationFacetFactory.java | 1 +
.../JdoPersistenceCapableFacetFactory.java | 1 +
.../JdoPersistenceCapableFacetFromAnnotation.java | 1 -
.../object/query/JdoQueriesFacetAnnotation.java | 1 -
.../query/JdoQueryAnnotationFacetFactory.java | 1 +
.../facets/object/query/JdoQueryFacetAbstract.java | 1 -
.../object/query/JdoQueryFacetAnnotation.java | 1 -
...etaModelVisitingValidatorForClauseAbstract.java | 5 ++---
.../MetaModelVisitingValidatorForFromClause.java | 3 +--
...taModelVisitingValidatorForVariablesClause.java | 5 ++---
.../version/JdoVersionAnnotationFacetFactory.java | 2 +-
...BigDecimalFromColumnAnnotationFacetFactory.java | 1 +
...andatoryFacetFromAbsenceOfColumnAnnotation.java | 1 +
.../MandatoryFromColumnAnnotationFacetFactory.java | 4 ++--
...xLengthFromJdoColumnAnnotationFacetFactory.java | 1 +
.../metamodel/facets/prop/column/_ColumnUtil.java | 1 -
.../JdoNotPersistentAnnotationFacetFactory.java | 1 +
.../JdoPrimaryKeyAnnotationFacetFactory.java | 1 +
.../OptionalFacetFromJdoPrimaryKeyAnnotation.java | 1 +
.../jdo/metamodel/menu/JdoMetamodelMenu.java | 3 +--
...atastoreIdentityAnnotationFacetFactoryTest.java | 3 ---
...GivenJdoPersistenceCapableFacetFactoryTest.java | 5 +----
.../query/JdoQueryAnnotationFacetFactoryTest.java | 2 --
...malFromJdoColumnAnnotationFacetFactoryTest.java | 10 +++-------
...oryFromJdoColumnAnnotationFacetFactoryTest.java | 10 +++-------
...JdoNotPersistentAnnotationFacetFactoryTest.java | 2 --
...venJdoPrimaryKeyAnnotationFacetFactoryTest.java | 4 ----
.../testing/AbstractFacetFactoryTest.java | 2 +-
.../persistence/jdo/metamodel/testing/Utils.java | 1 -
.../facets/object/query/JdoNamedQuery.java | 3 ++-
.../facets/object/query/JdoQueryFacet.java | 1 -
.../exceptions/JdoResourceFailureException.java | 3 ++-
.../jdo/spring/exceptions/JdoSystemException.java | 3 ++-
.../jdo/spring/exceptions/JdoUsageException.java | 3 ++-
.../jdo/spring/integration/DefaultJdoDialect.java | 1 +
.../jdo/spring/integration/JdoDialect.java | 1 +
.../LocalPersistenceManagerFactoryBean.java | 2 +-
.../PersistenceManagerFactoryUtils.java | 12 ++++++------
.../OpenPersistenceManagerInViewFilter.java | 6 ++++--
.../OpenPersistenceManagerInViewInterceptor.java | 6 +++---
.../support/SpringPersistenceManagerProxyBean.java | 7 ++++---
.../LocalPersistenceManagerFactoryTests.java | 3 ++-
.../support/OpenPersistenceManagerInViewTests.java | 5 +++--
.../applib/integration/CausewayEntityListener.java | 4 ++--
.../CausewayModulePersistenceJpaEclipselink.java | 2 +-
.../jpa/eclipselink/config/ElSettings.java | 4 ++--
.../inject/BeanManagerForEntityListeners.java | 3 +--
.../persistence/jpa/eclipselink/inject/_Util.java | 3 +--
.../CausewayModulePersistenceJpaIntegration.java | 7 ++++---
.../jpa/integration/entity/JpaEntityFacet.java | 12 +++++++-----
.../integration/entity/JpaEntityFacetFactory.java | 2 +-
.../services/JpaSupportServiceUsingSpring.java | 3 ++-
.../applib/CausewayBookmarkConverter.java | 3 +--
.../CausewayModulePersistenceJpaMetamodel.java | 5 +++--
...DecimalFromJpaColumnAnnotationFacetFactory.java | 1 +
...ndatoryFromJpaColumnAnnotationFacetFactory.java | 1 +
.../JpaTransientAnnotationFacetFactory.java | 1 +
.../table/JpaTableAnnotationFacetFactory.java | 1 -
.../domainmodel/SpecloaderPerformanceTest.java | 8 ++++----
.../testdomain/domainmodel/_MetamodelUtil.java | 1 -
.../jdo/JdoEntityChangePublishingTest.java | 2 +-
.../testdomain/ldap/LdapEmbeddedServerTest.java | 1 -
.../testdomain/ldap/LdapServerService.java | 1 -
.../causeway/testdomain/rest/CorsFilterTest.java | 8 +++-----
.../testdomain/rest/DomainObjectResourceTest.java | 2 +-
.../testdomain/rest/MenuBarsResourceTest.java | 4 ++--
.../RestServiceSimpifiedRepresentationTest.java | 11 +++++------
.../testdomain/shiro/AbstractShiroTest.java | 2 +-
.../testdomain/shiro/ShiroSecmanLdapTest.java | 8 ++++----
.../causeway/testdomain/shiro/ShiroSecmanTest.java | 3 +--
.../SpringServiceProvisioningTest.java | 11 ++++++-----
.../CmdExecAuditSessLog_IntegTestAbstract.java | 1 -
.../jpa/integtests/model/Counter.java | 2 --
.../CoreWrapperFactory_IntegTestAbstract.java | 9 ++++-----
.../integtests/WrapperFactory_async_IntegTest.java | 7 +++----
.../causeway/testdomain/cucumber/StepDefs.java | 3 ++-
.../domainmodel/AnnotationSyntesizerTest.java | 2 +-
.../DomainModelTest_usingBadDomain.java | 6 +++---
.../DomainModelTest_usingGoodDomain.java | 2 +-
.../domainmodel/MetaModelRegressionTest.java | 15 ++++++++-------
.../testdomain/factory/ViewModelFactoryTest.java | 6 +++---
.../testdomain/interact/ActionInteractionTest.java | 6 ++----
.../testdomain/interact/HasActionValidation.java | 1 -
.../testdomain/interact/HasValueValidation.java | 1 -
.../testdomain/interact/NewParameterModelTest.java | 2 +-
.../interact/SimulatedUiAutoComplete.java | 1 -
.../testdomain/interact/SimulatedUiChoices.java | 1 -
.../testdomain/interact/SimulatedUiComponent.java | 1 -
.../testdomain/interact/SimulatedUiSubmit.java | 1 -
.../interact/WrapperInteractionTest.java | 10 +++++-----
.../interact/WrapperInteractionTest2.java | 10 +++++-----
.../layouts/integtest/model/Counter.java | 1 -
.../injecting/jdo/JdoEntityInjectingTest.java | 6 +++---
.../persistence/jdo/JdoBootstrappingTest.java | 2 +-
.../jdo/JdoExceptionTranslationTest.java | 2 +-
...xceptionTranslationTest_usingTransactional.java | 2 +-
.../persistence/jdo/_JdoExceptionTranslator.java | 2 +-
.../timestamping/jdo/JdoTimestampingTest.java | 6 +++---
...actionRollbackTest_usingTransactionService.java | 2 +-
...TransactionRollbackTest_usingTransactional.java | 10 +++++-----
.../injecting/jpa/JpaEntityInjectingTest.java | 6 +++---
.../persistence/jpa/JpaBootstrappingTest.java | 2 +-
.../jpa/JpaExceptionTranslationTest.java | 2 +-
...xceptionTranslationTest_usingTransactional.java | 3 +--
.../testdomain/persistence/jpa/JpaJaxbTest.java | 2 --
.../persistence/jpa/_JpaExceptionTranslator.java | 5 +++--
.../JpaGeneratedLongIdEntityLifecycleTest.java | 2 +-
...JpaNonGeneratedStringIdEntityLifecycleTest.java | 2 +-
...actionRollbackTest_usingInteractionService.java | 4 ++--
...actionRollbackTest_usingTransactionService.java | 4 ++--
.../testdomain/rest/JsonValueEncoderTest.java | 12 ++++++------
.../testdomain/rest/RestServiceStressTest.java | 2 +-
.../testdomain/value/ValueSemanticsTest.java | 6 +++---
.../testdomain/value/ValueSemanticsTester.java | 11 +++++------
.../testdomain/viewers/jdo/wkt/TestAppJdoWkt.java | 2 +-
.../viewers/jdo/wkt/InteractionTestJdoWkt.java | 12 +++++-------
.../testdomain/viewers/jpa/wkt/TestAppJpaWkt.java | 2 +-
.../viewers/jpa/wkt/InteractionTestJpaWkt.java | 11 +++++------
.../testdomain/HasPersistenceStandard.java | 1 -
.../testdomain/RegressionTestAbstract.java | 2 +-
.../testdomain/conf/Configuration_headless.java | 3 +--
.../conf/Configuration_usingStereotypes.java | 3 ++-
.../testdomain/conf/Configuration_usingWicket.java | 13 ++++++-------
.../causeway/testdomain/jdo/JdoInventoryDao.java | 6 +++---
.../testdomain/jdo/JdoInventoryResource.java | 10 +++++-----
.../causeway/testdomain/jdo/JdoTestFixtures.java | 22 +++++++++++-----------
.../testdomain/jdo/entities/JdoProduct.java | 3 +--
.../causeway/testdomain/jpa/JpaInventoryDao.java | 6 +++---
.../testdomain/jpa/JpaInventoryResource.java | 10 +++++-----
.../testdomain/jpa/JpaTestDomainModule.java | 3 ++-
.../causeway/testdomain/jpa/JpaTestFixtures.java | 22 +++++++++++-----------
.../testdomain/jpa/entities/JpaProduct.java | 3 +--
.../testdomain/model/actnsemantics/BlobDemo.java | 5 ++---
...ionHasParamSupportingMethodTypeOfReference.java | 3 +--
...ActionHasParamSupportingMethodTypeOfString.java | 3 +--
.../model/good/ProperChoicesWhenChoicesFrom.java | 3 +--
.../testdomain/model/good/ProperElementTypeVm.java | 5 ++---
.../model/good/ProperElementTypeVmAbstract.java | 5 ++---
.../model/interaction/InteractionDemo.java | 5 ++---
.../InteractionDemo_biListOfString.java | 3 +--
.../interaction/InteractionDemo_negotiate.java | 4 ++--
.../valuetypes/Configuration_usingValueTypes.java | 7 ++++---
.../model/valuetypes/ValueTypeExample.java | 3 ++-
.../model/valuetypes/ValueTypeExampleService.java | 2 +-
.../publishing/PublishingTestFactoryAbstract.java | 14 +++++++-------
.../publishing/PublishingTestFactoryJdo.java | 6 +++---
.../publishing/PublishingTestFactoryJpa.java | 8 ++++----
.../conf/Configuration_usingCommandPublishing.java | 5 +++--
...Configuration_usingEntityChangesPublishing.java | 5 +++--
...ration_usingEntityPropertyChangePublishing.java | 3 ++-
.../Configuration_usingExecutionPublishing.java | 5 +++--
...onfiguration_usingLifecycleEventPublishing.java | 3 ++-
.../stubs/CommandPublishingTestAbstract.java | 8 ++++----
.../stubs/EntityPublishingTestAbstract.java | 5 +++--
.../stubs/ExecutionPublishingTestAbstract.java | 4 ++--
.../LifecycleEventPublishingTestAbstract.java | 9 ++++-----
.../stubs/PropertyPublishingTestAbstract.java | 6 +++---
.../publishing/stubs/PublishingTestAbstract.java | 7 ++++---
.../subscriber/CommandSubscriberForTesting.java | 4 ++--
.../EntityChangesSubscriberForTesting.java | 4 ++--
.../EntityPropertyChangeSubscriberForTesting.java | 4 +---
.../subscriber/ExecutionSubscriberForTesting.java | 4 ++--
.../causeway/testdomain/rospec/RoSpecSampler.java | 3 +--
.../testdomain/util/CollectionAssertions.java | 4 ++--
.../causeway/testdomain/util/dto/BookDto.java | 3 +--
.../LifecycleEventSubscriberJdoForTesting.java | 8 ++++----
.../LifecycleEventSubscriberJpaForTesting.java | 8 ++++----
.../util/interaction/DataTableTester.java | 3 +--
.../interaction/DomainObjectTesterFactory.java | 10 ++++++----
.../util/interaction/InteractionBoundaryProbe.java | 1 -
.../util/interaction/InteractionTestAbstract.java | 12 ++++++------
.../testdomain/util/kv/KVStoreForTesting.java | 3 ++-
.../testdomain/util/rest/RestEndpointService.java | 4 ++--
.../wrapperfactory/CounterRepository.java | 3 ++-
.../wrapperfactory/WrapperTestFixtures.java | 7 ++++---
.../applib/classrules/_LogicalNaming.java | 3 +--
.../applib/modulerules/SubpackageEnum.java | 1 +
.../applib/entity/jdo/dom/JdoEntity2.java | 6 +++++-
.../applib/modules/customer/CustomerModule.java | 3 ++-
.../applib/modules/order/OrderModule.java | 3 ++-
.../fakedata/applib/services/BigIntegers.java | 2 --
.../fakedata/applib/services/CausewayBlobs.java | 7 ++-----
.../fakedata/applib/services/CausewayClobs.java | 7 ++-----
.../testing/fakedata/applib/services/Strings.java | 2 --
.../testing/fakedata/applib/services/Urls.java | 2 --
.../applib/services/FakeDataServiceTest.java | 9 +++------
.../CausewayModuleTestingFakeDataFixtures.java | 7 ++++---
.../FakeDataDemoObjectWithAll_create3.java | 2 +-
.../FakeDataModuleIntegTestAbstract.java | 15 ++++++++-------
.../integtests/tests/Bootstrap_IntegTest.java | 3 ++-
...ausewayIntegrationTestAbstractWithFixtures.java | 5 +++--
.../CausewayModuleTestingFixturesApplib.java | 5 +++--
.../fixturescripts/ExecutionParametersDefault.java | 9 +++++----
.../applib/fixturescripts/FixtureScript.java | 14 +++++++-------
.../applib/fixturescripts/FixtureScripts.java | 16 ++++++++--------
.../applib/modules/ModuleWithFixtures.java | 3 ++-
.../applib/modules/ModuleWithFixturesService.java | 13 +++++++------
.../applib/setup/PersonaEnumPersistAll.java | 2 +-
.../teardown/jdo/TeardownFixtureJdoAbstract.java | 2 +-
.../fixturescripts/ExecutionContext_Test.java | 1 -
...cutionParametersDefault_AsKeyValueMap_Test.java | 1 -
.../ExecutionParametersDefault_Test.java | 2 --
.../h2console/ui/webmodule/H2WebServerWrapper.java | 7 ++++---
.../h2console/ui/webmodule/WebModuleH2Console.java | 5 +++--
.../hsqldbmgr/dom/services/HsqlDbManagerMenu.java | 4 ++--
.../applib/UserMementoRefiners.java | 1 -
.../testing/integtestsupport/applib/_Helper.java | 6 +++---
.../applib/annotation/InteractAsUtils.java | 3 +--
.../applib/validate/DomainModelValidator.java | 2 +-
.../integration/ObjectFactoryForIntegration.java | 6 ++----
.../applib/dom/AbstractApplyToAllContractTest.java | 3 ++-
.../dom/comparable/ComparableContractTester.java | 3 ++-
.../applib/dom/pojo/PojoTester.java | 2 +-
.../sortedsets/SortedSetsContractTestAbstract.java | 5 +++--
.../dom/value/ValueTypeContractTestAbstract.java | 2 +-
.../jmocking/ImposteriserUsingCodegenPlugin.java | 5 +++--
.../applib/jmocking/JUnitRuleMockery2.java | 6 +++---
.../applib/jmocking/MyMockomatic.java | 3 ++-
.../applib/matchers/StringMatchers.java | 3 ---
.../applib/matchers/ThrowableMatchers.java | 3 ++-
...mainObjectComparableContractTest_compareTo.java | 2 --
.../applib/dom/pojo/PojoTester_broken_Test.java | 1 -
.../dom/pojo/PojoTester_datatypes_applib_Test.java | 6 +++---
.../dom/pojo/PojoTester_datatypes_bean_Test.java | 6 +++---
.../dom/pojo/PojoTester_datatypes_enum_Test.java | 7 +++----
.../pojo/PojoTester_datatypes_java_time_Test.java | 8 ++++----
.../dom/pojo/PojoTester_datatypes_joda_Test.java | 9 ++++-----
.../PojoTester_datatypes_no_data_factory_Test.java | 2 --
.../pojo/PojoTester_datatypes_primitive_Test.java | 9 ++++-----
.../dom/pojo/PojoTester_datatypes_string_Test.java | 7 +++----
.../pojo/PojoTester_datatypes_wrapper_Test.java | 9 ++++-----
.../dom/sortedsets/SortedSetsContractTestAll.java | 2 --
...lueTypeContractTestAbstract_BigIntegerTest.java | 2 --
.../ValueTypeContractTestAbstract_ColorTest.java | 2 --
.../ValueTypeContractTestAbstract_StringTest.java | 2 --
...ewayActionsTest_returnNewTransientInstance.java | 2 --
.../ImposteriserTestUsingCodegenPlugin_Test.java | 6 +++---
.../jmocking/JMockActionsTest_returnArgument.java | 7 +++----
.../jmocking/JMockActionsTest_returnEach.java | 7 +++----
.../applib/jmocking/JUnitRuleMockery2Test.java | 4 ++--
..._autoWiring_constructorInjection_happyCase.java | 8 ++++----
...y2Test_autoWiring_sadCase_noClassUnderTest.java | 4 ++--
...est_autoWiring_sadCase_twoClassesUnderTest.java | 6 +++---
...2Test_autoWiring_setterInjection_happyCase.java | 8 ++++----
...RuleMockery2Test_mockAnnotatedWithAllowing.java | 8 ++++----
...RuleMockery2Test_mockAnnotatedWithIgnoring.java | 8 ++++----
...kery2Test_mockAnnotatedWithNever_happyCase.java | 8 ++++----
...ockery2Test_mockAnnotatedWithNever_sadCase.java | 8 ++++----
...ockery2Test_mockAnnotatedWithOne_happyCase.java | 8 ++++----
...eMockery2Test_mockAnnotatedWithOne_sadCase.java | 8 ++++----
.../applib/util/Files_deleteFileUtils_Test.java | 4 ++--
301 files changed, 657 insertions(+), 702 deletions(-)
diff --git a/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/CausewayModulePersistenceCommons.java b/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/CausewayModulePersistenceCommons.java
index 6f45524bb3..1469528050 100644
--- a/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/CausewayModulePersistenceCommons.java
+++ b/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/CausewayModulePersistenceCommons.java
@@ -18,11 +18,12 @@
*/
package org.apache.causeway.persistence.commons;
-import org.apache.causeway.core.runtime.CausewayModuleCoreRuntime;
-import org.apache.causeway.persistence.jpa.integration.changetracking.EntityChangeTrackerDefault;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.core.runtime.CausewayModuleCoreRuntime;
+import org.apache.causeway.persistence.jpa.integration.changetracking.EntityChangeTrackerDefault;
+
@Configuration
@Import({
// modules
diff --git a/persistence/commons/src/main/java/org/apache/causeway/persistence/jpa/integration/changetracking/EntityChangeTrackerDefault.java b/persistence/commons/src/main/java/org/apache/causeway/persistence/jpa/integration/changetracking/EntityChangeTrackerDefault.java
index fed3bb5497..54ed0b64bb 100644
--- a/persistence/commons/src/main/java/org/apache/causeway/persistence/jpa/integration/changetracking/EntityChangeTrackerDefault.java
+++ b/persistence/commons/src/main/java/org/apache/causeway/persistence/jpa/integration/changetracking/EntityChangeTrackerDefault.java
@@ -31,6 +31,13 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Provider;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.event.EventListener;
+import org.springframework.core.annotation.Order;
+import org.springframework.lang.Nullable;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.EntityChangeKind;
import org.apache.causeway.applib.annotation.InteractionScope;
@@ -62,12 +69,6 @@ import org.apache.causeway.core.transaction.changetracking.EntityChangesPublishe
import org.apache.causeway.core.transaction.changetracking.EntityPropertyChangePublisher;
import org.apache.causeway.core.transaction.changetracking.HasEnlistedEntityChanges;
import org.apache.causeway.core.transaction.events.TransactionBeforeCompletionEvent;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.event.EventListener;
-import org.springframework.core.annotation.Order;
-import org.springframework.lang.Nullable;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
import lombok.AccessLevel;
import lombok.Getter;
diff --git a/persistence/commons/src/main/java/org/apache/causeway/persistence/jpa/integration/changetracking/_Xray.java b/persistence/commons/src/main/java/org/apache/causeway/persistence/jpa/integration/changetracking/_Xray.java
index d903bdf424..6684f40287 100644
--- a/persistence/commons/src/main/java/org/apache/causeway/persistence/jpa/integration/changetracking/_Xray.java
+++ b/persistence/commons/src/main/java/org/apache/causeway/persistence/jpa/integration/changetracking/_Xray.java
@@ -23,10 +23,9 @@ import java.awt.Color;
import javax.inject.Provider;
+import org.apache.causeway.applib.services.iactn.InteractionProvider;
import org.apache.causeway.commons.internal.debug._XrayEvent;
import org.apache.causeway.commons.internal.debug.xray.XrayUi;
-
-import org.apache.causeway.applib.services.iactn.InteractionProvider;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.ManagedObjects;
import org.apache.causeway.core.security.util.XrayUtil;
diff --git a/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/services/JdoSupportService.java b/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/services/JdoSupportService.java
index 02d7718bad..0dbc885a29 100644
--- a/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/services/JdoSupportService.java
+++ b/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/services/JdoSupportService.java
@@ -22,7 +22,6 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
-import org.springframework.lang.Nullable;
import javax.jdo.JDOQLTypedQuery;
import javax.jdo.PersistenceManager;
import javax.jdo.PersistenceManagerFactory;
@@ -30,6 +29,7 @@ import javax.jdo.Query;
import javax.jdo.query.BooleanExpression;
import org.datanucleus.store.rdbms.RDBMSPropertyNames;
+import org.springframework.lang.Nullable;
/**
* Primarily provides access to the current thread's {@link PersistenceManagerFactory} and
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/CausewayModulePersistenceJdoDatanucleus.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/CausewayModulePersistenceJdoDatanucleus.java
index b28de3ba54..01a6cfbc58 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/CausewayModulePersistenceJdoDatanucleus.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/CausewayModulePersistenceJdoDatanucleus.java
@@ -25,8 +25,6 @@ import javax.jdo.JDOException;
import javax.jdo.PersistenceManagerFactory;
import javax.sql.DataSource;
-import org.apache.causeway.commons.internal.assertions._Assert;
-import org.apache.causeway.commons.internal.base._NullSafe;
import org.datanucleus.api.jdo.JDOPersistenceManagerFactory;
import org.datanucleus.metadata.PersistenceUnitMetaData;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -38,6 +36,8 @@ import org.springframework.context.annotation.Primary;
import org.springframework.dao.support.PersistenceExceptionTranslator;
import org.springframework.transaction.interceptor.TransactionInterceptor;
+import org.apache.causeway.commons.internal.assertions._Assert;
+import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.beans.CausewayBeanTypeRegistry;
import org.apache.causeway.core.config.beans.aoppatch.TransactionInterceptorFactory;
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/CausewayModulePersistenceJdoDatanucleusMixins.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/CausewayModulePersistenceJdoDatanucleusMixins.java
index 5eff4ae264..53fab71653 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/CausewayModulePersistenceJdoDatanucleusMixins.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/CausewayModulePersistenceJdoDatanucleusMixins.java
@@ -18,13 +18,14 @@
*/
package org.apache.causeway.persistence.jdo.datanucleus;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
import org.apache.causeway.persistence.jdo.datanucleus.config.DatanucleusSettings;
import org.apache.causeway.persistence.jdo.datanucleus.mixins.Persistable_datanucleusVersionLong;
import org.apache.causeway.persistence.jdo.datanucleus.mixins.Persistable_datanucleusVersionTimestamp;
import org.apache.causeway.persistence.jdo.datanucleus.mixins.Persistable_downloadJdoMetadata;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
import lombok.extern.log4j.Log4j2;
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/changetracking/JdoLifecycleListener.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/changetracking/JdoLifecycleListener.java
index 7536f6158a..fa5eef1bc8 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/changetracking/JdoLifecycleListener.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/changetracking/JdoLifecycleListener.java
@@ -28,10 +28,10 @@ import javax.jdo.listener.InstanceLifecycleEvent;
import javax.jdo.listener.LoadLifecycleListener;
import javax.jdo.listener.StoreLifecycleListener;
-import org.apache.causeway.commons.internal.assertions._Assert;
import org.datanucleus.enhancement.Persistable;
import org.apache.causeway.applib.annotation.Domain;
+import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facets.object.publish.entitychange.EntityChangePublishingFacet;
import org.apache.causeway.core.metamodel.object.ManagedObject;
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/changetracking/_Utils.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/changetracking/_Utils.java
index 63a946282c..25f64f0baf 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/changetracking/_Utils.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/changetracking/_Utils.java
@@ -22,9 +22,9 @@ import javax.jdo.JDOHelper;
import javax.jdo.ObjectState;
import javax.jdo.listener.InstanceLifecycleEvent;
-import org.apache.causeway.commons.internal.assertions._Assert;
import org.datanucleus.enhancement.Persistable;
+import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.persistence.jdo.datanucleus.entities.DnObjectProviderForCauseway;
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/dialect/DnJdoDialect.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/dialect/DnJdoDialect.java
index cbcacb96a4..635bf8e6aa 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/dialect/DnJdoDialect.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/dialect/DnJdoDialect.java
@@ -20,13 +20,14 @@ package org.apache.causeway.persistence.jdo.datanucleus.dialect;
import java.util.Optional;
-import org.apache.causeway.commons.functional.Try;
-import org.apache.causeway.persistence.jdo.spring.integration.DefaultJdoDialect;
-import org.apache.causeway.persistence.jdo.spring.integration.JdoDialect;
import org.datanucleus.api.jdo.JDOAdapter;
import org.datanucleus.exceptions.NucleusException;
import org.springframework.dao.DataAccessException;
+import org.apache.causeway.commons.functional.Try;
+import org.apache.causeway.persistence.jdo.spring.integration.DefaultJdoDialect;
+import org.apache.causeway.persistence.jdo.spring.integration.JdoDialect;
+
import lombok.val;
/**
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/entities/DnEntityStateProvider.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/entities/DnEntityStateProvider.java
index 3c148c0efd..444a563527 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/entities/DnEntityStateProvider.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/entities/DnEntityStateProvider.java
@@ -21,13 +21,13 @@ package org.apache.causeway.persistence.jdo.datanucleus.entities;
import java.lang.reflect.Method;
import java.util.Set;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.collections._Sets;
import org.datanucleus.enhancement.Persistable;
import org.springframework.lang.Nullable;
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.services.repository.EntityState;
+import org.apache.causeway.commons.internal.base._NullSafe;
+import org.apache.causeway.commons.internal.collections._Sets;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.object.entity.EntityFacet;
import org.apache.causeway.persistence.jdo.datanucleus.metamodel.facets.entity.JdoEntityFacet;
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/entities/DnObjectProviderForCauseway.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/entities/DnObjectProviderForCauseway.java
index 98a94bf652..09f183231d 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/entities/DnObjectProviderForCauseway.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/entities/DnObjectProviderForCauseway.java
@@ -23,8 +23,6 @@ import java.util.Optional;
import javax.jdo.PersistenceManager;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.datanucleus.ExecutionContext;
import org.datanucleus.cache.CachedPC;
import org.datanucleus.enhancement.Persistable;
@@ -34,6 +32,8 @@ import org.datanucleus.store.FieldValues;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.services.inject.ServiceInjector;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.persistence.jdo.spring.integration.TransactionAwarePersistenceManagerFactoryProxy;
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/jdosupport/JdoSupportServiceDefault.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/jdosupport/JdoSupportServiceDefault.java
index 416baf2a44..710369a849 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/jdosupport/JdoSupportServiceDefault.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/jdosupport/JdoSupportServiceDefault.java
@@ -37,6 +37,11 @@ import javax.jdo.Query;
import javax.jdo.datastore.JDOConnection;
import javax.jdo.query.BooleanExpression;
+import org.datanucleus.store.rdbms.RDBMSPropertyNames;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.exceptions.UnrecoverableException;
import org.apache.causeway.applib.exceptions.unrecoverable.ObjectPersistenceException;
@@ -45,10 +50,6 @@ import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.persistence.jdo.applib.services.JdoSupportService;
import org.apache.causeway.persistence.jdo.spring.integration.TransactionAwarePersistenceManagerFactoryProxy;
-import org.datanucleus.store.rdbms.RDBMSPropertyNames;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
import static org.apache.causeway.commons.internal.base._NullSafe.stream;
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java
index 2ec492c9d1..3d807d72a5 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java
@@ -29,11 +29,6 @@ import javax.inject.Inject;
import javax.jdo.FetchGroup;
import javax.jdo.PersistenceManager;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.assertions._Assert;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.collections._Maps;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.datanucleus.api.jdo.JDOPersistenceManagerFactory;
import org.datanucleus.enhancement.Persistable;
import org.datanucleus.store.rdbms.RDBMSPropertyNames;
@@ -48,6 +43,11 @@ import org.apache.causeway.applib.services.exceprecog.ExceptionRecognizerService
import org.apache.causeway.applib.services.repository.EntityState;
import org.apache.causeway.applib.services.xactn.TransactionService;
import org.apache.causeway.applib.services.xactn.TransactionalProcessor;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.assertions._Assert;
+import org.apache.causeway.commons.internal.base._NullSafe;
+import org.apache.causeway.commons.internal.collections._Maps;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.config.beans.PersistenceStack;
import org.apache.causeway.core.metamodel.facetapi.FacetAbstract;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
@@ -59,11 +59,10 @@ import org.apache.causeway.core.metamodel.services.idstringifier.IdStringifierLo
import org.apache.causeway.core.metamodel.services.objectlifecycle.ObjectLifecyclePublisher;
import org.apache.causeway.persistence.jdo.datanucleus.entities.DnEntityStateProvider;
import org.apache.causeway.persistence.jdo.datanucleus.entities.DnObjectProviderForCauseway;
+import org.apache.causeway.persistence.jdo.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacetFactory;
import org.apache.causeway.persistence.jdo.provider.entities.JdoFacetContext;
import org.apache.causeway.persistence.jdo.spring.integration.TransactionAwarePersistenceManagerFactoryProxy;
-import org.apache.causeway.persistence.jdo.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacetFactory;
-
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NonNull;
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/mixins/Persistable_downloadJdoMetadata.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/mixins/Persistable_downloadJdoMetadata.java
index 93732fd9db..f0c9ef39c6 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/mixins/Persistable_downloadJdoMetadata.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/mixins/Persistable_downloadJdoMetadata.java
@@ -26,6 +26,8 @@ import javax.jdo.PersistenceManagerFactory;
import javax.jdo.metadata.TypeMetadata;
import javax.xml.bind.JAXBException;
+import org.datanucleus.enhancement.Persistable;
+
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
import org.apache.causeway.applib.annotation.MemberSupport;
@@ -36,7 +38,6 @@ import org.apache.causeway.applib.layout.LayoutConstants;
import org.apache.causeway.applib.value.Clob;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.persistence.jdo.applib.services.JdoSupportService;
-import org.datanucleus.enhancement.Persistable;
import lombok.RequiredArgsConstructor;
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/typeconverters/applib/CausewayBookmarkConverter.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/typeconverters/applib/CausewayBookmarkConverter.java
index dd03ddbf9c..6938e849b7 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/typeconverters/applib/CausewayBookmarkConverter.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/typeconverters/applib/CausewayBookmarkConverter.java
@@ -18,11 +18,11 @@
*/
package org.apache.causeway.persistence.jdo.datanucleus.typeconverters.applib;
-import org.apache.causeway.commons.internal.base._Strings;
import org.datanucleus.store.types.converters.TypeConverter;
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.bookmark.HasTarget;
+import org.apache.causeway.commons.internal.base._Strings;
/**
* @since 2.0 {@index}
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/typeconverters/image/JavaAwtBufferedImageByteArrayConverter.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/typeconverters/image/JavaAwtBufferedImageByteArrayConverter.java
index f99b84c591..f46a04910f 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/typeconverters/image/JavaAwtBufferedImageByteArrayConverter.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/typeconverters/image/JavaAwtBufferedImageByteArrayConverter.java
@@ -20,11 +20,12 @@ package org.apache.causeway.persistence.jdo.datanucleus.typeconverters.image;
import java.awt.image.BufferedImage;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.image._Images;
import org.datanucleus.exceptions.NucleusDataStoreException;
import org.datanucleus.store.types.converters.TypeConverter;
+import org.apache.causeway.commons.internal.base._NullSafe;
+import org.apache.causeway.commons.internal.image._Images;
+
/**
* @since 2.0 {@index}
*/
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/typeconverters/time/OffsetDateTimeConverterForJdo.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/typeconverters/time/OffsetDateTimeConverterForJdo.java
index 7d9a2e687b..31e8ad9ed5 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/typeconverters/time/OffsetDateTimeConverterForJdo.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/typeconverters/time/OffsetDateTimeConverterForJdo.java
@@ -20,9 +20,10 @@ package org.apache.causeway.persistence.jdo.datanucleus.typeconverters.time;
import java.time.OffsetDateTime;
-import org.apache.causeway.commons.internal.base._Temporals;
import org.datanucleus.store.types.converters.TypeConverter;
+import org.apache.causeway.commons.internal.base._Temporals;
+
/**
* @since 2.0 {@index}
*/
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/typeconverters/time/OffsetTimeConverterForJdo.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/typeconverters/time/OffsetTimeConverterForJdo.java
index 630abf0510..4db5a94c9d 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/typeconverters/time/OffsetTimeConverterForJdo.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/typeconverters/time/OffsetTimeConverterForJdo.java
@@ -20,9 +20,10 @@ package org.apache.causeway.persistence.jdo.datanucleus.typeconverters.time;
import java.time.OffsetTime;
-import org.apache.causeway.commons.internal.base._Temporals;
import org.datanucleus.store.types.converters.TypeConverter;
+import org.apache.causeway.commons.internal.base._Temporals;
+
/**
* @since 2.0 {@index}
*/
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/typeconverters/time/ZonedDateTimeConverterForJdo.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/typeconverters/time/ZonedDateTimeConverterForJdo.java
index e225cd13da..3244a0fa67 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/typeconverters/time/ZonedDateTimeConverterForJdo.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/typeconverters/time/ZonedDateTimeConverterForJdo.java
@@ -20,9 +20,10 @@ package org.apache.causeway.persistence.jdo.datanucleus.typeconverters.time;
import java.time.ZonedDateTime;
-import org.apache.causeway.commons.internal.base._Temporals;
import org.datanucleus.store.types.converters.TypeConverter;
+import org.apache.causeway.commons.internal.base._Temporals;
+
/**
* @since 2.0 {@index}
*/
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/DnByteIdValueSemantics.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/DnByteIdValueSemantics.java
index fe58bfada9..65d8ace463 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/DnByteIdValueSemantics.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/DnByteIdValueSemantics.java
@@ -20,7 +20,6 @@ package org.apache.causeway.persistence.jdo.datanucleus.valuetypes;
import javax.annotation.Priority;
-import org.apache.causeway.commons.internal.factory._InstanceUtil;
import org.datanucleus.identity.ByteId;
import org.springframework.stereotype.Component;
@@ -28,6 +27,7 @@ import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.util.schema.CommonDtoUtils;
import org.apache.causeway.applib.value.semantics.ValueDecomposition;
import org.apache.causeway.applib.value.semantics.ValueSemanticsBasedOnIdStringifier;
+import org.apache.causeway.commons.internal.factory._InstanceUtil;
import org.apache.causeway.schema.common.v2.ValueType;
import lombok.NonNull;
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/DnCharIdValueSemantics.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/DnCharIdValueSemantics.java
index e5c3a64ed6..34f0e596c8 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/DnCharIdValueSemantics.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/DnCharIdValueSemantics.java
@@ -21,7 +21,6 @@ package org.apache.causeway.persistence.jdo.datanucleus.valuetypes;
import javax.annotation.Priority;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.factory._InstanceUtil;
import org.datanucleus.identity.CharId;
import org.springframework.stereotype.Component;
@@ -30,6 +29,7 @@ import org.apache.causeway.applib.services.bookmark.IdStringifier;
import org.apache.causeway.applib.util.schema.CommonDtoUtils;
import org.apache.causeway.applib.value.semantics.ValueDecomposition;
import org.apache.causeway.applib.value.semantics.ValueSemanticsBasedOnIdStringifier;
+import org.apache.causeway.commons.internal.factory._InstanceUtil;
import org.apache.causeway.schema.common.v2.ValueType;
import lombok.Builder;
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/DnDatastoreIdImplValueSemantics.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/DnDatastoreIdImplValueSemantics.java
index 6c01fc72b6..be08612fe8 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/DnDatastoreIdImplValueSemantics.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/DnDatastoreIdImplValueSemantics.java
@@ -20,7 +20,6 @@ package org.apache.causeway.persistence.jdo.datanucleus.valuetypes;
import javax.annotation.Priority;
-import org.apache.causeway.commons.internal.factory._InstanceUtil;
import org.datanucleus.identity.DatastoreIdImpl;
import org.springframework.stereotype.Component;
@@ -28,6 +27,7 @@ import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.util.schema.CommonDtoUtils;
import org.apache.causeway.applib.value.semantics.ValueDecomposition;
import org.apache.causeway.applib.value.semantics.ValueSemanticsBasedOnIdStringifier;
+import org.apache.causeway.commons.internal.factory._InstanceUtil;
import org.apache.causeway.schema.common.v2.ValueType;
import lombok.NonNull;
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/DnIntIdValueSemantics.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/DnIntIdValueSemantics.java
index d78827220c..bb4736291c 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/DnIntIdValueSemantics.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/DnIntIdValueSemantics.java
@@ -20,7 +20,6 @@ package org.apache.causeway.persistence.jdo.datanucleus.valuetypes;
import javax.annotation.Priority;
-import org.apache.causeway.commons.internal.factory._InstanceUtil;
import org.datanucleus.identity.IntId;
import org.springframework.stereotype.Component;
@@ -28,6 +27,7 @@ import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.util.schema.CommonDtoUtils;
import org.apache.causeway.applib.value.semantics.ValueDecomposition;
import org.apache.causeway.applib.value.semantics.ValueSemanticsBasedOnIdStringifier;
+import org.apache.causeway.commons.internal.factory._InstanceUtil;
import org.apache.causeway.schema.common.v2.ValueType;
import lombok.NonNull;
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/DnLongIdValueSemantics.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/DnLongIdValueSemantics.java
index 80f54fb5e7..143803e13a 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/DnLongIdValueSemantics.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/DnLongIdValueSemantics.java
@@ -20,7 +20,6 @@ package org.apache.causeway.persistence.jdo.datanucleus.valuetypes;
import javax.annotation.Priority;
-import org.apache.causeway.commons.internal.factory._InstanceUtil;
import org.datanucleus.identity.LongId;
import org.springframework.stereotype.Component;
@@ -28,6 +27,7 @@ import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.util.schema.CommonDtoUtils;
import org.apache.causeway.applib.value.semantics.ValueDecomposition;
import org.apache.causeway.applib.value.semantics.ValueSemanticsBasedOnIdStringifier;
+import org.apache.causeway.commons.internal.factory._InstanceUtil;
import org.apache.causeway.schema.common.v2.ValueType;
import lombok.NonNull;
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/DnObjectIdValueSemantics.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/DnObjectIdValueSemantics.java
index f929647af7..b82d38cc0d 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/DnObjectIdValueSemantics.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/DnObjectIdValueSemantics.java
@@ -22,7 +22,6 @@ import java.util.UUID;
import javax.annotation.Priority;
-import org.apache.causeway.commons.internal.factory._InstanceUtil;
import org.datanucleus.identity.ObjectId;
import org.springframework.stereotype.Component;
@@ -30,6 +29,7 @@ import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.util.schema.CommonDtoUtils;
import org.apache.causeway.applib.value.semantics.ValueDecomposition;
import org.apache.causeway.applib.value.semantics.ValueSemanticsBasedOnIdStringifier;
+import org.apache.causeway.commons.internal.factory._InstanceUtil;
import org.apache.causeway.schema.common.v2.ValueType;
import lombok.Builder;
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/DnShortIdValueSemantics.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/DnShortIdValueSemantics.java
index ecc4274640..cf4a578d4e 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/DnShortIdValueSemantics.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/DnShortIdValueSemantics.java
@@ -20,7 +20,6 @@ package org.apache.causeway.persistence.jdo.datanucleus.valuetypes;
import javax.annotation.Priority;
-import org.apache.causeway.commons.internal.factory._InstanceUtil;
import org.datanucleus.identity.ShortId;
import org.springframework.stereotype.Component;
@@ -28,6 +27,7 @@ import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.util.schema.CommonDtoUtils;
import org.apache.causeway.applib.value.semantics.ValueDecomposition;
import org.apache.causeway.applib.value.semantics.ValueSemanticsBasedOnIdStringifier;
+import org.apache.causeway.commons.internal.factory._InstanceUtil;
import org.apache.causeway.schema.common.v2.ValueType;
import lombok.NonNull;
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/DnStringIdValueSemantics.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/DnStringIdValueSemantics.java
index 6a089dbdd6..7e31fc60da 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/DnStringIdValueSemantics.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/DnStringIdValueSemantics.java
@@ -21,7 +21,6 @@ package org.apache.causeway.persistence.jdo.datanucleus.valuetypes;
import javax.annotation.Priority;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.factory._InstanceUtil;
import org.datanucleus.identity.StringId;
import org.springframework.stereotype.Component;
@@ -30,6 +29,7 @@ import org.apache.causeway.applib.services.bookmark.IdStringifier;
import org.apache.causeway.applib.util.schema.CommonDtoUtils;
import org.apache.causeway.applib.value.semantics.ValueDecomposition;
import org.apache.causeway.applib.value.semantics.ValueSemanticsBasedOnIdStringifier;
+import org.apache.causeway.commons.internal.factory._InstanceUtil;
import org.apache.causeway.schema.common.v2.ValueType;
import lombok.Builder;
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoByteIdentityValueSemantics.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoByteIdentityValueSemantics.java
index 30f2113463..da2dbc369b 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoByteIdentityValueSemantics.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoByteIdentityValueSemantics.java
@@ -21,13 +21,13 @@ package org.apache.causeway.persistence.jdo.datanucleus.valuetypes;
import javax.annotation.Priority;
import javax.jdo.identity.ByteIdentity;
-import org.apache.causeway.commons.internal.factory._InstanceUtil;
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.util.schema.CommonDtoUtils;
import org.apache.causeway.applib.value.semantics.ValueDecomposition;
import org.apache.causeway.applib.value.semantics.ValueSemanticsBasedOnIdStringifier;
+import org.apache.causeway.commons.internal.factory._InstanceUtil;
import org.apache.causeway.schema.common.v2.ValueType;
import lombok.NonNull;
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoCharIdentityValueSemantics.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoCharIdentityValueSemantics.java
index 7fb63279cb..5e92374065 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoCharIdentityValueSemantics.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoCharIdentityValueSemantics.java
@@ -22,7 +22,6 @@ import javax.annotation.Priority;
import javax.inject.Inject;
import javax.jdo.identity.CharIdentity;
-import org.apache.causeway.commons.internal.factory._InstanceUtil;
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
@@ -30,6 +29,7 @@ import org.apache.causeway.applib.services.bookmark.IdStringifier;
import org.apache.causeway.applib.util.schema.CommonDtoUtils;
import org.apache.causeway.applib.value.semantics.ValueDecomposition;
import org.apache.causeway.applib.value.semantics.ValueSemanticsBasedOnIdStringifier;
+import org.apache.causeway.commons.internal.factory._InstanceUtil;
import org.apache.causeway.schema.common.v2.ValueType;
import lombok.Builder;
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoDatastoreIdValueSemantics.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoDatastoreIdValueSemantics.java
index 1768ebc32f..f80affe8bb 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoDatastoreIdValueSemantics.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoDatastoreIdValueSemantics.java
@@ -22,9 +22,6 @@ import java.lang.reflect.Constructor;
import javax.annotation.Priority;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.context._Context;
-import org.apache.causeway.commons.internal.factory._InstanceUtil;
import org.datanucleus.identity.DatastoreId;
import org.springframework.stereotype.Component;
@@ -33,6 +30,9 @@ import org.apache.causeway.applib.services.bookmark.IdStringifier;
import org.apache.causeway.applib.util.schema.CommonDtoUtils;
import org.apache.causeway.applib.value.semantics.ValueDecomposition;
import org.apache.causeway.applib.value.semantics.ValueSemanticsBasedOnIdStringifier;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.commons.internal.context._Context;
+import org.apache.causeway.commons.internal.factory._InstanceUtil;
import org.apache.causeway.schema.common.v2.ValueType;
import lombok.NonNull;
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoIntIdentityValueSemantics.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoIntIdentityValueSemantics.java
index 93972c50ac..8689d6aa4a 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoIntIdentityValueSemantics.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoIntIdentityValueSemantics.java
@@ -21,13 +21,13 @@ package org.apache.causeway.persistence.jdo.datanucleus.valuetypes;
import javax.annotation.Priority;
import javax.jdo.identity.IntIdentity;
-import org.apache.causeway.commons.internal.factory._InstanceUtil;
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.util.schema.CommonDtoUtils;
import org.apache.causeway.applib.value.semantics.ValueDecomposition;
import org.apache.causeway.applib.value.semantics.ValueSemanticsBasedOnIdStringifier;
+import org.apache.causeway.commons.internal.factory._InstanceUtil;
import org.apache.causeway.schema.common.v2.ValueType;
import lombok.NonNull;
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoLongIdentityValueSemantics.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoLongIdentityValueSemantics.java
index a633f09484..bd9db134f2 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoLongIdentityValueSemantics.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoLongIdentityValueSemantics.java
@@ -21,13 +21,13 @@ package org.apache.causeway.persistence.jdo.datanucleus.valuetypes;
import javax.annotation.Priority;
import javax.jdo.identity.LongIdentity;
-import org.apache.causeway.commons.internal.factory._InstanceUtil;
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.util.schema.CommonDtoUtils;
import org.apache.causeway.applib.value.semantics.ValueDecomposition;
import org.apache.causeway.applib.value.semantics.ValueSemanticsBasedOnIdStringifier;
+import org.apache.causeway.commons.internal.factory._InstanceUtil;
import org.apache.causeway.schema.common.v2.ValueType;
import lombok.NonNull;
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoObjectIdentityValueSemantics.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoObjectIdentityValueSemantics.java
index 753834b95a..f1784f0d3f 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoObjectIdentityValueSemantics.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoObjectIdentityValueSemantics.java
@@ -23,13 +23,13 @@ import java.util.UUID;
import javax.annotation.Priority;
import javax.jdo.identity.ObjectIdentity;
-import org.apache.causeway.commons.internal.factory._InstanceUtil;
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.util.schema.CommonDtoUtils;
import org.apache.causeway.applib.value.semantics.ValueDecomposition;
import org.apache.causeway.applib.value.semantics.ValueSemanticsBasedOnIdStringifier;
+import org.apache.causeway.commons.internal.factory._InstanceUtil;
import org.apache.causeway.schema.common.v2.ValueType;
import lombok.Builder;
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoShortIdentityValueSemantics.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoShortIdentityValueSemantics.java
index 5cf2bf6381..c3f014089a 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoShortIdentityValueSemantics.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoShortIdentityValueSemantics.java
@@ -21,13 +21,13 @@ package org.apache.causeway.persistence.jdo.datanucleus.valuetypes;
import javax.annotation.Priority;
import javax.jdo.identity.ShortIdentity;
-import org.apache.causeway.commons.internal.factory._InstanceUtil;
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.util.schema.CommonDtoUtils;
import org.apache.causeway.applib.value.semantics.ValueDecomposition;
import org.apache.causeway.applib.value.semantics.ValueSemanticsBasedOnIdStringifier;
+import org.apache.causeway.commons.internal.factory._InstanceUtil;
import org.apache.causeway.schema.common.v2.ValueType;
import lombok.NonNull;
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoStringIdentityValueSemantics.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoStringIdentityValueSemantics.java
index 00af4174bc..03e21ed42e 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoStringIdentityValueSemantics.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoStringIdentityValueSemantics.java
@@ -22,7 +22,6 @@ import javax.annotation.Priority;
import javax.inject.Inject;
import javax.jdo.identity.StringIdentity;
-import org.apache.causeway.commons.internal.factory._InstanceUtil;
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
@@ -30,6 +29,7 @@ import org.apache.causeway.applib.services.bookmark.IdStringifier;
import org.apache.causeway.applib.util.schema.CommonDtoUtils;
import org.apache.causeway.applib.value.semantics.ValueDecomposition;
import org.apache.causeway.applib.value.semantics.ValueSemanticsBasedOnIdStringifier;
+import org.apache.causeway.commons.internal.factory._InstanceUtil;
import org.apache.causeway.schema.common.v2.ValueType;
import lombok.Builder;
diff --git a/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForByteIdentity_Test.java b/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForByteIdentity_Test.java
index e4d6843e64..fb465242c1 100644
--- a/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForByteIdentity_Test.java
+++ b/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForByteIdentity_Test.java
@@ -24,12 +24,13 @@ import java.util.stream.Stream;
import javax.jdo.identity.ByteIdentity;
-import org.apache.causeway.persistence.jdo.datanucleus.valuetypes.JdoByteIdentityValueSemantics;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
+import org.apache.causeway.persistence.jdo.datanucleus.valuetypes.JdoByteIdentityValueSemantics;
+
import lombok.val;
class IdStringifierForByteIdentity_Test {
diff --git a/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForDatastoreId_DatastoreIdImpl_long_Test.java b/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForDatastoreId_DatastoreIdImpl_long_Test.java
index adea7a8df1..bb9cb809e3 100644
--- a/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForDatastoreId_DatastoreIdImpl_long_Test.java
+++ b/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForDatastoreId_DatastoreIdImpl_long_Test.java
@@ -22,13 +22,14 @@ package org.apache.causeway.persistence.jdo.datanucleus.oid;
import java.util.stream.Stream;
-import org.apache.causeway.persistence.jdo.datanucleus.valuetypes.DnDatastoreIdImplValueSemantics;
import org.assertj.core.api.Assertions;
import org.datanucleus.identity.DatastoreIdImpl;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
+import org.apache.causeway.persistence.jdo.datanucleus.valuetypes.DnDatastoreIdImplValueSemantics;
+
import lombok.val;
class IdStringifierForDatastoreId_DatastoreIdImpl_long_Test {
diff --git a/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForDatastoreId_DatastoreUniqueLongId_long_Test.java b/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForDatastoreId_DatastoreUniqueLongId_long_Test.java
index 533751dbe4..695a0ab66c 100644
--- a/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForDatastoreId_DatastoreUniqueLongId_long_Test.java
+++ b/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForDatastoreId_DatastoreUniqueLongId_long_Test.java
@@ -22,13 +22,14 @@ package org.apache.causeway.persistence.jdo.datanucleus.oid;
import java.util.stream.Stream;
-import org.apache.causeway.persistence.jdo.datanucleus.valuetypes.DnDatastoreUniqueLongIdValueSemantics;
import org.assertj.core.api.Assertions;
import org.datanucleus.identity.DatastoreUniqueLongId;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
+import org.apache.causeway.persistence.jdo.datanucleus.valuetypes.DnDatastoreUniqueLongIdValueSemantics;
+
import lombok.val;
class IdStringifierForDatastoreId_DatastoreUniqueLongId_long_Test {
diff --git a/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForDatastoreId_DatastoreUniqueLongId_str_Test.java b/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForDatastoreId_DatastoreUniqueLongId_str_Test.java
index 0998f4d5fe..0341858d31 100644
--- a/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForDatastoreId_DatastoreUniqueLongId_str_Test.java
+++ b/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForDatastoreId_DatastoreUniqueLongId_str_Test.java
@@ -22,13 +22,14 @@ package org.apache.causeway.persistence.jdo.datanucleus.oid;
import java.util.stream.Stream;
-import org.apache.causeway.persistence.jdo.datanucleus.valuetypes.DnDatastoreUniqueLongIdValueSemantics;
import org.assertj.core.api.Assertions;
import org.datanucleus.identity.DatastoreUniqueLongId;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
+import org.apache.causeway.persistence.jdo.datanucleus.valuetypes.DnDatastoreUniqueLongIdValueSemantics;
+
import lombok.val;
class IdStringifierForDatastoreId_DatastoreUniqueLongId_str_Test {
diff --git a/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForIntId_Test.java b/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForIntId_Test.java
index 11bef56578..16b742ce8e 100644
--- a/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForIntId_Test.java
+++ b/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForIntId_Test.java
@@ -22,13 +22,14 @@ package org.apache.causeway.persistence.jdo.datanucleus.oid;
import java.util.stream.Stream;
-import org.apache.causeway.persistence.jdo.datanucleus.valuetypes.DnIntIdValueSemantics;
import org.assertj.core.api.Assertions;
import org.datanucleus.identity.IntId;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
+import org.apache.causeway.persistence.jdo.datanucleus.valuetypes.DnIntIdValueSemantics;
+
import lombok.val;
class IdStringifierForIntId_Test {
diff --git a/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForIntIdentity_Test.java b/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForIntIdentity_Test.java
index 8d8a7571f5..c4da4a6d47 100644
--- a/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForIntIdentity_Test.java
+++ b/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForIntIdentity_Test.java
@@ -24,12 +24,13 @@ import java.util.stream.Stream;
import javax.jdo.identity.IntIdentity;
-import org.apache.causeway.persistence.jdo.datanucleus.valuetypes.JdoIntIdentityValueSemantics;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
+import org.apache.causeway.persistence.jdo.datanucleus.valuetypes.JdoIntIdentityValueSemantics;
+
import lombok.val;
class IdStringifierForIntIdentity_Test {
diff --git a/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForLongId_Test.java b/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForLongId_Test.java
index b772cc6655..a3c43aaa47 100644
--- a/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForLongId_Test.java
+++ b/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForLongId_Test.java
@@ -22,13 +22,14 @@ package org.apache.causeway.persistence.jdo.datanucleus.oid;
import java.util.stream.Stream;
-import org.apache.causeway.persistence.jdo.datanucleus.valuetypes.DnLongIdValueSemantics;
import org.assertj.core.api.Assertions;
import org.datanucleus.identity.LongId;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
+import org.apache.causeway.persistence.jdo.datanucleus.valuetypes.DnLongIdValueSemantics;
+
import lombok.val;
class IdStringifierForLongId_Test {
diff --git a/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForLongIdentity_Test.java b/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForLongIdentity_Test.java
index 7305d2e7aa..535a86e5ee 100644
--- a/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForLongIdentity_Test.java
+++ b/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForLongIdentity_Test.java
@@ -24,12 +24,13 @@ import java.util.stream.Stream;
import javax.jdo.identity.LongIdentity;
-import org.apache.causeway.persistence.jdo.datanucleus.valuetypes.JdoLongIdentityValueSemantics;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
+import org.apache.causeway.persistence.jdo.datanucleus.valuetypes.JdoLongIdentityValueSemantics;
+
import lombok.val;
class IdStringifierForLongIdentity_Test {
diff --git a/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForObjectIdentity_Test.java b/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForObjectIdentity_Test.java
index d27326f972..b37b2a6de5 100644
--- a/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForObjectIdentity_Test.java
+++ b/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForObjectIdentity_Test.java
@@ -24,12 +24,13 @@ import java.util.stream.Stream;
import javax.jdo.identity.ObjectIdentity;
-import org.apache.causeway.persistence.jdo.datanucleus.valuetypes.JdoObjectIdentityValueSemantics;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
+import org.apache.causeway.persistence.jdo.datanucleus.valuetypes.JdoObjectIdentityValueSemantics;
+
import lombok.val;
class IdStringifierForObjectIdentity_Test {
diff --git a/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForShortIdentity_Test.java b/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForShortIdentity_Test.java
index b26e04611c..6eb197cf8b 100644
--- a/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForShortIdentity_Test.java
+++ b/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/oid/IdStringifierForShortIdentity_Test.java
@@ -24,12 +24,13 @@ import java.util.stream.Stream;
import javax.jdo.identity.ShortIdentity;
-import org.apache.causeway.persistence.jdo.datanucleus.valuetypes.JdoShortIdentityValueSemantics;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
+import org.apache.causeway.persistence.jdo.datanucleus.valuetypes.JdoShortIdentityValueSemantics;
+
import lombok.val;
class IdStringifierForShortIdentity_Test {
diff --git a/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/test/ConfigurationExample1.java b/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/test/ConfigurationExample1.java
index ea085cd565..9216f406d9 100644
--- a/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/test/ConfigurationExample1.java
+++ b/persistence/jdo/datanucleus/src/test/java/org/apache/causeway/persistence/jdo/datanucleus/test/ConfigurationExample1.java
@@ -18,14 +18,15 @@
*/
package org.apache.causeway.persistence.jdo.datanucleus.test;
-import org.apache.causeway.commons.internal.collections._Maps;
-import org.apache.causeway.commons.internal.debug._Probe;
-import org.apache.causeway.persistence.jdo.spring.integration.LocalPersistenceManagerFactoryBean;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.commons.internal.collections._Maps;
+import org.apache.causeway.commons.internal.debug._Probe;
+import org.apache.causeway.persistence.jdo.spring.integration.LocalPersistenceManagerFactoryBean;
+
import lombok.val;
/**
diff --git a/persistence/jdo/integration/src/main/java/org/apache/causeway/persistence/jdo/integration/CausewayModulePersistenceJdoIntegration.java b/persistence/jdo/integration/src/main/java/org/apache/causeway/persistence/jdo/integration/CausewayModulePersistenceJdoIntegration.java
index 5bea374252..9344a776be 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/causeway/persistence/jdo/integration/CausewayModulePersistenceJdoIntegration.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/causeway/persistence/jdo/integration/CausewayModulePersistenceJdoIntegration.java
@@ -18,12 +18,13 @@
*/
package org.apache.causeway.persistence.jdo.integration;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
import org.apache.causeway.core.runtime.CausewayModuleCoreRuntime;
import org.apache.causeway.persistence.commons.CausewayModulePersistenceCommons;
import org.apache.causeway.persistence.jdo.applib.CausewayModulePersistenceJdoApplib;
import org.apache.causeway.persistence.jdo.metamodel.CausewayModulePersistenceJdoMetamodel;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
@Configuration
@Import({
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/CausewayModulePersistenceJdoMetamodel.java b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/CausewayModulePersistenceJdoMetamodel.java
index 6c29bb24ef..bcc789b7d6 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/CausewayModulePersistenceJdoMetamodel.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/CausewayModulePersistenceJdoMetamodel.java
@@ -18,12 +18,12 @@
*/
package org.apache.causeway.persistence.jdo.metamodel;
-import org.apache.causeway.persistence.jdo.metamodel.menu.JdoMetamodelMenu;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.apache.causeway.core.runtime.CausewayModuleCoreRuntime;
import org.apache.causeway.persistence.jdo.applib.CausewayModulePersistenceJdoApplib;
+import org.apache.causeway.persistence.jdo.metamodel.menu.JdoMetamodelMenu;
@Configuration
@Import({
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/JdoProgrammingModel.java b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/JdoProgrammingModel.java
index 115ce29f5f..fe6ed96458 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/JdoProgrammingModel.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/JdoProgrammingModel.java
@@ -32,9 +32,6 @@ import org.apache.causeway.core.metamodel.facets.object.parented.ParentedCollect
import org.apache.causeway.core.metamodel.progmodel.ProgrammingModel;
import org.apache.causeway.core.metamodel.progmodel.ProgrammingModel.Marker;
import org.apache.causeway.core.metamodel.specloader.validator.ValidationFailure;
-import org.apache.causeway.persistence.jdo.provider.entities.JdoFacetContext;
-import org.apache.causeway.persistence.jdo.provider.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacet;
-
import org.apache.causeway.persistence.jdo.metamodel.facets.object.datastoreidentity.JdoDatastoreIdentityAnnotationFacetFactory;
import org.apache.causeway.persistence.jdo.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacetFactory;
import org.apache.causeway.persistence.jdo.metamodel.facets.object.query.JdoQueryAnnotationFacetFactory;
@@ -44,6 +41,8 @@ import org.apache.causeway.persistence.jdo.metamodel.facets.prop.column.Mandator
import org.apache.causeway.persistence.jdo.metamodel.facets.prop.column.MaxLengthFromJdoColumnAnnotationFacetFactory;
import org.apache.causeway.persistence.jdo.metamodel.facets.prop.notpersistent.JdoNotPersistentAnnotationFacetFactory;
import org.apache.causeway.persistence.jdo.metamodel.facets.prop.primarykey.JdoPrimaryKeyAnnotationFacetFactory;
+import org.apache.causeway.persistence.jdo.provider.entities.JdoFacetContext;
+import org.apache.causeway.persistence.jdo.provider.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacet;
import lombok.val;
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/beans/JdoBeanTypeClassifier.java b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/beans/JdoBeanTypeClassifier.java
index fb5f8ca9b2..97e31d96ec 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/beans/JdoBeanTypeClassifier.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/beans/JdoBeanTypeClassifier.java
@@ -22,11 +22,10 @@ import java.util.Locale;
import javax.jdo.annotations.EmbeddedOnly;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.reflection._Annotations;
-
import org.apache.causeway.applib.id.LogicalType;
import org.apache.causeway.applib.services.metamodel.BeanSort;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.reflection._Annotations;
import org.apache.causeway.core.config.beans.CausewayBeanMetaData;
import org.apache.causeway.core.config.beans.CausewayBeanTypeClassifier;
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityAnnotationFacetFactory.java b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityAnnotationFacetFactory.java
index 1c7b3f44a4..34c1486c86 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityAnnotationFacetFactory.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityAnnotationFacetFactory.java
@@ -25,6 +25,7 @@ import javax.jdo.annotations.DatastoreIdentity;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FacetUtil;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
+import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.causeway.persistence.jdo.provider.entities.JdoFacetContext;
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetFactory.java b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetFactory.java
index 93169fc813..e590e5cbeb 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetFactory.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetFactory.java
@@ -30,6 +30,7 @@ import org.apache.causeway.core.metamodel.facetapi.FacetUtil;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.causeway.core.metamodel.facets.ObjectTypeFacetFactory;
+import org.apache.causeway.core.metamodel.facets.ObjectTypeFacetFactory.ProcessObjectTypeContext;
import org.apache.causeway.core.metamodel.facets.object.domainobject.DomainObjectAnnotationFacetFactory;
import org.apache.causeway.persistence.jdo.provider.entities.JdoFacetContext;
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetFromAnnotation.java b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetFromAnnotation.java
index e4f4ba12e6..6c39e6e97b 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetFromAnnotation.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetFromAnnotation.java
@@ -28,7 +28,6 @@ import javax.persistence.Entity;
import javax.persistence.Table;
import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.core.metamodel.facetapi.FacetAbstract;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.persistence.jdo.provider.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacet;
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/JdoQueriesFacetAnnotation.java b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/JdoQueriesFacetAnnotation.java
index ee27e6ca02..a5f9fc919d 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/JdoQueriesFacetAnnotation.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/JdoQueriesFacetAnnotation.java
@@ -21,7 +21,6 @@ package org.apache.causeway.persistence.jdo.metamodel.facets.object.query;
import javax.jdo.annotations.Query;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.persistence.jdo.provider.metamodel.facets.object.query.JdoQueryFacet;
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactory.java b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactory.java
index b8932b2477..0da090cc89 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactory.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactory.java
@@ -29,6 +29,7 @@ import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
import org.apache.causeway.core.metamodel.facetapi.MetaModelRefiner;
+import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.causeway.core.metamodel.progmodel.ProgrammingModel;
import org.apache.causeway.persistence.jdo.provider.entities.JdoFacetContext;
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/JdoQueryFacetAbstract.java b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/JdoQueryFacetAbstract.java
index dbd44c8119..ee56a4bbc5 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/JdoQueryFacetAbstract.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/JdoQueryFacetAbstract.java
@@ -23,7 +23,6 @@ import java.util.function.BiConsumer;
import javax.jdo.annotations.Query;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetAbstract;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/JdoQueryFacetAnnotation.java b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/JdoQueryFacetAnnotation.java
index a54db60f19..2816925774 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/JdoQueryFacetAnnotation.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/JdoQueryFacetAnnotation.java
@@ -21,7 +21,6 @@ package org.apache.causeway.persistence.jdo.metamodel.facets.object.query;
import javax.jdo.annotations.Query;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.persistence.jdo.provider.metamodel.facets.object.query.JdoQueryFacet;
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/MetaModelVisitingValidatorForClauseAbstract.java b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/MetaModelVisitingValidatorForClauseAbstract.java
index dd852e7d95..b595850dc8 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/MetaModelVisitingValidatorForClauseAbstract.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/MetaModelVisitingValidatorForClauseAbstract.java
@@ -18,12 +18,11 @@
*/
package org.apache.causeway.persistence.jdo.metamodel.facets.object.query;
+import org.apache.causeway.applib.Identifier;
+import org.apache.causeway.applib.id.LogicalType;
import org.apache.causeway.commons.functional.Try;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.context._Context;
-
-import org.apache.causeway.applib.Identifier;
-import org.apache.causeway.applib.id.LogicalType;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.specloader.validator.MetaModelVisitingValidatorAbstract;
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/MetaModelVisitingValidatorForFromClause.java b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/MetaModelVisitingValidatorForFromClause.java
index 894a7bed06..4241f4349b 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/MetaModelVisitingValidatorForFromClause.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/MetaModelVisitingValidatorForFromClause.java
@@ -20,10 +20,9 @@ package org.apache.causeway.persistence.jdo.metamodel.facets.object.query;
import java.util.Objects;
+import org.apache.causeway.applib.Identifier;
import org.apache.causeway.commons.functional.Try;
import org.apache.causeway.commons.internal.context._Context;
-
-import org.apache.causeway.applib.Identifier;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.spec.Hierarchical;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/MetaModelVisitingValidatorForVariablesClause.java b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/MetaModelVisitingValidatorForVariablesClause.java
index cf35b53430..80a850cb68 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/MetaModelVisitingValidatorForVariablesClause.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/MetaModelVisitingValidatorForVariablesClause.java
@@ -18,11 +18,10 @@
*/
package org.apache.causeway.persistence.jdo.metamodel.facets.object.query;
-import org.apache.causeway.commons.functional.Try;
-import org.apache.causeway.commons.internal.context._Context;
-
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.id.LogicalType;
+import org.apache.causeway.commons.functional.Try;
+import org.apache.causeway.commons.internal.context._Context;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.specloader.validator.ValidationFailure;
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactory.java b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactory.java
index 4cec66be84..ba12d121ed 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactory.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactory.java
@@ -25,10 +25,10 @@ import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.commons.internal.reflection._Annotations;
import org.apache.causeway.commons.internal.reflection._Reflect;
import org.apache.causeway.commons.internal.reflection._Reflect.InterfacePolicy;
-
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FacetUtil;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
+import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.causeway.core.metamodel.specloader.validator.ValidationFailure;
import org.apache.causeway.persistence.jdo.provider.entities.JdoFacetContext;
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/BigDecimalFromColumnAnnotationFacetFactory.java b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/BigDecimalFromColumnAnnotationFacetFactory.java
index a35aeb5bdd..827b1a7725 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/BigDecimalFromColumnAnnotationFacetFactory.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/BigDecimalFromColumnAnnotationFacetFactory.java
@@ -26,6 +26,7 @@ import javax.jdo.annotations.IdentityType;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
import org.apache.causeway.core.metamodel.facetapi.MetaModelRefiner;
+import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.causeway.core.metamodel.facets.FacetedMethod;
import org.apache.causeway.core.metamodel.facets.objectvalue.digits.MaxFractionalDigitsFacet;
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/MandatoryFacetFromAbsenceOfColumnAnnotation.java b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/MandatoryFacetFromAbsenceOfColumnAnnotation.java
index 07cff0ff3e..747b96228e 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/MandatoryFacetFromAbsenceOfColumnAnnotation.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/MandatoryFacetFromAbsenceOfColumnAnnotation.java
@@ -18,6 +18,7 @@
*/
package org.apache.causeway.persistence.jdo.metamodel.facets.prop.column;
+import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.objectvalue.mandatory.MandatoryFacetAbstract;
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/MandatoryFromColumnAnnotationFacetFactory.java b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/MandatoryFromColumnAnnotationFacetFactory.java
index 3bf068eb96..a97e9545f1 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/MandatoryFromColumnAnnotationFacetFactory.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/MandatoryFromColumnAnnotationFacetFactory.java
@@ -28,6 +28,7 @@ import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence;
import org.apache.causeway.core.metamodel.facetapi.FacetUtil;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
import org.apache.causeway.core.metamodel.facetapi.MetaModelRefiner;
+import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.causeway.core.metamodel.facets.FacetedMethod;
import org.apache.causeway.core.metamodel.facets.objectvalue.mandatory.MandatoryFacet;
@@ -36,12 +37,11 @@ import org.apache.causeway.core.metamodel.progmodel.ProgrammingModel;
import org.apache.causeway.core.metamodel.spec.feature.MixedIn;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.causeway.core.metamodel.specloader.validator.ValidationFailure;
+import org.apache.causeway.persistence.jdo.metamodel.facets.prop.primarykey.OptionalFacetFromJdoPrimaryKeyAnnotation;
import org.apache.causeway.persistence.jdo.provider.entities.JdoFacetContext;
import org.apache.causeway.persistence.jdo.provider.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacet;
import org.apache.causeway.persistence.jdo.provider.metamodel.facets.prop.notpersistent.JdoNotPersistentFacet;
-import org.apache.causeway.persistence.jdo.metamodel.facets.prop.primarykey.OptionalFacetFromJdoPrimaryKeyAnnotation;
-
public class MandatoryFromColumnAnnotationFacetFactory
extends FacetFactoryAbstract
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/MaxLengthFromJdoColumnAnnotationFacetFactory.java b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/MaxLengthFromJdoColumnAnnotationFacetFactory.java
index 1f8764d541..3ec42519ff 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/MaxLengthFromJdoColumnAnnotationFacetFactory.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/MaxLengthFromJdoColumnAnnotationFacetFactory.java
@@ -27,6 +27,7 @@ import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FacetUtil;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
import org.apache.causeway.core.metamodel.facetapi.MetaModelRefiner;
+import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.causeway.core.metamodel.facets.objectvalue.maxlen.MaxLengthFacet;
import org.apache.causeway.core.metamodel.progmodel.ProgrammingModel;
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/_ColumnUtil.java b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/_ColumnUtil.java
index c11ee71545..4027c6c356 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/_ColumnUtil.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/_ColumnUtil.java
@@ -26,7 +26,6 @@ import java.util.function.Consumer;
import javax.jdo.annotations.Column;
import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.causeway.core.metamodel.facets.objectvalue.mandatory.MandatoryFacet.Semantics;
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentAnnotationFacetFactory.java b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentAnnotationFacetFactory.java
index f508e272c8..a5fac061bf 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentAnnotationFacetFactory.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentAnnotationFacetFactory.java
@@ -25,6 +25,7 @@ import javax.persistence.Transient;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FacetUtil;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
+import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.causeway.persistence.jdo.provider.entities.JdoFacetContext;
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyAnnotationFacetFactory.java b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyAnnotationFacetFactory.java
index fe4be757ce..eddbc5b68c 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyAnnotationFacetFactory.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyAnnotationFacetFactory.java
@@ -23,6 +23,7 @@ import javax.jdo.annotations.PrimaryKey;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
+import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.causeway.persistence.jdo.provider.entities.JdoFacetContext;
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/primarykey/OptionalFacetFromJdoPrimaryKeyAnnotation.java b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/primarykey/OptionalFacetFromJdoPrimaryKeyAnnotation.java
index bdb6b30982..ff31256408 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/primarykey/OptionalFacetFromJdoPrimaryKeyAnnotation.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/primarykey/OptionalFacetFromJdoPrimaryKeyAnnotation.java
@@ -20,6 +20,7 @@ package org.apache.causeway.persistence.jdo.metamodel.facets.prop.primarykey;
import javax.jdo.annotations.PrimaryKey;
+import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.objectvalue.mandatory.MandatoryFacetAbstract;
import org.apache.causeway.core.metamodel.facets.properties.defaults.PropertyDefaultFacet;
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/menu/JdoMetamodelMenu.java b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/menu/JdoMetamodelMenu.java
index c70c55061c..947b9ad886 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/menu/JdoMetamodelMenu.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/menu/JdoMetamodelMenu.java
@@ -35,10 +35,9 @@ import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.util.ZipWriter;
import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.applib.value.NamedWithMimeType.CommonMimeType;
-import org.apache.causeway.persistence.jdo.provider.entities.JdoFacetContext;
-
import org.apache.causeway.persistence.jdo.applib.services.JdoSupportService;
import org.apache.causeway.persistence.jdo.metamodel.CausewayModulePersistenceJdoMetamodel;
+import org.apache.causeway.persistence.jdo.provider.entities.JdoFacetContext;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/datastoreidentity/GivenJdoDatastoreIdentityAnnotationFacetFactoryTest.java b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/datastoreidentity/GivenJdoDatastoreIdentityAnnotationFacetFactoryTest.java
index 4dcee0514f..24746d544e 100644
--- a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/datastoreidentity/GivenJdoDatastoreIdentityAnnotationFacetFactoryTest.java
+++ b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/datastoreidentity/GivenJdoDatastoreIdentityAnnotationFacetFactoryTest.java
@@ -28,9 +28,6 @@ import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessClassContex
import org.apache.causeway.persistence.jdo.metamodel.testing.AbstractFacetFactoryTest;
import org.apache.causeway.persistence.jdo.provider.metamodel.facets.object.datastoreidentity.JdoDatastoreIdentityFacet;
-import org.apache.causeway.persistence.jdo.metamodel.facets.object.datastoreidentity.JdoDatastoreIdentityAnnotationFacetFactory;
-import org.apache.causeway.persistence.jdo.metamodel.facets.object.datastoreidentity.JdoDatastoreIdentityFacetAnnotation;
-
import lombok.val;
public class GivenJdoDatastoreIdentityAnnotationFacetFactoryTest
diff --git a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/persistencecapable/GivenJdoPersistenceCapableFacetFactoryTest.java b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/persistencecapable/GivenJdoPersistenceCapableFacetFactoryTest.java
index 512b21e1e8..9e5daac0c3 100644
--- a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/persistencecapable/GivenJdoPersistenceCapableFacetFactoryTest.java
+++ b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/persistencecapable/GivenJdoPersistenceCapableFacetFactoryTest.java
@@ -24,12 +24,9 @@ import javax.jdo.annotations.PersistenceCapable;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessClassContext;
+import org.apache.causeway.core.metamodel.facets.ObjectTypeFacetFactory;
import org.apache.causeway.persistence.jdo.metamodel.testing.AbstractFacetFactoryTest;
import org.apache.causeway.persistence.jdo.provider.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacet;
-import org.apache.causeway.core.metamodel.facets.ObjectTypeFacetFactory;
-
-import org.apache.causeway.persistence.jdo.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacetFactory;
-import org.apache.causeway.persistence.jdo.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacetFromAnnotation;
import lombok.val;
diff --git a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactoryTest.java b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactoryTest.java
index 5da941db80..834857aeb2 100644
--- a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactoryTest.java
+++ b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactoryTest.java
@@ -25,8 +25,6 @@ import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.nullValue;
-import org.apache.causeway.persistence.jdo.metamodel.facets.object.query.JdoQueryAnnotationFacetFactory;
-
public class JdoQueryAnnotationFacetFactoryTest {
public static class From_Test extends JdoQueryAnnotationFacetFactoryTest {
diff --git a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/BigDecimalFromJdoColumnAnnotationFacetFactoryTest.java b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/BigDecimalFromJdoColumnAnnotationFacetFactoryTest.java
index b243b2f5a4..3430105ff1 100644
--- a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/BigDecimalFromJdoColumnAnnotationFacetFactoryTest.java
+++ b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/BigDecimalFromJdoColumnAnnotationFacetFactoryTest.java
@@ -20,6 +20,9 @@ package org.apache.causeway.persistence.jdo.metamodel.facets.prop.column;
import java.lang.reflect.Method;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import org.apache.causeway.core.metamodel._testing.MetaModelContext_forTesting;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext;
@@ -28,13 +31,6 @@ import org.apache.causeway.core.metamodel.facets.objectvalue.digits.MaxFractiona
import org.apache.causeway.core.metamodel.facets.objectvalue.digits.MaxTotalDigitsFacet;
import org.apache.causeway.persistence.jdo.metamodel.testing.AbstractFacetFactoryTest;
-import org.apache.causeway.persistence.jdo.metamodel.facets.prop.column.BigDecimalFromColumnAnnotationFacetFactory;
-import org.apache.causeway.persistence.jdo.metamodel.facets.prop.column.MaxFractionalDigitsFacetFromJdoColumn;
-import org.apache.causeway.persistence.jdo.metamodel.facets.prop.column.MaxTotalDigitsFacetFromJdoColumnAnnotation;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
import lombok.val;
public class BigDecimalFromJdoColumnAnnotationFacetFactoryTest
diff --git a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactoryTest.java b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactoryTest.java
index 3e5c068d3b..68398fd487 100644
--- a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactoryTest.java
+++ b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactoryTest.java
@@ -20,18 +20,14 @@ package org.apache.causeway.persistence.jdo.metamodel.facets.prop.column;
import java.lang.reflect.Method;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.causeway.core.metamodel.facets.objectvalue.mandatory.MandatoryFacet;
import org.apache.causeway.persistence.jdo.metamodel.testing.AbstractFacetFactoryTest;
-import org.apache.causeway.persistence.jdo.metamodel.facets.prop.column.MandatoryFacetFromAbsenceOfColumnAnnotation;
-import org.apache.causeway.persistence.jdo.metamodel.facets.prop.column.MandatoryFacetFromColumnAnnotation;
-import org.apache.causeway.persistence.jdo.metamodel.facets.prop.column.MandatoryFromColumnAnnotationFacetFactory;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
import lombok.val;
public class MandatoryFromJdoColumnAnnotationFacetFactoryTest
diff --git a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/notpersistent/GivenJdoNotPersistentAnnotationFacetFactoryTest.java b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/notpersistent/GivenJdoNotPersistentAnnotationFacetFactoryTest.java
index d7e4b1834a..5bfd7a4089 100644
--- a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/notpersistent/GivenJdoNotPersistentAnnotationFacetFactoryTest.java
+++ b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/notpersistent/GivenJdoNotPersistentAnnotationFacetFactoryTest.java
@@ -28,8 +28,6 @@ import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodConte
import org.apache.causeway.persistence.jdo.metamodel.testing.AbstractFacetFactoryTest;
import org.apache.causeway.persistence.jdo.provider.metamodel.facets.prop.notpersistent.JdoNotPersistentFacet;
-import org.apache.causeway.persistence.jdo.metamodel.facets.prop.notpersistent.JdoNotPersistentAnnotationFacetFactory;
-
import lombok.val;
public class GivenJdoNotPersistentAnnotationFacetFactoryTest
diff --git a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/primarykey/GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/primarykey/GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java
index 664b8a33be..9978657f09 100644
--- a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/primarykey/GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java
+++ b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/primarykey/GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java
@@ -30,10 +30,6 @@ import org.apache.causeway.core.metamodel.facets.objectvalue.mandatory.Mandatory
import org.apache.causeway.persistence.jdo.metamodel.testing.AbstractFacetFactoryTest;
import org.apache.causeway.persistence.jdo.provider.metamodel.facets.prop.primarykey.JdoPrimaryKeyFacet;
-import org.apache.causeway.persistence.jdo.metamodel.facets.prop.primarykey.DisabledFacetFromJdoPrimaryKeyAnnotation;
-import org.apache.causeway.persistence.jdo.metamodel.facets.prop.primarykey.JdoPrimaryKeyAnnotationFacetFactory;
-import org.apache.causeway.persistence.jdo.metamodel.facets.prop.primarykey.OptionalFacetFromJdoPrimaryKeyAnnotation;
-
import lombok.val;
public class GivenJdoPrimaryKeyAnnotationFacetFactoryTest
diff --git a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/testing/AbstractFacetFactoryTest.java b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/testing/AbstractFacetFactoryTest.java
index 9a4e2f3265..eb9d88fdbb 100644
--- a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/testing/AbstractFacetFactoryTest.java
+++ b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/testing/AbstractFacetFactoryTest.java
@@ -21,7 +21,6 @@ package org.apache.causeway.persistence.jdo.metamodel.testing;
import java.lang.reflect.Method;
import java.util.Optional;
-import org.apache.causeway.commons.collections.ImmutableEnumSet;
import org.jmock.Expectations;
import org.junit.Rule;
@@ -31,6 +30,7 @@ import org.apache.causeway.applib.services.i18n.TranslationService;
import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.repository.EntityState;
+import org.apache.causeway.commons.collections.ImmutableEnumSet;
import org.apache.causeway.core.config.beans.PersistenceStack;
import org.apache.causeway.core.internaltestsupport.jmocking.JUnitRuleMockery2;
import org.apache.causeway.core.metamodel._testing.MetaModelContext_forTesting;
diff --git a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/testing/Utils.java b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/testing/Utils.java
index ecddd3f035..f0f94a0181 100644
--- a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/testing/Utils.java
+++ b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/testing/Utils.java
@@ -22,7 +22,6 @@ import java.lang.reflect.Method;
import org.apache.causeway.commons.collections.ImmutableEnumSet;
import org.apache.causeway.commons.internal._Constants;
-
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
class Utils {
diff --git a/persistence/jdo/provider/src/main/java/org/apache/causeway/persistence/jdo/provider/metamodel/facets/object/query/JdoNamedQuery.java b/persistence/jdo/provider/src/main/java/org/apache/causeway/persistence/jdo/provider/metamodel/facets/object/query/JdoNamedQuery.java
index 7faf66e6dd..3603ee4dae 100644
--- a/persistence/jdo/provider/src/main/java/org/apache/causeway/persistence/jdo/provider/metamodel/facets/object/query/JdoNamedQuery.java
+++ b/persistence/jdo/provider/src/main/java/org/apache/causeway/persistence/jdo/provider/metamodel/facets/object/query/JdoNamedQuery.java
@@ -18,9 +18,10 @@
*/
package org.apache.causeway.persistence.jdo.provider.metamodel.facets.object.query;
-import org.springframework.lang.Nullable;
import javax.jdo.annotations.Query;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.core.metamodel.services.metamodel.MetaModelExportSupport;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
diff --git a/persistence/jdo/provider/src/main/java/org/apache/causeway/persistence/jdo/provider/metamodel/facets/object/query/JdoQueryFacet.java b/persistence/jdo/provider/src/main/java/org/apache/causeway/persistence/jdo/provider/metamodel/facets/object/query/JdoQueryFacet.java
index ad4e62cee9..b92b97aa2a 100644
--- a/persistence/jdo/provider/src/main/java/org/apache/causeway/persistence/jdo/provider/metamodel/facets/object/query/JdoQueryFacet.java
+++ b/persistence/jdo/provider/src/main/java/org/apache/causeway/persistence/jdo/provider/metamodel/facets/object/query/JdoQueryFacet.java
@@ -21,7 +21,6 @@ package org.apache.causeway.persistence.jdo.provider.metamodel.facets.object.que
import javax.jdo.annotations.Query;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.facetapi.Facet;
diff --git a/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/exceptions/JdoResourceFailureException.java b/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/exceptions/JdoResourceFailureException.java
index b215c71048..0b8a0b8cfb 100644
--- a/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/exceptions/JdoResourceFailureException.java
+++ b/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/exceptions/JdoResourceFailureException.java
@@ -21,9 +21,10 @@ package org.apache.causeway.persistence.jdo.spring.exceptions;
import javax.jdo.JDODataStoreException;
import javax.jdo.JDOFatalDataStoreException;
-import org.apache.causeway.persistence.jdo.spring.integration.PersistenceManagerFactoryUtils;
import org.springframework.dao.DataAccessResourceFailureException;
+import org.apache.causeway.persistence.jdo.spring.integration.PersistenceManagerFactoryUtils;
+
/**
* JDO-specific subclass of DataAccessResourceFailureException.
* Converts JDO's JDODataStoreException and JDOFatalDataStoreException.
diff --git a/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/exceptions/JdoSystemException.java b/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/exceptions/JdoSystemException.java
index be1d15cf8d..a00c94460a 100644
--- a/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/exceptions/JdoSystemException.java
+++ b/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/exceptions/JdoSystemException.java
@@ -20,9 +20,10 @@ package org.apache.causeway.persistence.jdo.spring.exceptions;
import javax.jdo.JDOException;
-import org.apache.causeway.persistence.jdo.spring.integration.PersistenceManagerFactoryUtils;
import org.springframework.dao.UncategorizedDataAccessException;
+import org.apache.causeway.persistence.jdo.spring.integration.PersistenceManagerFactoryUtils;
+
/**
* JDO-specific subclass of UncategorizedDataAccessException,
* for JDO system errors that do not match any concrete
diff --git a/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/exceptions/JdoUsageException.java b/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/exceptions/JdoUsageException.java
index 1b4b3a0bf8..649a4f40b1 100644
--- a/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/exceptions/JdoUsageException.java
+++ b/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/exceptions/JdoUsageException.java
@@ -21,9 +21,10 @@ package org.apache.causeway.persistence.jdo.spring.exceptions;
import javax.jdo.JDOFatalUserException;
import javax.jdo.JDOUserException;
-import org.apache.causeway.persistence.jdo.spring.integration.PersistenceManagerFactoryUtils;
import org.springframework.dao.InvalidDataAccessApiUsageException;
+import org.apache.causeway.persistence.jdo.spring.integration.PersistenceManagerFactoryUtils;
+
/**
* JDO-specific subclass of InvalidDataAccessApiUsageException.
* Converts JDO's JDOUserException and JDOFatalUserException.
diff --git a/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/integration/DefaultJdoDialect.java b/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/integration/DefaultJdoDialect.java
index 092ae7fd24..40055bff00 100644
--- a/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/integration/DefaultJdoDialect.java
+++ b/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/integration/DefaultJdoDialect.java
@@ -20,6 +20,7 @@ package org.apache.causeway.persistence.jdo.spring.integration;
import java.sql.Connection;
import java.sql.SQLException;
+
import javax.jdo.Constants;
import javax.jdo.JDOException;
import javax.jdo.PersistenceManager;
diff --git a/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/integration/JdoDialect.java b/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/integration/JdoDialect.java
index 0b62a87ab2..f5efa1fa2d 100644
--- a/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/integration/JdoDialect.java
+++ b/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/integration/JdoDialect.java
@@ -19,6 +19,7 @@
package org.apache.causeway.persistence.jdo.spring.integration;
import java.sql.SQLException;
+
import javax.jdo.JDOException;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
diff --git a/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/integration/LocalPersistenceManagerFactoryBean.java b/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/integration/LocalPersistenceManagerFactoryBean.java
index 86fbb13f3a..9298089b4c 100644
--- a/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/integration/LocalPersistenceManagerFactoryBean.java
+++ b/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/integration/LocalPersistenceManagerFactoryBean.java
@@ -22,13 +22,13 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
+
import javax.jdo.JDOException;
import javax.jdo.JDOHelper;
import javax.jdo.PersistenceManagerFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.springframework.beans.factory.BeanClassLoaderAware;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.FactoryBean;
diff --git a/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/integration/PersistenceManagerFactoryUtils.java b/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/integration/PersistenceManagerFactoryUtils.java
index f2aef62086..af8400164a 100644
--- a/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/integration/PersistenceManagerFactoryUtils.java
+++ b/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/integration/PersistenceManagerFactoryUtils.java
@@ -30,14 +30,8 @@ import javax.jdo.PersistenceManagerFactory;
import javax.jdo.Query;
import javax.sql.DataSource;
-import org.apache.causeway.persistence.jdo.spring.exceptions.JdoObjectRetrievalFailureException;
-import org.apache.causeway.persistence.jdo.spring.exceptions.JdoOptimisticLockingFailureException;
-import org.apache.causeway.persistence.jdo.spring.exceptions.JdoResourceFailureException;
-import org.apache.causeway.persistence.jdo.spring.exceptions.JdoSystemException;
-import org.apache.causeway.persistence.jdo.spring.exceptions.JdoUsageException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.springframework.core.Ordered;
import org.springframework.dao.DataAccessException;
import org.springframework.dao.DataAccessResourceFailureException;
@@ -49,6 +43,12 @@ import org.springframework.transaction.support.ResourceHolderSynchronization;
import org.springframework.transaction.support.TransactionSynchronizationManager;
import org.springframework.util.Assert;
+import org.apache.causeway.persistence.jdo.spring.exceptions.JdoObjectRetrievalFailureException;
+import org.apache.causeway.persistence.jdo.spring.exceptions.JdoOptimisticLockingFailureException;
+import org.apache.causeway.persistence.jdo.spring.exceptions.JdoResourceFailureException;
+import org.apache.causeway.persistence.jdo.spring.exceptions.JdoSystemException;
+import org.apache.causeway.persistence.jdo.spring.exceptions.JdoUsageException;
+
/**
* Helper class featuring methods for JDO {@link PersistenceManager} handling,
* allowing for reuse of PersistenceManager instances within transactions.
diff --git a/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/support/OpenPersistenceManagerInViewFilter.java b/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/support/OpenPersistenceManagerInViewFilter.java
index 1545f5cf3f..c3a9c690f1 100644
--- a/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/support/OpenPersistenceManagerInViewFilter.java
+++ b/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/support/OpenPersistenceManagerInViewFilter.java
@@ -19,6 +19,7 @@
package org.apache.causeway.persistence.jdo.spring.support;
import java.io.IOException;
+
import javax.jdo.PersistenceManager;
import javax.jdo.PersistenceManagerFactory;
import javax.servlet.FilterChain;
@@ -26,13 +27,14 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.causeway.persistence.jdo.spring.integration.PersistenceManagerFactoryUtils;
-import org.apache.causeway.persistence.jdo.spring.integration.PersistenceManagerHolder;
import org.springframework.transaction.support.TransactionSynchronizationManager;
import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.context.support.WebApplicationContextUtils;
import org.springframework.web.filter.OncePerRequestFilter;
+import org.apache.causeway.persistence.jdo.spring.integration.PersistenceManagerFactoryUtils;
+import org.apache.causeway.persistence.jdo.spring.integration.PersistenceManagerHolder;
+
/**
* Servlet Filter that binds a JDO PersistenceManager to the thread for the
* entire processing of the request. Intended for the "Open PersistenceManager in
diff --git a/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/support/OpenPersistenceManagerInViewInterceptor.java b/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/support/OpenPersistenceManagerInViewInterceptor.java
index 7df2e2ec9d..a2fab5a04e 100644
--- a/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/support/OpenPersistenceManagerInViewInterceptor.java
+++ b/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/support/OpenPersistenceManagerInViewInterceptor.java
@@ -21,17 +21,17 @@ package org.apache.causeway.persistence.jdo.spring.support;
import javax.jdo.PersistenceManager;
import javax.jdo.PersistenceManagerFactory;
-import org.apache.causeway.persistence.jdo.spring.integration.PersistenceManagerFactoryUtils;
-import org.apache.causeway.persistence.jdo.spring.integration.PersistenceManagerHolder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.springframework.dao.DataAccessException;
import org.springframework.transaction.support.TransactionSynchronizationManager;
import org.springframework.ui.ModelMap;
import org.springframework.web.context.request.WebRequest;
import org.springframework.web.context.request.WebRequestInterceptor;
+import org.apache.causeway.persistence.jdo.spring.integration.PersistenceManagerFactoryUtils;
+import org.apache.causeway.persistence.jdo.spring.integration.PersistenceManagerHolder;
+
/**
* Spring web request interceptor that binds a JDO PersistenceManager to the
* thread for the entire processing of the request. Intended for the "Open
diff --git a/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/support/SpringPersistenceManagerProxyBean.java b/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/support/SpringPersistenceManagerProxyBean.java
index 842999d5ea..1e8772d2e3 100644
--- a/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/support/SpringPersistenceManagerProxyBean.java
+++ b/persistence/jdo/spring/src/main/java/org/apache/causeway/persistence/jdo/spring/support/SpringPersistenceManagerProxyBean.java
@@ -27,13 +27,14 @@ import javax.jdo.PersistenceManager;
import javax.jdo.PersistenceManagerFactory;
import javax.jdo.Query;
-import org.apache.causeway.persistence.jdo.spring.integration.DefaultJdoDialect;
-import org.apache.causeway.persistence.jdo.spring.integration.JdoDialect;
-import org.apache.causeway.persistence.jdo.spring.integration.PersistenceManagerFactoryUtils;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.util.Assert;
+import org.apache.causeway.persistence.jdo.spring.integration.DefaultJdoDialect;
+import org.apache.causeway.persistence.jdo.spring.integration.JdoDialect;
+import org.apache.causeway.persistence.jdo.spring.integration.PersistenceManagerFactoryUtils;
+
/**
* Proxy that implements the {@link javax.jdo.PersistenceManager} interface,
* delegating to the current thread-bound PersistenceManager (the Spring-managed
diff --git a/persistence/jdo/spring/src/test/java/org/apache/causeway/persistence/jdo/spring/test/integration/LocalPersistenceManagerFactoryTests.java b/persistence/jdo/spring/src/test/java/org/apache/causeway/persistence/jdo/spring/test/integration/LocalPersistenceManagerFactoryTests.java
index 90f8b9c528..8f718af36d 100644
--- a/persistence/jdo/spring/src/test/java/org/apache/causeway/persistence/jdo/spring/test/integration/LocalPersistenceManagerFactoryTests.java
+++ b/persistence/jdo/spring/src/test/java/org/apache/causeway/persistence/jdo/spring/test/integration/LocalPersistenceManagerFactoryTests.java
@@ -25,7 +25,6 @@ import java.util.Properties;
import javax.jdo.JDOFatalUserException;
import javax.jdo.PersistenceManagerFactory;
-import org.apache.causeway.persistence.jdo.spring.integration.LocalPersistenceManagerFactoryBean;
import org.junit.jupiter.api.Test;
import org.springframework.core.io.ClassPathResource;
@@ -34,6 +33,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.Mockito.mock;
+import org.apache.causeway.persistence.jdo.spring.integration.LocalPersistenceManagerFactoryBean;
+
class LocalPersistenceManagerFactoryTests {
@Test
diff --git a/persistence/jdo/spring/src/test/java/org/apache/causeway/persistence/jdo/spring/test/support/OpenPersistenceManagerInViewTests.java b/persistence/jdo/spring/src/test/java/org/apache/causeway/persistence/jdo/spring/test/support/OpenPersistenceManagerInViewTests.java
index 9c426ceb6f..ec27542caa 100644
--- a/persistence/jdo/spring/src/test/java/org/apache/causeway/persistence/jdo/spring/test/support/OpenPersistenceManagerInViewTests.java
+++ b/persistence/jdo/spring/src/test/java/org/apache/causeway/persistence/jdo/spring/test/support/OpenPersistenceManagerInViewTests.java
@@ -27,8 +27,6 @@ import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import org.apache.causeway.persistence.jdo.spring.support.OpenPersistenceManagerInViewFilter;
-import org.apache.causeway.persistence.jdo.spring.support.OpenPersistenceManagerInViewInterceptor;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockFilterConfig;
import org.springframework.mock.web.MockHttpServletRequest;
@@ -47,6 +45,9 @@ import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
+import org.apache.causeway.persistence.jdo.spring.support.OpenPersistenceManagerInViewFilter;
+import org.apache.causeway.persistence.jdo.spring.support.OpenPersistenceManagerInViewInterceptor;
+
class OpenPersistenceManagerInViewTests {
@Test
diff --git a/persistence/jpa/applib/src/main/java/org/apache/causeway/persistence/jpa/applib/integration/CausewayEntityListener.java b/persistence/jpa/applib/src/main/java/org/apache/causeway/persistence/jpa/applib/integration/CausewayEntityListener.java
index 270a71776a..fec8f0610f 100644
--- a/persistence/jpa/applib/src/main/java/org/apache/causeway/persistence/jpa/applib/integration/CausewayEntityListener.java
+++ b/persistence/jpa/applib/src/main/java/org/apache/causeway/persistence/jpa/applib/integration/CausewayEntityListener.java
@@ -28,11 +28,11 @@ import javax.persistence.PrePersist;
import javax.persistence.PreRemove;
import javax.persistence.PreUpdate;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.functional.Either;
import org.eclipse.persistence.sessions.UnitOfWork;
import org.eclipse.persistence.sessions.changesets.DirectToFieldChangeRecord;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.functional.Either;
import org.apache.causeway.core.metamodel.facets.object.publish.entitychange.EntityChangePublishingFacet;
import org.apache.causeway.core.metamodel.facets.properties.property.entitychangepublishing.EntityPropertyChangePublishingPolicyFacet;
import org.apache.causeway.core.metamodel.objectmanager.ObjectManager;
diff --git a/persistence/jpa/eclipselink/src/main/java/org/apache/causeway/persistence/jpa/eclipselink/CausewayModulePersistenceJpaEclipselink.java b/persistence/jpa/eclipselink/src/main/java/org/apache/causeway/persistence/jpa/eclipselink/CausewayModulePersistenceJpaEclipselink.java
index 15b294acaa..d90763efbf 100644
--- a/persistence/jpa/eclipselink/src/main/java/org/apache/causeway/persistence/jpa/eclipselink/CausewayModulePersistenceJpaEclipselink.java
+++ b/persistence/jpa/eclipselink/src/main/java/org/apache/causeway/persistence/jpa/eclipselink/CausewayModulePersistenceJpaEclipselink.java
@@ -24,7 +24,6 @@ import java.util.Map;
import javax.inject.Inject;
import javax.sql.DataSource;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.orm.jpa.JpaBaseConfiguration;
import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties;
@@ -41,6 +40,7 @@ import org.springframework.orm.jpa.vendor.EclipseLinkJpaDialect;
import org.springframework.orm.jpa.vendor.EclipseLinkJpaVendorAdapter;
import org.springframework.transaction.jta.JtaTransactionManager;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.persistence.jpa.eclipselink.config.ElSettings;
import org.apache.causeway.persistence.jpa.integration.CausewayModulePersistenceJpaIntegration;
diff --git a/persistence/jpa/eclipselink/src/main/java/org/apache/causeway/persistence/jpa/eclipselink/config/ElSettings.java b/persistence/jpa/eclipselink/src/main/java/org/apache/causeway/persistence/jpa/eclipselink/config/ElSettings.java
index 17f9815d17..c35e89f31e 100644
--- a/persistence/jpa/eclipselink/src/main/java/org/apache/causeway/persistence/jpa/eclipselink/config/ElSettings.java
+++ b/persistence/jpa/eclipselink/src/main/java/org/apache/causeway/persistence/jpa/eclipselink/config/ElSettings.java
@@ -27,8 +27,6 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Provider;
-import org.apache.causeway.commons.internal.base._Lazy;
-import org.apache.causeway.persistence.jpa.eclipselink.inject.BeanManagerForEntityListeners;
import org.eclipse.persistence.config.PersistenceUnitProperties;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -36,6 +34,8 @@ import org.springframework.context.annotation.Configuration;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.inject.ServiceInjector;
+import org.apache.causeway.commons.internal.base._Lazy;
+import org.apache.causeway.persistence.jpa.eclipselink.inject.BeanManagerForEntityListeners;
import lombok.Getter;
import lombok.Setter;
diff --git a/persistence/jpa/eclipselink/src/main/java/org/apache/causeway/persistence/jpa/eclipselink/inject/BeanManagerForEntityListeners.java b/persistence/jpa/eclipselink/src/main/java/org/apache/causeway/persistence/jpa/eclipselink/inject/BeanManagerForEntityListeners.java
index 2d98aefbb4..ee23089e32 100644
--- a/persistence/jpa/eclipselink/src/main/java/org/apache/causeway/persistence/jpa/eclipselink/inject/BeanManagerForEntityListeners.java
+++ b/persistence/jpa/eclipselink/src/main/java/org/apache/causeway/persistence/jpa/eclipselink/inject/BeanManagerForEntityListeners.java
@@ -50,9 +50,8 @@ import javax.enterprise.inject.spi.ObserverMethod;
import javax.enterprise.inject.spi.ProducerFactory;
import javax.inject.Provider;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
-
import org.apache.causeway.applib.services.inject.ServiceInjector;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import lombok.RequiredArgsConstructor;
diff --git a/persistence/jpa/eclipselink/src/main/java/org/apache/causeway/persistence/jpa/eclipselink/inject/_Util.java b/persistence/jpa/eclipselink/src/main/java/org/apache/causeway/persistence/jpa/eclipselink/inject/_Util.java
index 51fc687e87..3bb5f13ce7 100644
--- a/persistence/jpa/eclipselink/src/main/java/org/apache/causeway/persistence/jpa/eclipselink/inject/_Util.java
+++ b/persistence/jpa/eclipselink/src/main/java/org/apache/causeway/persistence/jpa/eclipselink/inject/_Util.java
@@ -33,11 +33,10 @@ import javax.enterprise.inject.spi.InjectionPoint;
import javax.enterprise.inject.spi.InjectionTarget;
import javax.inject.Provider;
+import org.apache.causeway.applib.services.inject.ServiceInjector;
import org.apache.causeway.commons.internal._Constants;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
-import org.apache.causeway.applib.services.inject.ServiceInjector;
-
import lombok.SneakyThrows;
final class _Util {
diff --git a/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/CausewayModulePersistenceJpaIntegration.java b/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/CausewayModulePersistenceJpaIntegration.java
index 231fac3474..fff16c18d5 100644
--- a/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/CausewayModulePersistenceJpaIntegration.java
+++ b/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/CausewayModulePersistenceJpaIntegration.java
@@ -18,6 +18,10 @@
*/
package org.apache.causeway.persistence.jpa.integration;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
import org.apache.causeway.core.runtime.CausewayModuleCoreRuntime;
import org.apache.causeway.persistence.commons.CausewayModulePersistenceCommons;
import org.apache.causeway.persistence.jpa.integration.entity.JpaEntityIntegration;
@@ -36,9 +40,6 @@ import org.apache.causeway.persistence.jpa.integration.typeconverters.schema.v2.
import org.apache.causeway.persistence.jpa.integration.typeconverters.schema.v2.CausewayInteractionDtoConverter;
import org.apache.causeway.persistence.jpa.integration.typeconverters.schema.v2.CausewayOidDtoConverter;
import org.apache.causeway.persistence.jpa.metamodel.CausewayModulePersistenceJpaMetamodel;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
@Configuration
@Import({
diff --git a/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/entity/JpaEntityFacet.java b/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/entity/JpaEntityFacet.java
index 42932c6773..3f483df1f9 100644
--- a/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/entity/JpaEntityFacet.java
+++ b/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/entity/JpaEntityFacet.java
@@ -27,11 +27,6 @@ import javax.persistence.PersistenceException;
import javax.persistence.PersistenceUnitUtil;
import javax.persistence.metamodel.EntityType;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.assertions._Assert;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.base._Lazy;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.eclipse.persistence.exceptions.DescriptorException;
import org.springframework.data.jpa.repository.JpaContext;
import org.springframework.lang.Nullable;
@@ -41,10 +36,17 @@ import org.apache.causeway.applib.query.NamedQuery;
import org.apache.causeway.applib.query.Query;
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.repository.EntityState;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.assertions._Assert;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.commons.internal.base._Lazy;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.config.beans.PersistenceStack;
+import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence;
import org.apache.causeway.core.metamodel.facetapi.FacetAbstract;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.object.entity.EntityFacet;
+import org.apache.causeway.core.metamodel.facets.object.entity.EntityFacet.PrimaryKeyType;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.services.idstringifier.IdStringifierLookupService;
diff --git a/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/entity/JpaEntityFacetFactory.java b/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/entity/JpaEntityFacetFactory.java
index 096e8445f7..72429ba2c7 100644
--- a/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/entity/JpaEntityFacetFactory.java
+++ b/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/entity/JpaEntityFacetFactory.java
@@ -22,9 +22,9 @@ import javax.inject.Inject;
import javax.persistence.Entity;
import org.apache.causeway.commons.collections.ImmutableEnumSet;
-
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
+import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract;
import lombok.val;
diff --git a/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/services/JpaSupportServiceUsingSpring.java b/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/services/JpaSupportServiceUsingSpring.java
index 961dca44dd..7b7ab5dd84 100644
--- a/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/services/JpaSupportServiceUsingSpring.java
+++ b/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/services/JpaSupportServiceUsingSpring.java
@@ -21,9 +21,10 @@ package org.apache.causeway.persistence.jpa.integration.services;
import javax.inject.Inject;
import javax.persistence.EntityManager;
+import org.springframework.data.jpa.repository.JpaContext;
+
import org.apache.causeway.commons.functional.Try;
import org.apache.causeway.persistence.jpa.applib.services.JpaSupportService;
-import org.springframework.data.jpa.repository.JpaContext;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
diff --git a/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/typeconverters/applib/CausewayBookmarkConverter.java b/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/typeconverters/applib/CausewayBookmarkConverter.java
index 576e7aed3c..484396fcc5 100644
--- a/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/typeconverters/applib/CausewayBookmarkConverter.java
+++ b/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/typeconverters/applib/CausewayBookmarkConverter.java
@@ -21,10 +21,9 @@ package org.apache.causeway.persistence.jpa.integration.typeconverters.applib;
import javax.persistence.AttributeConverter;
import javax.persistence.Converter;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.bookmark.HasTarget;
+import org.apache.causeway.commons.internal.base._Strings;
/**
* @since 2.0 {@index}
diff --git a/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/CausewayModulePersistenceJpaMetamodel.java b/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/CausewayModulePersistenceJpaMetamodel.java
index 52436c91b6..f9c59ae493 100644
--- a/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/CausewayModulePersistenceJpaMetamodel.java
+++ b/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/CausewayModulePersistenceJpaMetamodel.java
@@ -18,11 +18,12 @@
*/
package org.apache.causeway.persistence.jpa.metamodel;
-import org.apache.causeway.core.runtime.CausewayModuleCoreRuntime;
-import org.apache.causeway.persistence.jpa.applib.CausewayModulePersistenceJpaApplib;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.core.runtime.CausewayModuleCoreRuntime;
+import org.apache.causeway.persistence.jpa.applib.CausewayModulePersistenceJpaApplib;
+
@Configuration
@Import({
// modules
diff --git a/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/facets/prop/column/BigDecimalFromJpaColumnAnnotationFacetFactory.java b/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/facets/prop/column/BigDecimalFromJpaColumnAnnotationFacetFactory.java
index 583b32b06e..46d4d1b118 100644
--- a/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/facets/prop/column/BigDecimalFromJpaColumnAnnotationFacetFactory.java
+++ b/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/facets/prop/column/BigDecimalFromJpaColumnAnnotationFacetFactory.java
@@ -25,6 +25,7 @@ import javax.persistence.Column;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
+import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.causeway.core.metamodel.facets.FacetedMethod;
diff --git a/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/facets/prop/column/MandatoryFromJpaColumnAnnotationFacetFactory.java b/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/facets/prop/column/MandatoryFromJpaColumnAnnotationFacetFactory.java
index 5a486c93a0..f30cb7eb39 100644
--- a/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/facets/prop/column/MandatoryFromJpaColumnAnnotationFacetFactory.java
+++ b/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/facets/prop/column/MandatoryFromJpaColumnAnnotationFacetFactory.java
@@ -27,6 +27,7 @@ import javax.persistence.JoinColumn;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FacetUtil;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
+import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract;
import lombok.val;
diff --git a/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/facets/prop/transients/JpaTransientAnnotationFacetFactory.java b/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/facets/prop/transients/JpaTransientAnnotationFacetFactory.java
index d16ac4a903..bb610771a7 100644
--- a/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/facets/prop/transients/JpaTransientAnnotationFacetFactory.java
+++ b/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/facets/prop/transients/JpaTransientAnnotationFacetFactory.java
@@ -24,6 +24,7 @@ import javax.persistence.Transient;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FacetUtil;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
+import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.causeway.core.metamodel.facets.FacetedMethod;
diff --git a/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/object/table/JpaTableAnnotationFacetFactory.java b/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/object/table/JpaTableAnnotationFacetFactory.java
index 4582f988d3..8edc518e72 100644
--- a/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/object/table/JpaTableAnnotationFacetFactory.java
+++ b/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/object/table/JpaTableAnnotationFacetFactory.java
@@ -23,7 +23,6 @@ import javax.inject.Inject;
import javax.persistence.Table;
import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FacetUtil;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
diff --git a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/domainmodel/SpecloaderPerformanceTest.java b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/domainmodel/SpecloaderPerformanceTest.java
index 8db99ba65c..de2e256b83 100644
--- a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/domainmodel/SpecloaderPerformanceTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/domainmodel/SpecloaderPerformanceTest.java
@@ -23,10 +23,6 @@ import java.util.Set;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.base._Lazy;
-import org.apache.causeway.commons.internal.base._Timing;
-import org.apache.causeway.commons.internal.collections._Sets;
-import org.apache.causeway.commons.internal.debug._Probe;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
@@ -36,6 +32,10 @@ import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
+import org.apache.causeway.commons.internal.base._Lazy;
+import org.apache.causeway.commons.internal.base._Timing;
+import org.apache.causeway.commons.internal.collections._Sets;
+import org.apache.causeway.commons.internal.debug._Probe;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
diff --git a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/domainmodel/_MetamodelUtil.java b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/domainmodel/_MetamodelUtil.java
index 150ca23a9a..eacd9635b5 100644
--- a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/domainmodel/_MetamodelUtil.java
+++ b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/domainmodel/_MetamodelUtil.java
@@ -22,7 +22,6 @@ import java.util.Set;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.collections._Sets;
-
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.spec.feature.MixedIn;
diff --git a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/entitychangetracking/jdo/JdoEntityChangePublishingTest.java b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/entitychangetracking/jdo/JdoEntityChangePublishingTest.java
index 86598ba923..cd76db121e 100644
--- a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/entitychangetracking/jdo/JdoEntityChangePublishingTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/entitychangetracking/jdo/JdoEntityChangePublishingTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.causeway.testdomain.entitychangetracking.jdo;
-import org.apache.causeway.commons.internal.collections._Lists;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -27,6 +26,7 @@ import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
import org.apache.causeway.testdomain.jdo.JdoInventoryManager;
diff --git a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/ldap/LdapEmbeddedServerTest.java b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/ldap/LdapEmbeddedServerTest.java
index 1e467d6ae3..12522fb180 100644
--- a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/ldap/LdapEmbeddedServerTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/ldap/LdapEmbeddedServerTest.java
@@ -34,7 +34,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
import org.apache.causeway.core.config.presets.CausewayPresets;
-import org.apache.causeway.testdomain.ldap.LdapConstants;
import lombok.val;
diff --git a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/ldap/LdapServerService.java b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/ldap/LdapServerService.java
index de6b16ec03..b96bfdcbe2 100644
--- a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/ldap/LdapServerService.java
+++ b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/ldap/LdapServerService.java
@@ -23,7 +23,6 @@ import java.util.concurrent.CountDownLatch;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
-import org.apache.causeway.testdomain.ldap.LdapConstants;
import org.junit.runners.model.InitializationError;
import org.springframework.stereotype.Service;
diff --git a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/rest/CorsFilterTest.java b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/rest/CorsFilterTest.java
index ce140f067d..659c74c507 100644
--- a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/rest/CorsFilterTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/rest/CorsFilterTest.java
@@ -22,8 +22,6 @@ import java.util.function.UnaryOperator;
import javax.inject.Inject;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.functional.Try;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
import org.junit.jupiter.api.Order;
@@ -37,14 +35,14 @@ 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.functional.Try;
import org.apache.causeway.core.config.presets.CausewayPresets;
+import org.apache.causeway.extensions.cors.impl.CausewayModuleExtCors;
import org.apache.causeway.testdomain.conf.Configuration_headless;
import org.apache.causeway.testdomain.rospec.Configuration_usingRoSpec;
import org.apache.causeway.testdomain.rospec.RoSpecSampler;
import org.apache.causeway.testdomain.util.rest.RestEndpointService;
-
-import org.apache.causeway.extensions.cors.impl.CausewayModuleExtCors;
-
import org.apache.causeway.viewer.restfulobjects.client.log.ClientConversationFilter;
import org.apache.causeway.viewer.restfulobjects.jaxrsresteasy4.CausewayModuleViewerRestfulObjectsJaxrsResteasy4;
diff --git a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/rest/DomainObjectResourceTest.java b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/rest/DomainObjectResourceTest.java
index 2287ba5e9b..7c6c1a1643 100644
--- a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/rest/DomainObjectResourceTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/rest/DomainObjectResourceTest.java
@@ -22,7 +22,6 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.base._Strings;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Configuration;
@@ -36,6 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.layout.grid.bootstrap.BSGrid;
import org.apache.causeway.applib.services.factory.FactoryService;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.facets.object.grid.GridFacet;
import org.apache.causeway.core.metamodel.objectmanager.ObjectManager;
diff --git a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/rest/MenuBarsResourceTest.java b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/rest/MenuBarsResourceTest.java
index deed5a85a6..17bbc652df 100644
--- a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/rest/MenuBarsResourceTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/rest/MenuBarsResourceTest.java
@@ -20,8 +20,6 @@ package org.apache.causeway.testdomain.rest;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.base._Refs;
-import org.apache.causeway.commons.internal.base._Strings;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Configuration;
@@ -34,6 +32,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.layout.component.ServiceActionLayoutData;
import org.apache.causeway.applib.services.menu.MenuBarsService;
+import org.apache.causeway.commons.internal.base._Refs;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_headless;
import org.apache.causeway.testdomain.model.actnsemantics.Configuration_usingActionSemantics;
diff --git a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/rest/RestServiceSimpifiedRepresentationTest.java b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/rest/RestServiceSimpifiedRepresentationTest.java
index c53a4dc0dd..d1190d8c27 100644
--- a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/rest/RestServiceSimpifiedRepresentationTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/rest/RestServiceSimpifiedRepresentationTest.java
@@ -28,9 +28,6 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
import javax.ws.rs.core.GenericType;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.functional.Try;
-import org.apache.causeway.commons.internal.debug._Probe;
import org.asciidoctor.ast.Document;
import org.asciidoctor.ast.Row;
import org.asciidoctor.ast.Table;
@@ -45,12 +42,13 @@ import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.context.annotation.Import;
import org.springframework.test.context.TestPropertySource;
-import static org.apache.causeway.testdomain.util.CollectionAssertions.assertComponentWiseEquals;
-import static org.apache.causeway.testdomain.util.CollectionAssertions.assertComponentWiseNumberEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.causeway.applib.client.RepresentationTypeSimplifiedV2;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.functional.Try;
+import org.apache.causeway.commons.internal.debug._Probe;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_headless;
import org.apache.causeway.testdomain.rospec.BigComplex;
@@ -59,13 +57,14 @@ import org.apache.causeway.testdomain.rospec.Customer;
import org.apache.causeway.testdomain.rospec.RoSpecSampler;
import org.apache.causeway.testdomain.util.UtilSurefire;
import org.apache.causeway.testdomain.util.rest.RestEndpointService;
-
import org.apache.causeway.tooling.model4adoc.AsciiDocFactory;
import org.apache.causeway.tooling.model4adoc.AsciiDocWriter;
import org.apache.causeway.viewer.restfulobjects.client.ActionParameterListBuilder;
import org.apache.causeway.viewer.restfulobjects.client.log.ClientConversationFilter;
import org.apache.causeway.viewer.restfulobjects.jaxrsresteasy4.CausewayModuleViewerRestfulObjectsJaxrsResteasy4;
+import static org.apache.causeway.testdomain.util.CollectionAssertions.assertComponentWiseEquals;
+import static org.apache.causeway.testdomain.util.CollectionAssertions.assertComponentWiseNumberEquals;
import static org.apache.causeway.tooling.model4adoc.AsciiDocFactory.cell;
import static org.apache.causeway.tooling.model4adoc.AsciiDocFactory.doc;
import static org.apache.causeway.tooling.model4adoc.AsciiDocFactory.headRow;
diff --git a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/shiro/AbstractShiroTest.java b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/shiro/AbstractShiroTest.java
index df728f3db9..b06c4df02a 100644
--- a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/shiro/AbstractShiroTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/shiro/AbstractShiroTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.causeway.testdomain.shiro;
-import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.UnavailableSecurityManagerException;
import org.apache.shiro.config.Ini;
@@ -31,6 +30,7 @@ import org.apache.shiro.util.ThreadContext;
import org.apache.shiro.util.ThreadState;
import org.apache.causeway.applib.services.inject.ServiceInjector;
+import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.causeway.security.shiro.webmodule.WebModuleShiro.EnvironmentLoaderListenerForCauseway;
import lombok.SneakyThrows;
diff --git a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/shiro/ShiroSecmanLdapTest.java b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/shiro/ShiroSecmanLdapTest.java
index 30979a19c6..b8653ef417 100644
--- a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/shiro/ShiroSecmanLdapTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/shiro/ShiroSecmanLdapTest.java
@@ -40,16 +40,16 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.causeway.applib.services.inject.ServiceInjector;
import org.apache.causeway.core.config.presets.CausewayPresets;
-import org.apache.causeway.testdomain.conf.Configuration_usingJdoAndShiro;
-import org.apache.causeway.testdomain.jdo.JdoTestDomainPersona;
-import org.apache.causeway.testdomain.ldap.LdapConstants;
-import org.apache.causeway.testdomain.ldap.LdapServerService;
import org.apache.causeway.extensions.secman.delegated.shiro.realm.CausewayModuleExtSecmanShiroRealm;
import org.apache.causeway.extensions.secman.encryption.spring.CausewayModuleExtSecmanEncryptionSpring;
import org.apache.causeway.extensions.secman.integration.CausewayModuleExtSecmanIntegration;
import org.apache.causeway.extensions.secman.jdo.CausewayModuleExtSecmanPersistenceJdo;
import org.apache.causeway.extensions.secman.jdo.role.dom.ApplicationRoleRepository;
import org.apache.causeway.extensions.secman.jdo.user.dom.ApplicationUserRepository;
+import org.apache.causeway.testdomain.conf.Configuration_usingJdoAndShiro;
+import org.apache.causeway.testdomain.jdo.JdoTestDomainPersona;
+import org.apache.causeway.testdomain.ldap.LdapConstants;
+import org.apache.causeway.testdomain.ldap.LdapServerService;
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScripts;
import lombok.val;
diff --git a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/shiro/ShiroSecmanTest.java b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/shiro/ShiroSecmanTest.java
index 826f3083fb..fa3c0902a5 100644
--- a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/shiro/ShiroSecmanTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/shiro/ShiroSecmanTest.java
@@ -38,12 +38,11 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.causeway.applib.services.inject.ServiceInjector;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.presets.CausewayPresets;
-import org.apache.causeway.testdomain.conf.Configuration_usingJdoAndShiro;
-
import org.apache.causeway.extensions.secman.delegated.shiro.realm.CausewayModuleExtSecmanShiroRealm;
import org.apache.causeway.extensions.secman.encryption.spring.CausewayModuleExtSecmanEncryptionSpring;
import org.apache.causeway.extensions.secman.integration.CausewayModuleExtSecmanIntegration;
import org.apache.causeway.extensions.secman.jdo.CausewayModuleExtSecmanPersistenceJdo;
+import org.apache.causeway.testdomain.conf.Configuration_usingJdoAndShiro;
import lombok.val;
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 b4899bc77d..064521ba5c 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
@@ -25,25 +25,26 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.ioc._ManagedBeanAdapter;
-import org.apache.causeway.commons.internal.resources._Resources;
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.apache.causeway.commons.internal.collections._Collections.toStringJoiningNewLine;
-import static org.apache.causeway.commons.internal.collections._Sets.intersectSorted;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.ioc._ManagedBeanAdapter;
+import org.apache.causeway.commons.internal.resources._Resources;
import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_headless;
+import static org.apache.causeway.commons.internal.collections._Collections.toStringJoiningNewLine;
+import static org.apache.causeway.commons.internal.collections._Sets.intersectSorted;
+
import lombok.val;
//import org.apache.causeway.testdomain.Incubating;
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 5cc0785c93..046a0b48b1 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
@@ -39,7 +39,6 @@ import org.apache.causeway.applib.services.wrapper.WrapperFactory;
import org.apache.causeway.core.config.beans.CausewayBeanTypeRegistry;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.facets.object.publish.entitychange.EntityChangePublishingFacet;
-import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
import org.apache.causeway.extensions.audittrail.applib.dom.AuditTrailEntry;
import org.apache.causeway.extensions.audittrail.applib.dom.AuditTrailEntryRepository;
diff --git a/regressiontests/stable-cmdexecauditsess/persistence-jpa/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jpa/integtests/model/Counter.java b/regressiontests/stable-cmdexecauditsess/persistence-jpa/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jpa/integtests/model/Counter.java
index afd1dae5da..4f4c105f09 100644
--- a/regressiontests/stable-cmdexecauditsess/persistence-jpa/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jpa/integtests/model/Counter.java
+++ b/regressiontests/stable-cmdexecauditsess/persistence-jpa/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jpa/integtests/model/Counter.java
@@ -28,9 +28,7 @@ import javax.persistence.Id;
import javax.persistence.Table;
import org.apache.causeway.applib.annotation.DomainObject;
-import org.apache.causeway.applib.annotation.Editing;
import org.apache.causeway.applib.annotation.Nature;
-import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.Publishing;
import lombok.AccessLevel;
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 94ff358a07..0a76bcfa0d 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
@@ -20,7 +20,6 @@ package org.apache.causeway.regressiontests.core.wrapperfactory.integtests;
import javax.inject.Inject;
-import org.apache.causeway.commons.functional.ThrowingRunnable;
import org.junit.jupiter.api.BeforeAll;
import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -31,16 +30,16 @@ import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.transaction.annotation.Propagation;
+import org.apache.causeway.commons.functional.ThrowingRunnable;
import org.apache.causeway.core.config.presets.CausewayPresets;
-import org.apache.causeway.persistence.jdo.datanucleus.CausewayModulePersistenceJdoDatanucleus;
-import org.apache.causeway.testing.fixtures.applib.CausewayIntegrationTestAbstractWithFixtures;
-import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib;
-
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
+import org.apache.causeway.persistence.jdo.datanucleus.CausewayModulePersistenceJdoDatanucleus;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
import org.apache.causeway.testdomain.wrapperfactory.Counter;
import org.apache.causeway.testdomain.wrapperfactory.CounterRepository;
import org.apache.causeway.testdomain.wrapperfactory.WrapperTestFixtures;
+import org.apache.causeway.testing.fixtures.applib.CausewayIntegrationTestAbstractWithFixtures;
+import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib;
@SpringBootTest(
classes = CoreWrapperFactory_IntegTestAbstract.AppManifest.class
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 7553771ac3..84935ca4e5 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
@@ -32,6 +32,9 @@ import org.junit.jupiter.params.ParameterizedTest;
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.jupiter.api.Assertions.assertTrue;
+
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.bookmark.BookmarkService;
import org.apache.causeway.applib.services.wrapper.WrapperFactory;
@@ -40,10 +43,6 @@ import org.apache.causeway.applib.services.xactn.TransactionService;
import org.apache.causeway.testdomain.wrapperfactory.Counter;
import org.apache.causeway.testdomain.wrapperfactory.Counter_bumpUsingMixin;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import lombok.SneakyThrows;
import lombok.val;
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 1b0d1e3cd7..8d82d58921 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,11 +18,12 @@
*/
package org.apache.causeway.testdomain.cucumber;
-import org.apache.causeway.testdomain.conf.Configuration_headless;
import org.springframework.boot.test.context.SpringBootTest;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.apache.causeway.testdomain.conf.Configuration_headless;
+
import io.cucumber.java.en.Given;
import io.cucumber.java.en.Then;
import io.cucumber.java.en.When;
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 75aaed2a4f..5dbb4230e9 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
@@ -20,7 +20,6 @@ package org.apache.causeway.testdomain.domainmodel;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.reflection._Annotations;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
@@ -34,6 +33,7 @@ import org.apache.causeway.applib.events.domain.ActionDomainEvent;
import org.apache.causeway.applib.services.jaxb.JaxbService;
import org.apache.causeway.applib.services.metamodel.Config;
import org.apache.causeway.applib.services.metamodel.MetaModelService;
+import org.apache.causeway.commons.internal.reflection._Annotations;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.schema.metamodel.v2.DomainClassDto;
import org.apache.causeway.testdomain.conf.Configuration_headless;
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 b0421abc54..987f95d56d 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
@@ -33,6 +33,9 @@ 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.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
@@ -68,9 +71,6 @@ import org.apache.causeway.testdomain.model.bad.OrphanedMemberSupportDetection;
import org.apache.causeway.testdomain.util.interaction.DomainObjectTesterFactory;
import org.apache.causeway.testing.integtestsupport.applib.validate.DomainModelValidator;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import lombok.val;
@SpringBootTest(
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 d1527404ca..58236d09c9 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,7 +24,6 @@ import java.util.stream.Stream;
import javax.inject.Inject;
-import org.apache.causeway.commons.collections.Can;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
@@ -49,6 +48,7 @@ import org.apache.causeway.applib.services.metamodel.Config;
import org.apache.causeway.applib.services.metamodel.MetaModelService;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
import org.apache.causeway.applib.services.title.TitleService;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
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 f632d818c7..609c515296 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
@@ -24,13 +24,6 @@ import java.util.List;
import javax.inject.Inject;
-import org.apache.causeway.applib.services.factory.FactoryService;
-import org.apache.causeway.applib.services.metamodel.MetaModelServiceMenu;
-import org.apache.causeway.applib.value.Blob;
-import org.apache.causeway.applib.value.NamedWithMimeType.CommonMimeType;
-import org.apache.causeway.core.config.presets.CausewayPresets;
-import org.apache.causeway.testdomain.conf.Configuration_headless;
-import org.apache.causeway.testdomain.model.good.Configuration_usingValidDomain;
import org.approvaltests.Approvals;
import org.approvaltests.core.Options;
import org.approvaltests.reporters.DiffReporter;
@@ -42,6 +35,14 @@ import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import org.apache.causeway.applib.services.factory.FactoryService;
+import org.apache.causeway.applib.services.metamodel.MetaModelServiceMenu;
+import org.apache.causeway.applib.value.Blob;
+import org.apache.causeway.applib.value.NamedWithMimeType.CommonMimeType;
+import org.apache.causeway.core.config.presets.CausewayPresets;
+import org.apache.causeway.testdomain.conf.Configuration_headless;
+import org.apache.causeway.testdomain.model.good.Configuration_usingValidDomain;
+
import lombok.SneakyThrows;
import lombok.val;
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 7b6b6cf959..5dd7b7fb4d 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
@@ -18,15 +18,15 @@
*/
package org.apache.causeway.testdomain.factory;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import javax.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.assertTrue;
+
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.services.repository.RepositoryService;
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 3457f400fc..ad78f23a87 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
@@ -21,8 +21,6 @@ package org.apache.causeway.testdomain.interact;
import java.util.List;
import java.util.function.UnaryOperator;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.collections._Lists;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
@@ -33,10 +31,11 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.causeway.applib.annotation.Where;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.facets.actions.action.invocation.IdentifierUtil;
import org.apache.causeway.core.metamodel.interactions.InteractionHead;
-import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.testdomain.conf.Configuration_headless;
import org.apache.causeway.testdomain.model.interaction.Configuration_usingInteractionDomain;
import org.apache.causeway.testdomain.model.interaction.DemoEnum;
@@ -47,7 +46,6 @@ import org.apache.causeway.testdomain.model.interaction.InteractionDemo_multiEnu
import org.apache.causeway.testdomain.model.interaction.InteractionDemo_multiInt;
import org.apache.causeway.testdomain.util.interaction.InteractionTestAbstract;
-import lombok.NonNull;
import lombok.val;
@SpringBootTest(
diff --git a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/HasActionValidation.java b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/HasActionValidation.java
index 3113984932..40f4e41960 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/HasActionValidation.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/HasActionValidation.java
@@ -22,7 +22,6 @@ import java.util.concurrent.atomic.LongAdder;
import org.apache.causeway.commons.binding.Bindable;
import org.apache.causeway.commons.internal.binding._Bindables;
-
import org.apache.causeway.core.metamodel.interactions.managed.ParameterNegotiationModel;
import lombok.Getter;
diff --git a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/HasValueValidation.java b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/HasValueValidation.java
index 40697ba333..d46ca818ec 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/HasValueValidation.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/HasValueValidation.java
@@ -22,7 +22,6 @@ import java.util.concurrent.atomic.LongAdder;
import org.apache.causeway.commons.binding.Bindable;
import org.apache.causeway.commons.internal.binding._Bindables;
-
import org.apache.causeway.core.metamodel.interactions.managed.ManagedValue;
import lombok.Getter;
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 6c4046f338..e60e2c66b3 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
@@ -20,7 +20,6 @@ package org.apache.causeway.testdomain.interact;
import java.util.stream.Collectors;
-import org.apache.causeway.commons.collections.Can;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
@@ -30,6 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.causeway.applib.annotation.Where;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.facets.all.described.ParamDescribedFacet;
import org.apache.causeway.core.metamodel.facets.objectvalue.maxlen.MaxLengthFacet;
diff --git a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/SimulatedUiAutoComplete.java b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/SimulatedUiAutoComplete.java
index 49b2b61917..2d97209349 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/SimulatedUiAutoComplete.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/SimulatedUiAutoComplete.java
@@ -20,7 +20,6 @@ package org.apache.causeway.testdomain.interact;
import org.apache.causeway.commons.binding.Bindable;
import org.apache.causeway.commons.internal.binding._Bindables;
-
import org.apache.causeway.core.metamodel.interactions.managed.ManagedValue;
public class SimulatedUiAutoComplete extends SimulatedUiChoices {
diff --git a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/SimulatedUiChoices.java b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/SimulatedUiChoices.java
index 66a03843e6..4c6b8afa30 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/SimulatedUiChoices.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/SimulatedUiChoices.java
@@ -23,7 +23,6 @@ import java.util.concurrent.atomic.LongAdder;
import org.apache.causeway.commons.binding.Bindable;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.binding._Bindables;
-
import org.apache.causeway.core.metamodel.interactions.managed.ManagedValue;
import org.apache.causeway.core.metamodel.interactions.managed.ParameterNegotiationModel;
import org.apache.causeway.core.metamodel.object.ManagedObject;
diff --git a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/SimulatedUiComponent.java b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/SimulatedUiComponent.java
index 5fe3f8f53f..c21f78b586 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/SimulatedUiComponent.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/SimulatedUiComponent.java
@@ -20,7 +20,6 @@ package org.apache.causeway.testdomain.interact;
import org.apache.causeway.commons.binding.Bindable;
import org.apache.causeway.commons.internal.binding._Bindables;
-
import org.apache.causeway.core.metamodel.interactions.managed.ManagedProperty;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedValue;
import org.apache.causeway.core.metamodel.object.ManagedObject;
diff --git a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/SimulatedUiSubmit.java b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/SimulatedUiSubmit.java
index 55cb5d6183..debda9913e 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/SimulatedUiSubmit.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/SimulatedUiSubmit.java
@@ -21,7 +21,6 @@ package org.apache.causeway.testdomain.interact;
import java.util.function.Supplier;
import org.apache.causeway.commons.functional.Railway;
-
import org.apache.causeway.core.metamodel.interactions.managed.ActionInteraction;
import org.apache.causeway.core.metamodel.interactions.managed.InteractionVeto;
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 b0f47ec034..cc384856c3 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
@@ -24,6 +24,11 @@ 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.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Nature;
@@ -39,11 +44,6 @@ import org.apache.causeway.testdomain.model.interaction.InteractionDemo;
import org.apache.causeway.testdomain.model.interaction.InteractionDemo_biArgEnabled;
import org.apache.causeway.testdomain.util.interaction.InteractionTestAbstract;
-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 lombok.Data;
import lombok.RequiredArgsConstructor;
import lombok.val;
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 8bc3830d8e..ddee01dba2 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
@@ -24,6 +24,11 @@ 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.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Nature;
@@ -37,11 +42,6 @@ import org.apache.causeway.testdomain.conf.Configuration_headless;
import org.apache.causeway.testdomain.model.interaction.Configuration_usingInteractionDomain;
import org.apache.causeway.testdomain.util.interaction.InteractionTestAbstract;
-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 lombok.Data;
import lombok.val;
diff --git a/regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/model/Counter.java b/regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/model/Counter.java
index 5f4ce0af60..b361d6c28f 100644
--- a/regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/model/Counter.java
+++ b/regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/model/Counter.java
@@ -28,7 +28,6 @@ import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
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.annotation.PropertyLayout;
import org.apache.causeway.applib.layout.LayoutConstants;
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 be3ca8995f..475eee02aa 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
@@ -20,9 +20,6 @@ package org.apache.causeway.testdomain.injecting.jdo;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.assertions._Assert;
-import org.apache.causeway.commons.internal.primitives._Longs.Bound;
-import org.apache.causeway.commons.internal.primitives._Longs.Range;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
@@ -36,6 +33,9 @@ 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;
+import org.apache.causeway.commons.internal.primitives._Longs.Range;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
import org.apache.causeway.testdomain.jdo.JdoTestFixtures;
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 6fc567829b..836c84a28b 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
@@ -22,7 +22,6 @@ import java.sql.SQLException;
import javax.inject.Inject;
-import org.apache.causeway.commons.collections.Can;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
@@ -36,6 +35,7 @@ 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;
import org.apache.causeway.testdomain.jdo.JdoTestFixtures;
diff --git a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoExceptionTranslationTest.java b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoExceptionTranslationTest.java
index f388dcbd29..e4a8c09418 100644
--- a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoExceptionTranslationTest.java
+++ b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoExceptionTranslationTest.java
@@ -29,8 +29,8 @@ import org.springframework.dao.DataAccessException;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.TestPropertySources;
-import static org.junit.Assert.assertNotNull;
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.apache.causeway.core.config.presets.CausewayPresets;
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 0796a2f04c..bb4d1c3a56 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
@@ -23,7 +23,6 @@ import java.sql.SQLException;
import javax.inject.Inject;
import javax.inject.Provider;
-import org.apache.causeway.commons.functional.ThrowingRunnable;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
@@ -42,6 +41,7 @@ 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.apache.causeway.commons.functional.ThrowingRunnable;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.RegressionTestAbstract;
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 a4aa01be3e..3c5f6db144 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
@@ -23,13 +23,13 @@ import java.util.NoSuchElementException;
import javax.jdo.JDODataStoreException;
import javax.jdo.JDOException;
-import org.apache.causeway.commons.functional.Try;
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.apache.causeway.commons.functional.Try;
import org.apache.causeway.persistence.jdo.spring.integration.JdoTransactionManager;
final class _JdoExceptionTranslator {
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 34d7280838..61f78eb5a7 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
@@ -24,15 +24,15 @@ 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.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
import org.apache.causeway.testdomain.jdo.entities.JdoProduct;
import org.apache.causeway.testdomain.jdo.entities.JdoProductComment;
import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-
import lombok.val;
@SpringBootTest(
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 338eddd3f1..e71e6b75cc 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
@@ -20,7 +20,6 @@ package org.apache.causeway.testdomain.transactions.jdo;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -32,6 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.applib.services.xactn.TransactionService;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
import org.apache.causeway.testdomain.jdo.JdoTestFixtures;
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 c0f9e36c9e..7a5825616f 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
@@ -20,11 +20,6 @@ package org.apache.causeway.testdomain.transactions.jdo;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.debug._Probe;
-import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
-import org.apache.causeway.testdomain.jdo.JdoTestFixtures;
-import org.apache.causeway.testdomain.jdo.JdoTestFixtures.Lock;
-import org.apache.causeway.testdomain.jdo.entities.JdoBook;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
@@ -37,6 +32,11 @@ 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;
+import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
+import org.apache.causeway.testdomain.jdo.JdoTestFixtures;
+import org.apache.causeway.testdomain.jdo.JdoTestFixtures.Lock;
+import org.apache.causeway.testdomain.jdo.entities.JdoBook;
/**
* These tests use the {@code @Transactional} annotation as provided by Spring.
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 1e92813b1b..32d0d1d9d2 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
@@ -20,9 +20,6 @@ package org.apache.causeway.testdomain.injecting.jpa;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.assertions._Assert;
-import org.apache.causeway.commons.internal.primitives._Longs.Bound;
-import org.apache.causeway.commons.internal.primitives._Longs.Range;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
@@ -37,6 +34,9 @@ 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;
+import org.apache.causeway.commons.internal.primitives._Longs.Range;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJpa;
import org.apache.causeway.testdomain.jpa.JpaTestFixtures;
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 c74eb1c020..0a9bafb651 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
@@ -23,7 +23,6 @@ import java.util.Optional;
import javax.inject.Inject;
-import org.apache.causeway.commons.collections.Can;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
@@ -41,6 +40,7 @@ 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;
import org.apache.causeway.testdomain.conf.Configuration_usingJpa;
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 a86369294a..96e79d5625 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
@@ -29,8 +29,8 @@ import org.springframework.dao.DataAccessException;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.TestPropertySources;
-import static org.junit.Assert.assertNotNull;
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.apache.causeway.core.config.presets.CausewayPresets;
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 3d20f32885..ea73901a13 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
@@ -23,7 +23,6 @@ import java.sql.SQLException;
import javax.inject.Inject;
import javax.inject.Provider;
-import org.apache.causeway.commons.functional.ThrowingRunnable;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
@@ -31,7 +30,6 @@ 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.DirtiesContext;
import org.springframework.test.annotation.Rollback;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.TestPropertySources;
@@ -43,6 +41,7 @@ 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.apache.causeway.commons.functional.ThrowingRunnable;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.RegressionTestAbstract;
import org.apache.causeway.testdomain.conf.Configuration_usingJpa;
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 78b8bde54c..cc9f0a58c0 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
@@ -24,8 +24,6 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
-import org.apache.causeway.applib.annotation.InteractionScope;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.jaxb.JaxbService;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.RegressionTestAbstract;
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/_JpaExceptionTranslator.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/_JpaExceptionTranslator.java
index e532e819e6..bb67461ba0 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/_JpaExceptionTranslator.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/_JpaExceptionTranslator.java
@@ -20,12 +20,13 @@ package org.apache.causeway.testdomain.persistence.jpa;
import java.util.NoSuchElementException;
-import org.apache.causeway.commons.functional.Try;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.springframework.dao.DataAccessException;
import org.springframework.dao.support.DataAccessUtils;
import org.springframework.orm.jpa.JpaTransactionManager;
+import org.apache.causeway.commons.functional.Try;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
+
final class _JpaExceptionTranslator {
// not used, but maybe keep for debugging purposes
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 2b3b6d1124..921610a49e 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
@@ -22,7 +22,6 @@ import java.util.Objects;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
@@ -37,6 +36,7 @@ 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;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.MmEntityUtil;
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 eef389dca0..b86b7a2138 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
@@ -22,7 +22,6 @@ import java.util.Objects;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
@@ -37,6 +36,7 @@ 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;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.MmEntityUtil;
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 40f78d6800..4b256c056a 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
@@ -23,8 +23,6 @@ import java.util.function.Consumer;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.base._Refs;
-import org.apache.causeway.commons.internal.base._Refs.ObjectReference;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -42,6 +40,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.applib.services.xactn.TransactionService;
+import org.apache.causeway.commons.internal.base._Refs;
+import org.apache.causeway.commons.internal.base._Refs.ObjectReference;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.transaction.events.TransactionAfterCompletionEvent;
import org.apache.causeway.core.transaction.events.TransactionBeforeCompletionEvent;
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 8bda18e98b..935cdc3b77 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
@@ -23,8 +23,6 @@ import java.util.function.Consumer;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.base._Refs;
-import org.apache.causeway.commons.internal.base._Refs.ObjectReference;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -41,6 +39,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.applib.services.xactn.TransactionService;
+import org.apache.causeway.commons.internal.base._Refs;
+import org.apache.causeway.commons.internal.base._Refs.ObjectReference;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.transaction.events.TransactionAfterCompletionEvent;
import org.apache.causeway.core.transaction.events.TransactionBeforeCompletionEvent;
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 7c43bf3509..6a02966000 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
@@ -25,14 +25,19 @@ import java.util.function.Consumer;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.base._Temporals;
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.apache.causeway.applib.value.Blob;
import org.apache.causeway.applib.value.Clob;
import org.apache.causeway.applib.value.NamedWithMimeType.CommonMimeType;
+import org.apache.causeway.commons.internal.base._Temporals;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.testdomain.conf.Configuration_headless;
@@ -41,11 +46,6 @@ import org.apache.causeway.viewer.restfulobjects.jaxrsresteasy4.CausewayModuleVi
import org.apache.causeway.viewer.restfulobjects.rendering.service.valuerender.JsonValueConverter.Context;
import org.apache.causeway.viewer.restfulobjects.rendering.service.valuerender.JsonValueEncoderServiceDefault;
-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 lombok.val;
@SpringBootTest(classes={
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 0340a091a7..8a73bbe0da 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
@@ -22,7 +22,6 @@ import java.util.stream.IntStream;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.base._Timing;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
@@ -35,6 +34,7 @@ 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.apache.causeway.commons.internal.base._Timing;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
import org.apache.causeway.testdomain.util.rest.RestEndpointService;
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 257e298c41..2ba29bfffb 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
@@ -28,9 +28,6 @@ import java.util.stream.Stream;
import javax.inject.Inject;
-import org.apache.causeway.commons.functional.Try;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.collections._Sets;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
@@ -59,6 +56,9 @@ import org.apache.causeway.applib.value.semantics.Renderer;
import org.apache.causeway.applib.value.semantics.ValueDecomposition;
import org.apache.causeway.applib.value.semantics.ValueSemanticsProvider;
import org.apache.causeway.applib.value.semantics.ValueSemanticsResolver;
+import org.apache.causeway.commons.functional.Try;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.collections._Sets;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.interactions.managed.ActionInteraction;
diff --git a/regressiontests/stable-value/src/test/java/org/apache/causeway/testdomain/value/ValueSemanticsTester.java b/regressiontests/stable-value/src/test/java/org/apache/causeway/testdomain/value/ValueSemanticsTester.java
index bee893c585..0acb3b119a 100644
--- a/regressiontests/stable-value/src/test/java/org/apache/causeway/testdomain/value/ValueSemanticsTester.java
+++ b/regressiontests/stable-value/src/test/java/org/apache/causeway/testdomain/value/ValueSemanticsTester.java
@@ -23,12 +23,6 @@ import java.util.function.Function;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.base._Refs;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
-import org.apache.causeway.commons.internal.resources._Xml;
-import org.apache.causeway.commons.internal.resources._Xml.WriteOptions;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -40,6 +34,11 @@ import org.apache.causeway.applib.value.semantics.OrderRelation;
import org.apache.causeway.applib.value.semantics.Parser;
import org.apache.causeway.applib.value.semantics.Renderer;
import org.apache.causeway.applib.value.semantics.ValueSemanticsProvider;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.commons.internal.base._Refs;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
+import org.apache.causeway.commons.internal.resources._Xml;
+import org.apache.causeway.commons.internal.resources._Xml.WriteOptions;
import org.apache.causeway.core.metamodel.facets.object.value.ValueFacet;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedProperty;
import org.apache.causeway.core.metamodel.interactions.managed.PropertyInteraction;
diff --git a/regressiontests/stable-viewers-jdo/src/main/java/org/apache/causeway/testdomain/viewers/jdo/wkt/TestAppJdoWkt.java b/regressiontests/stable-viewers-jdo/src/main/java/org/apache/causeway/testdomain/viewers/jdo/wkt/TestAppJdoWkt.java
index 84e5917d21..fb17b0c991 100644
--- a/regressiontests/stable-viewers-jdo/src/main/java/org/apache/causeway/testdomain/viewers/jdo/wkt/TestAppJdoWkt.java
+++ b/regressiontests/stable-viewers-jdo/src/main/java/org/apache/causeway/testdomain/viewers/jdo/wkt/TestAppJdoWkt.java
@@ -21,7 +21,6 @@ package org.apache.causeway.testdomain.viewers.jdo.wkt;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.causeway.commons.internal.debug.xray.XrayEnable;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
@@ -35,6 +34,7 @@ import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.ObjectSupport;
import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.services.user.UserService;
+import org.apache.causeway.commons.internal.debug.xray.XrayEnable;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
import org.apache.causeway.testdomain.conf.Configuration_usingWicket;
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 6f3ff4fa8e..c4edf4889d 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
@@ -20,7 +20,6 @@ package org.apache.causeway.testdomain.viewers.jdo.wkt;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.debug.xray.XrayUi;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxButton;
import org.junit.jupiter.api.AfterEach;
@@ -29,24 +28,23 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
-import static org.apache.causeway.testdomain.conf.Configuration_usingWicket.EntityPageTester.OPEN_SAMPLE_ACTION;
-import static org.apache.causeway.testdomain.conf.Configuration_usingWicket.EntityPageTester.OPEN_SAMPLE_ACTION_TITLE;
-
-import org.apache.causeway.testdomain.viewers.jdo.wkt.TestAppJdoWkt;
-
+import org.apache.causeway.commons.internal.debug.xray.XrayUi;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.RegressionTestAbstract;
import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
import org.apache.causeway.testdomain.conf.Configuration_usingWicket;
import org.apache.causeway.testdomain.conf.Configuration_usingWicket.EntityPageTester;
-import org.apache.causeway.testdomain.conf.Configuration_usingWicket.WicketTesterFactory;
import org.apache.causeway.testdomain.conf.Configuration_usingWicket.EntityPageTester.SimulatedProperties;
import org.apache.causeway.testdomain.conf.Configuration_usingWicket.EntityPageTester.SimulatedProperty;
+import org.apache.causeway.testdomain.conf.Configuration_usingWicket.WicketTesterFactory;
import org.apache.causeway.testdomain.jdo.JdoTestFixtures;
import org.apache.causeway.testdomain.jdo.entities.JdoBook;
import org.apache.causeway.testdomain.util.dto.BookDto;
import org.apache.causeway.viewer.wicket.ui.panels.PromptFormAbstract;
+import static org.apache.causeway.testdomain.conf.Configuration_usingWicket.EntityPageTester.OPEN_SAMPLE_ACTION;
+import static org.apache.causeway.testdomain.conf.Configuration_usingWicket.EntityPageTester.OPEN_SAMPLE_ACTION_TITLE;
+
import lombok.val;
@SpringBootTest(
diff --git a/regressiontests/stable-viewers-jpa/src/main/java/org/apache/causeway/testdomain/viewers/jpa/wkt/TestAppJpaWkt.java b/regressiontests/stable-viewers-jpa/src/main/java/org/apache/causeway/testdomain/viewers/jpa/wkt/TestAppJpaWkt.java
index 482854e3e7..1006226198 100644
--- a/regressiontests/stable-viewers-jpa/src/main/java/org/apache/causeway/testdomain/viewers/jpa/wkt/TestAppJpaWkt.java
+++ b/regressiontests/stable-viewers-jpa/src/main/java/org/apache/causeway/testdomain/viewers/jpa/wkt/TestAppJpaWkt.java
@@ -21,7 +21,6 @@ package org.apache.causeway.testdomain.viewers.jpa.wkt;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.causeway.commons.internal.os._OsUtil;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
@@ -35,6 +34,7 @@ import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.ObjectSupport;
import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.services.user.UserService;
+import org.apache.causeway.commons.internal.os._OsUtil;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJpa;
import org.apache.causeway.testdomain.conf.Configuration_usingWicket;
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 b966465ff8..5e178a12eb 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
@@ -20,7 +20,6 @@ package org.apache.causeway.testdomain.viewers.jpa.wkt;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.debug.xray.XrayUi;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxButton;
import org.junit.jupiter.api.AfterEach;
@@ -29,27 +28,27 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
-import static org.apache.causeway.testdomain.conf.Configuration_usingWicket.EntityPageTester.OPEN_SAMPLE_ACTION;
-import static org.apache.causeway.testdomain.conf.Configuration_usingWicket.EntityPageTester.OPEN_SAMPLE_ACTION_TITLE;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.apache.causeway.testdomain.viewers.jpa.wkt.TestAppJpaWkt;
-
+import org.apache.causeway.commons.internal.debug.xray.XrayUi;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.testdomain.RegressionTestAbstract;
import org.apache.causeway.testdomain.conf.Configuration_usingJpa;
import org.apache.causeway.testdomain.conf.Configuration_usingWicket;
import org.apache.causeway.testdomain.conf.Configuration_usingWicket.EntityPageTester;
-import org.apache.causeway.testdomain.conf.Configuration_usingWicket.WicketTesterFactory;
import org.apache.causeway.testdomain.conf.Configuration_usingWicket.EntityPageTester.SimulatedProperties;
import org.apache.causeway.testdomain.conf.Configuration_usingWicket.EntityPageTester.SimulatedProperty;
+import org.apache.causeway.testdomain.conf.Configuration_usingWicket.WicketTesterFactory;
import org.apache.causeway.testdomain.jpa.JpaTestFixtures;
import org.apache.causeway.testdomain.jpa.entities.JpaBook;
import org.apache.causeway.testdomain.util.dto.BookDto;
import org.apache.causeway.viewer.wicket.ui.panels.PromptFormAbstract;
+import static org.apache.causeway.testdomain.conf.Configuration_usingWicket.EntityPageTester.OPEN_SAMPLE_ACTION;
+import static org.apache.causeway.testdomain.conf.Configuration_usingWicket.EntityPageTester.OPEN_SAMPLE_ACTION_TITLE;
+
import lombok.val;
@SpringBootTest(
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/HasPersistenceStandard.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/HasPersistenceStandard.java
index b2f3cd2628..5dde9c22de 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/HasPersistenceStandard.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/HasPersistenceStandard.java
@@ -19,7 +19,6 @@
package org.apache.causeway.testdomain;
import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.core.config.beans.PersistenceStack;
public interface HasPersistenceStandard {
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/RegressionTestAbstract.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/RegressionTestAbstract.java
index 56954ab00e..14bfc3f6a6 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/RegressionTestAbstract.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/RegressionTestAbstract.java
@@ -22,7 +22,6 @@ import java.util.concurrent.Callable;
import javax.inject.Inject;
-import org.apache.causeway.commons.functional.ThrowingRunnable;
import org.springframework.transaction.annotation.Propagation;
import org.apache.causeway.applib.services.bookmark.BookmarkService;
@@ -31,6 +30,7 @@ import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.inject.ServiceInjector;
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.applib.services.xactn.TransactionService;
+import org.apache.causeway.commons.functional.ThrowingRunnable;
import org.apache.causeway.core.metamodel.objectmanager.ObjectManager;
/**
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_headless.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_headless.java
index 1b69ef0e48..c89c965495 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_headless.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_headless.java
@@ -35,9 +35,8 @@ import org.springframework.transaction.TransactionStatus;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.iactn.Interaction;
import org.apache.causeway.applib.services.metrics.MetricsService;
-import org.apache.causeway.core.interaction.scope.TransactionBoundaryAware;
-
import org.apache.causeway.core.config.presets.CausewayPresets;
+import org.apache.causeway.core.interaction.scope.TransactionBoundaryAware;
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
import org.apache.causeway.testdomain.util.interaction.DomainObjectTesterFactory;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingStereotypes.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingStereotypes.java
index abecd890d5..39f33e56d6 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingStereotypes.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingStereotypes.java
@@ -18,10 +18,11 @@
*/
package org.apache.causeway.testdomain.conf;
-import org.apache.causeway.testdomain.model.stereotypes.MyService;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
+import org.apache.causeway.testdomain.model.stereotypes.MyService;
+
@Configuration
@ComponentScan(
basePackageClasses= {
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 e003a7c921..0a910fde88 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
@@ -25,9 +25,6 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.wicket.Component;
import org.apache.wicket.IPageFactory;
import org.apache.wicket.Page;
@@ -49,6 +46,9 @@ 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;
import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.object.ManagedObject;
@@ -66,6 +66,9 @@ 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;
@@ -73,10 +76,6 @@ 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/jdo/JdoInventoryDao.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/JdoInventoryDao.java
index a7f61b106e..2686d413d6 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
@@ -24,13 +24,13 @@ 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;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import lombok.val;
@Component
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/JdoInventoryResource.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/JdoInventoryResource.java
index e7b386efac..157325859d 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/JdoInventoryResource.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/JdoInventoryResource.java
@@ -26,11 +26,6 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.xml.bind.JAXBException;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.testdomain.jdo.entities.JdoBook;
-import org.apache.causeway.testdomain.jdo.entities.JdoProduct;
-import org.apache.causeway.testdomain.util.dto.BookDto;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
@@ -41,6 +36,11 @@ import org.apache.causeway.applib.annotation.ParameterLayout;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.services.repository.RepositoryService;
+import org.apache.causeway.commons.internal.base._NullSafe;
+import org.apache.causeway.commons.internal.collections._Lists;
+import org.apache.causeway.testdomain.jdo.entities.JdoBook;
+import org.apache.causeway.testdomain.jdo.entities.JdoProduct;
+import org.apache.causeway.testdomain.util.dto.BookDto;
import lombok.RequiredArgsConstructor;
import lombok.val;
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 5583ebcd30..ab9ace37de 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
@@ -28,17 +28,6 @@ import java.util.stream.IntStream;
import javax.inject.Inject;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.assertions._Assert;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.base._Oneshot;
-import org.apache.causeway.commons.internal.base._Refs;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.base._Refs.BooleanAtomicReference;
-import org.apache.causeway.testdomain.jdo.entities.JdoBook;
-import org.apache.causeway.testdomain.jdo.entities.JdoInventory;
-import org.apache.causeway.testdomain.jdo.entities.JdoProduct;
-import org.apache.causeway.testdomain.util.dto.BookDto;
import org.springframework.stereotype.Service;
import static org.junit.Assert.assertArrayEquals;
@@ -51,6 +40,17 @@ import org.apache.causeway.applib.services.bookmark.BookmarkService;
import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.repository.RepositoryService;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.assertions._Assert;
+import org.apache.causeway.commons.internal.base._NullSafe;
+import org.apache.causeway.commons.internal.base._Oneshot;
+import org.apache.causeway.commons.internal.base._Refs;
+import org.apache.causeway.commons.internal.base._Refs.BooleanAtomicReference;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.testdomain.jdo.entities.JdoBook;
+import org.apache.causeway.testdomain.jdo.entities.JdoInventory;
+import org.apache.causeway.testdomain.jdo.entities.JdoProduct;
+import org.apache.causeway.testdomain.util.dto.BookDto;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
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 33dc1d4d31..423972e8ef 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
@@ -31,8 +31,6 @@ import javax.jdo.annotations.InheritanceStrategy;
import javax.jdo.annotations.PersistenceCapable;
import javax.jdo.annotations.Persistent;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.Collection;
import org.apache.causeway.applib.annotation.DomainObject;
@@ -40,6 +38,7 @@ import org.apache.causeway.applib.annotation.Editing;
import org.apache.causeway.applib.annotation.MemberSupport;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.Publishing;
+import org.apache.causeway.commons.internal.base._Strings;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
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 5001b61547..4d058cf2d9 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
@@ -24,13 +24,13 @@ 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;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import lombok.val;
@Component
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/JpaInventoryResource.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/JpaInventoryResource.java
index c2bf046bd4..e064da4d83 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/JpaInventoryResource.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/JpaInventoryResource.java
@@ -25,11 +25,6 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.xml.bind.JAXBException;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.testdomain.jpa.entities.JpaBook;
-import org.apache.causeway.testdomain.jpa.entities.JpaProduct;
-import org.apache.causeway.testdomain.util.dto.BookDto;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
@@ -39,6 +34,11 @@ import org.apache.causeway.applib.annotation.NatureOfService;
import org.apache.causeway.applib.annotation.ParameterLayout;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.repository.RepositoryService;
+import org.apache.causeway.commons.internal.base._NullSafe;
+import org.apache.causeway.commons.internal.collections._Lists;
+import org.apache.causeway.testdomain.jpa.entities.JpaBook;
+import org.apache.causeway.testdomain.jpa.entities.JpaProduct;
+import org.apache.causeway.testdomain.util.dto.BookDto;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/JpaTestDomainModule.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/JpaTestDomainModule.java
index 6287cf8004..29efafce66 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/JpaTestDomainModule.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/JpaTestDomainModule.java
@@ -18,11 +18,12 @@
*/
package org.apache.causeway.testdomain.jpa;
-import org.apache.causeway.testdomain.jpa.entities.JpaBook;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
+import org.apache.causeway.testdomain.jpa.entities.JpaBook;
+
@Configuration
@ComponentScan(
basePackageClasses= {
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 d93145e2ef..fdec15fb6e 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
@@ -28,17 +28,6 @@ import java.util.stream.IntStream;
import javax.inject.Inject;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.assertions._Assert;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.base._Oneshot;
-import org.apache.causeway.commons.internal.base._Refs;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.base._Refs.BooleanAtomicReference;
-import org.apache.causeway.testdomain.jpa.entities.JpaBook;
-import org.apache.causeway.testdomain.jpa.entities.JpaInventory;
-import org.apache.causeway.testdomain.jpa.entities.JpaProduct;
-import org.apache.causeway.testdomain.util.dto.BookDto;
import org.springframework.stereotype.Service;
import static org.junit.Assert.assertArrayEquals;
@@ -50,6 +39,17 @@ import org.apache.causeway.applib.services.bookmark.BookmarkService;
import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.repository.RepositoryService;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.assertions._Assert;
+import org.apache.causeway.commons.internal.base._NullSafe;
+import org.apache.causeway.commons.internal.base._Oneshot;
+import org.apache.causeway.commons.internal.base._Refs;
+import org.apache.causeway.commons.internal.base._Refs.BooleanAtomicReference;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.testdomain.jpa.entities.JpaBook;
+import org.apache.causeway.testdomain.jpa.entities.JpaInventory;
+import org.apache.causeway.testdomain.jpa.entities.JpaProduct;
+import org.apache.causeway.testdomain.util.dto.BookDto;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/entities/JpaProduct.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/entities/JpaProduct.java
index d4345c1a4a..9a82d18d69 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/entities/JpaProduct.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/entities/JpaProduct.java
@@ -34,8 +34,6 @@ import javax.persistence.InheritanceType;
import javax.persistence.JoinColumn;
import javax.persistence.OneToMany;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.Collection;
import org.apache.causeway.applib.annotation.DomainObject;
@@ -44,6 +42,7 @@ import org.apache.causeway.applib.annotation.MemberSupport;
import org.apache.causeway.applib.annotation.ObjectSupport;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.Publishing;
+import org.apache.causeway.commons.internal.base._Strings;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/actnsemantics/BlobDemo.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/actnsemantics/BlobDemo.java
index dc746ed5a8..9f039456cc 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/actnsemantics/BlobDemo.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/actnsemantics/BlobDemo.java
@@ -26,9 +26,6 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.causeway.commons.internal.base._Bytes;
-import org.apache.causeway.commons.internal.resources._Resources;
-
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Editing;
import org.apache.causeway.applib.annotation.Nature;
@@ -36,6 +33,8 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.applib.value.NamedWithMimeType.CommonMimeType;
+import org.apache.causeway.commons.internal.base._Bytes;
+import org.apache.causeway.commons.internal.resources._Resources;
import lombok.Getter;
import lombok.Setter;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/good/ProperChoicesWhenActionHasParamSupportingMethodTypeOfReference.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/good/ProperChoicesWhenActionHasParamSupportingMethodTypeOfReference.java
index f26ebe1179..dc72e8dfdd 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/good/ProperChoicesWhenActionHasParamSupportingMethodTypeOfReference.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/good/ProperChoicesWhenActionHasParamSupportingMethodTypeOfReference.java
@@ -21,13 +21,12 @@ package org.apache.causeway.testdomain.model.good;
import java.util.List;
import java.util.Set;
-import org.apache.causeway.commons.internal.collections._Lists;
-
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.Collection;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.MemberSupport;
import org.apache.causeway.applib.annotation.Nature;
+import org.apache.causeway.commons.internal.collections._Lists;
import lombok.RequiredArgsConstructor;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/good/ProperChoicesWhenActionHasParamSupportingMethodTypeOfString.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/good/ProperChoicesWhenActionHasParamSupportingMethodTypeOfString.java
index 565b221b2a..327aeae3db 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/good/ProperChoicesWhenActionHasParamSupportingMethodTypeOfString.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/good/ProperChoicesWhenActionHasParamSupportingMethodTypeOfString.java
@@ -20,13 +20,12 @@ package org.apache.causeway.testdomain.model.good;
import java.util.List;
-import org.apache.causeway.commons.internal.collections._Lists;
-
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.Collection;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.MemberSupport;
import org.apache.causeway.applib.annotation.Nature;
+import org.apache.causeway.commons.internal.collections._Lists;
import lombok.RequiredArgsConstructor;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/good/ProperChoicesWhenChoicesFrom.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/good/ProperChoicesWhenChoicesFrom.java
index 0e1d73a094..fe4a6463eb 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/good/ProperChoicesWhenChoicesFrom.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/good/ProperChoicesWhenChoicesFrom.java
@@ -21,12 +21,11 @@ package org.apache.causeway.testdomain.model.good;
import java.util.List;
import java.util.stream.Collectors;
-import org.apache.causeway.commons.internal.collections._Lists;
-
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.Collection;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Nature;
+import org.apache.causeway.commons.internal.collections._Lists;
@DomainObject(nature = Nature.VIEW_MODEL)
public class ProperChoicesWhenChoicesFrom {
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/good/ProperElementTypeVm.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/good/ProperElementTypeVm.java
index c698e407bb..4b929d7182 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/good/ProperElementTypeVm.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/good/ProperElementTypeVm.java
@@ -22,12 +22,11 @@ import java.util.Collections;
import java.util.List;
import java.util.SortedSet;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.collections.ImmutableCollection;
-
import org.apache.causeway.applib.annotation.Collection;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Nature;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.collections.ImmutableCollection;
import lombok.Getter;
import lombok.Setter;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/good/ProperElementTypeVmAbstract.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/good/ProperElementTypeVmAbstract.java
index c19045fcf9..b2e0cd64c9 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/good/ProperElementTypeVmAbstract.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/good/ProperElementTypeVmAbstract.java
@@ -20,12 +20,11 @@ package org.apache.causeway.testdomain.model.good;
import java.util.Set;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.collections.ImmutableCollection;
-
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.Collection;
import org.apache.causeway.applib.annotation.MemberSupport;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.collections.ImmutableCollection;
/**
* @see <a href="https://issues.apache.org/jira/browse/CAUSEWAY-3164">CAUSEWAY-3164</a>
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/interaction/InteractionDemo.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/interaction/InteractionDemo.java
index 926b61a7f4..f8540baa1c 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/interaction/InteractionDemo.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/interaction/InteractionDemo.java
@@ -32,9 +32,6 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import org.apache.causeway.commons.internal.base._Lazy;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
import org.apache.causeway.applib.annotation.Collection;
@@ -46,6 +43,8 @@ import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
+import org.apache.causeway.commons.internal.base._Lazy;
+import org.apache.causeway.commons.internal.base._Strings;
import lombok.Getter;
import lombok.Setter;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/interaction/InteractionDemo_biListOfString.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/interaction/InteractionDemo_biListOfString.java
index fd9d979883..eca79fd14d 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/interaction/InteractionDemo_biListOfString.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/interaction/InteractionDemo_biListOfString.java
@@ -22,10 +22,9 @@ import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import org.apache.causeway.commons.internal.collections._Lists;
-
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.MemberSupport;
+import org.apache.causeway.commons.internal.collections._Lists;
import lombok.RequiredArgsConstructor;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/interaction/InteractionDemo_negotiate.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/interaction/InteractionDemo_negotiate.java
index 5019465108..cc1ca0a87f 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/interaction/InteractionDemo_negotiate.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/interaction/InteractionDemo_negotiate.java
@@ -20,11 +20,11 @@ package org.apache.causeway.testdomain.model.interaction;
import java.util.stream.IntStream;
+import org.apache.causeway.applib.annotation.Action;
+import org.apache.causeway.applib.annotation.MemberSupport;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.testdomain.model.interaction.InteractionDemo_negotiate.Params.NumberRange;
-import org.apache.causeway.applib.annotation.Action;
-import org.apache.causeway.applib.annotation.MemberSupport;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/valuetypes/Configuration_usingValueTypes.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/valuetypes/Configuration_usingValueTypes.java
index 6cfe2f1310..174055ba79 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/valuetypes/Configuration_usingValueTypes.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/valuetypes/Configuration_usingValueTypes.java
@@ -18,14 +18,15 @@
*/
package org.apache.causeway.testdomain.model.valuetypes;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
import org.apache.causeway.extensions.fullcalendar.applib.CausewayModuleExtFullCalendarApplib;
import org.apache.causeway.extensions.sse.metamodel.CausewayModuleExtSseMetaModel;
import org.apache.causeway.valuetypes.asciidoc.metamodel.CausewayModuleValAsciidocMetaModel;
import org.apache.causeway.valuetypes.markdown.metamodel.CausewayModuleValMarkdownMetaModel;
import org.apache.causeway.valuetypes.vega.metamodel.CausewayModuleValVegaMetaModel;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
@Configuration
@Import({
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/valuetypes/ValueTypeExample.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/valuetypes/ValueTypeExample.java
index ead2808087..edbbc4f74e 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/valuetypes/ValueTypeExample.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/valuetypes/ValueTypeExample.java
@@ -37,6 +37,8 @@ import java.util.stream.Stream;
import javax.inject.Named;
+import org.springframework.beans.factory.annotation.Autowired;
+
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.Collection;
import org.apache.causeway.applib.annotation.DomainObject;
@@ -70,7 +72,6 @@ import org.apache.causeway.schema.common.v2.OidDto;
import org.apache.causeway.schema.ixn.v2.InteractionDto;
import org.apache.causeway.valuetypes.vega.applib.value.Vega;
import org.apache.causeway.valuetypes.vega.metamodel.semantics.VegaValueSemantics;
-import org.springframework.beans.factory.annotation.Autowired;
import lombok.Builder;
import lombok.Getter;
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 e474c2e05d..f81eed8a4b 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
@@ -25,11 +25,11 @@ import java.util.stream.Stream;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.base._Strings;
import org.junit.jupiter.params.provider.Arguments;
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.value.semantics.ValueSemanticsResolver;
+import org.apache.causeway.commons.internal.base._Strings;
import lombok.Value;
import lombok.val;
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 97cbf22376..f279e3696f 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
@@ -24,13 +24,6 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
import java.util.function.BiConsumer;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.assertions._Assert;
-import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.commons.internal.debug._Probe;
-import org.apache.causeway.commons.internal.debug.xray.XrayUi;
-import org.apache.causeway.commons.internal.debug.xray.XrayModel.Stickiness;
-import org.apache.causeway.commons.internal.debug.xray.XrayModel.ThreadMemento;
import org.junit.jupiter.api.DynamicTest;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Service;
@@ -46,6 +39,13 @@ import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.wrapper.DisabledException;
import org.apache.causeway.applib.services.xactn.TransactionService;
import org.apache.causeway.applib.services.xactn.TransactionState;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.assertions._Assert;
+import org.apache.causeway.commons.internal.collections._Lists;
+import org.apache.causeway.commons.internal.debug._Probe;
+import org.apache.causeway.commons.internal.debug.xray.XrayModel.Stickiness;
+import org.apache.causeway.commons.internal.debug.xray.XrayModel.ThreadMemento;
+import org.apache.causeway.commons.internal.debug.xray.XrayUi;
import org.apache.causeway.core.transaction.events.TransactionAfterCompletionEvent;
import org.apache.causeway.core.transaction.events.TransactionBeforeCompletionEvent;
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 877ed2ec27..691e9aaaf1 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
@@ -26,9 +26,6 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.jdo.PersistenceManagerFactory;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
-import org.apache.causeway.commons.internal.functions._Functions.CheckedConsumer;
import org.springframework.context.annotation.Import;
import org.springframework.stereotype.Component;
@@ -41,6 +38,9 @@ import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.applib.services.wrapper.WrapperFactory;
import org.apache.causeway.applib.services.wrapper.control.SyncControl;
import org.apache.causeway.applib.services.xactn.TransactionService;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
+import org.apache.causeway.commons.internal.functions._Functions.CheckedConsumer;
import org.apache.causeway.core.metamodel.interactions.managed.ActionInteraction;
import org.apache.causeway.core.metamodel.interactions.managed.PropertyInteraction;
import org.apache.causeway.core.metamodel.object.ManagedObject;
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 7601bda466..7878395487 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,10 +25,6 @@ import java.util.concurrent.TimeoutException;
import javax.inject.Inject;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.debug._Probe;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
-import org.apache.causeway.commons.internal.functions._Functions.CheckedConsumer;
import org.springframework.context.annotation.Import;
import org.springframework.stereotype.Component;
@@ -41,6 +37,10 @@ import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.applib.services.wrapper.WrapperFactory;
import org.apache.causeway.applib.services.wrapper.control.SyncControl;
import org.apache.causeway.applib.services.xactn.TransactionService;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.debug._Probe;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
+import org.apache.causeway.commons.internal.functions._Functions.CheckedConsumer;
import org.apache.causeway.core.metamodel.interactions.managed.ActionInteraction;
import org.apache.causeway.core.metamodel.interactions.managed.PropertyInteraction;
import org.apache.causeway.core.metamodel.object.ManagedObject;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/conf/Configuration_usingCommandPublishing.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/conf/Configuration_usingCommandPublishing.java
index 6f6d9457e9..bd52e6ada2 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/conf/Configuration_usingCommandPublishing.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/conf/Configuration_usingCommandPublishing.java
@@ -18,11 +18,12 @@
*/
package org.apache.causeway.testdomain.publishing.conf;
-import org.apache.causeway.testdomain.publishing.subscriber.CommandSubscriberForTesting;
-import org.apache.causeway.testdomain.util.kv.KVStoreForTesting;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.testdomain.publishing.subscriber.CommandSubscriberForTesting;
+import org.apache.causeway.testdomain.util.kv.KVStoreForTesting;
+
@Configuration
@Import({
KVStoreForTesting.class,
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/conf/Configuration_usingEntityChangesPublishing.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/conf/Configuration_usingEntityChangesPublishing.java
index eb3cf84fac..ed2b8df2d4 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/conf/Configuration_usingEntityChangesPublishing.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/conf/Configuration_usingEntityChangesPublishing.java
@@ -18,11 +18,12 @@
*/
package org.apache.causeway.testdomain.publishing.conf;
-import org.apache.causeway.testdomain.publishing.subscriber.EntityChangesSubscriberForTesting;
-import org.apache.causeway.testdomain.util.kv.KVStoreForTesting;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.testdomain.publishing.subscriber.EntityChangesSubscriberForTesting;
+import org.apache.causeway.testdomain.util.kv.KVStoreForTesting;
+
@Configuration
@Import({
KVStoreForTesting.class,
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/conf/Configuration_usingEntityPropertyChangePublishing.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/conf/Configuration_usingEntityPropertyChangePublishing.java
index a8a9029799..c028ecc87d 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/conf/Configuration_usingEntityPropertyChangePublishing.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/conf/Configuration_usingEntityPropertyChangePublishing.java
@@ -18,10 +18,11 @@
*/
package org.apache.causeway.testdomain.publishing.conf;
-import org.apache.causeway.testdomain.publishing.subscriber.EntityPropertyChangeSubscriberForTesting;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.testdomain.publishing.subscriber.EntityPropertyChangeSubscriberForTesting;
+
@Configuration
@Import({
EntityPropertyChangeSubscriberForTesting.class
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/conf/Configuration_usingExecutionPublishing.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/conf/Configuration_usingExecutionPublishing.java
index 370d9e632f..a91c6eb56e 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/conf/Configuration_usingExecutionPublishing.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/conf/Configuration_usingExecutionPublishing.java
@@ -18,11 +18,12 @@
*/
package org.apache.causeway.testdomain.publishing.conf;
-import org.apache.causeway.testdomain.publishing.subscriber.ExecutionSubscriberForTesting;
-import org.apache.causeway.testdomain.util.kv.KVStoreForTesting;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.testdomain.publishing.subscriber.ExecutionSubscriberForTesting;
+import org.apache.causeway.testdomain.util.kv.KVStoreForTesting;
+
@Configuration
@Import({
KVStoreForTesting.class,
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/conf/Configuration_usingLifecycleEventPublishing.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/conf/Configuration_usingLifecycleEventPublishing.java
index 23c88aa8bf..d2432cbc5f 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/conf/Configuration_usingLifecycleEventPublishing.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/conf/Configuration_usingLifecycleEventPublishing.java
@@ -18,10 +18,11 @@
*/
package org.apache.causeway.testdomain.publishing.conf;
-import org.apache.causeway.testdomain.util.event.LifecycleEventSubscriberJpaForTesting;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.testdomain.util.event.LifecycleEventSubscriberJpaForTesting;
+
@Configuration
@Import({
LifecycleEventSubscriberJpaForTesting.class
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/stubs/CommandPublishingTestAbstract.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/stubs/CommandPublishingTestAbstract.java
index a3c99f81a0..8d4f075886 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/stubs/CommandPublishingTestAbstract.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/stubs/CommandPublishingTestAbstract.java
@@ -23,7 +23,11 @@ import java.util.UUID;
import javax.inject.Inject;
+import static org.junit.jupiter.api.Assertions.fail;
+
import org.apache.causeway.applib.services.command.Command;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.schema.cmd.v2.ActionDto;
import org.apache.causeway.schema.cmd.v2.CommandDto;
import org.apache.causeway.schema.cmd.v2.PropertyDto;
@@ -32,10 +36,6 @@ import org.apache.causeway.testdomain.publishing.PublishingTestFactoryAbstract.V
import org.apache.causeway.testdomain.publishing.subscriber.CommandSubscriberForTesting;
import org.apache.causeway.testdomain.util.CollectionAssertions;
import org.apache.causeway.testdomain.util.kv.KVStoreForTesting;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
-
-import static org.junit.jupiter.api.Assertions.fail;
import lombok.val;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/stubs/EntityPublishingTestAbstract.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/stubs/EntityPublishingTestAbstract.java
index ccc75a1419..21fde1d51f 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/stubs/EntityPublishingTestAbstract.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/stubs/EntityPublishingTestAbstract.java
@@ -20,6 +20,9 @@ package org.apache.causeway.testdomain.publishing.stubs;
import javax.inject.Inject;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
import org.apache.causeway.testdomain.publishing.PublishingTestFactoryAbstract.ChangeScenario;
import org.apache.causeway.testdomain.publishing.PublishingTestFactoryAbstract.VerificationStage;
import org.apache.causeway.testdomain.util.kv.KVStoreForTesting;
@@ -30,8 +33,6 @@ import static org.apache.causeway.testdomain.publishing.subscriber.EntityChanges
import static org.apache.causeway.testdomain.publishing.subscriber.EntityChangesSubscriberForTesting.getLoaded;
import static org.apache.causeway.testdomain.publishing.subscriber.EntityChangesSubscriberForTesting.getModified;
import static org.apache.causeway.testdomain.publishing.subscriber.EntityChangesSubscriberForTesting.getUpdated;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
public abstract class EntityPublishingTestAbstract
extends PublishingTestAbstract {
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/stubs/ExecutionPublishingTestAbstract.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/stubs/ExecutionPublishingTestAbstract.java
index 69c7fe8b08..267b1817ed 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/stubs/ExecutionPublishingTestAbstract.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/stubs/ExecutionPublishingTestAbstract.java
@@ -23,6 +23,8 @@ import java.util.Objects;
import javax.inject.Inject;
+import static org.junit.jupiter.api.Assertions.fail;
+
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.id.LogicalType;
import org.apache.causeway.applib.services.iactn.ActionInvocation;
@@ -39,8 +41,6 @@ import org.apache.causeway.testdomain.publishing.subscriber.ExecutionSubscriberF
import org.apache.causeway.testdomain.util.CollectionAssertions;
import org.apache.causeway.testdomain.util.kv.KVStoreForTesting;
-import static org.junit.jupiter.api.Assertions.fail;
-
import lombok.val;
public abstract class ExecutionPublishingTestAbstract
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/stubs/LifecycleEventPublishingTestAbstract.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/stubs/LifecycleEventPublishingTestAbstract.java
index 77ab8efb92..1fe6c75017 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/stubs/LifecycleEventPublishingTestAbstract.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/stubs/LifecycleEventPublishingTestAbstract.java
@@ -22,6 +22,10 @@ import java.util.Objects;
import javax.inject.Inject;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import org.apache.causeway.applib.events.lifecycle.AbstractLifecycleEvent;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.testdomain.jdo.entities.JdoBook;
@@ -34,11 +38,6 @@ import org.apache.causeway.testdomain.util.event.LifecycleEventSubscriberJdoForT
import org.apache.causeway.testdomain.util.event.LifecycleEventSubscriberJpaForTesting;
import org.apache.causeway.testdomain.util.kv.KVStoreForTesting;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
-
-import org.apache.causeway.applib.events.lifecycle.AbstractLifecycleEvent;
-
import lombok.val;
public abstract class LifecycleEventPublishingTestAbstract
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/stubs/PropertyPublishingTestAbstract.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/stubs/PropertyPublishingTestAbstract.java
index d929be0b87..1588172e28 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/stubs/PropertyPublishingTestAbstract.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/stubs/PropertyPublishingTestAbstract.java
@@ -20,6 +20,9 @@ package org.apache.causeway.testdomain.publishing.stubs;
import javax.inject.Inject;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.testdomain.publishing.PublishingTestFactoryAbstract.ChangeScenario;
@@ -29,9 +32,6 @@ import org.apache.causeway.testdomain.util.CollectionAssertions;
import org.apache.causeway.testdomain.util.dto.BookDto;
import org.apache.causeway.testdomain.util.kv.KVStoreForTesting;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
-
import lombok.val;
public abstract class PropertyPublishingTestAbstract
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/stubs/PublishingTestAbstract.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/stubs/PublishingTestAbstract.java
index 3f4618f937..882658cec6 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/stubs/PublishingTestAbstract.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/stubs/PublishingTestAbstract.java
@@ -23,13 +23,14 @@ package org.apache.causeway.testdomain.publishing.stubs;
import java.util.Collections;
import java.util.List;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.DynamicTest;
+import org.junit.jupiter.api.TestFactory;
+
import org.apache.causeway.testdomain.HasPersistenceStandard;
import org.apache.causeway.testdomain.publishing.PublishingTestFactoryAbstract;
import org.apache.causeway.testdomain.publishing.PublishingTestFactoryAbstract.ChangeScenario;
import org.apache.causeway.testdomain.publishing.PublishingTestFactoryAbstract.VerificationStage;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.DynamicTest;
-import org.junit.jupiter.api.TestFactory;
import lombok.val;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/CommandSubscriberForTesting.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/CommandSubscriberForTesting.java
index c4790ab683..a4b2a6f9a3 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/CommandSubscriberForTesting.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/CommandSubscriberForTesting.java
@@ -24,12 +24,12 @@ import java.util.List;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.testdomain.util.kv.KVStoreForTesting;
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.services.command.Command;
import org.apache.causeway.applib.services.publishing.spi.CommandSubscriber;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.testdomain.util.kv.KVStoreForTesting;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/EntityChangesSubscriberForTesting.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/EntityChangesSubscriberForTesting.java
index 1a427ac400..2e1217ce5e 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/EntityChangesSubscriberForTesting.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/EntityChangesSubscriberForTesting.java
@@ -24,13 +24,13 @@ import java.util.List;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.testdomain.util.kv.KVStoreForTesting;
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.services.publishing.spi.EntityChanges;
import org.apache.causeway.applib.services.publishing.spi.EntityChangesSubscriber;
import org.apache.causeway.applib.util.schema.ChangesDtoUtils;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.testdomain.util.kv.KVStoreForTesting;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/EntityPropertyChangeSubscriberForTesting.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/EntityPropertyChangeSubscriberForTesting.java
index 3c1765be08..ea5826bc95 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/EntityPropertyChangeSubscriberForTesting.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/EntityPropertyChangeSubscriberForTesting.java
@@ -24,13 +24,11 @@ import java.util.List;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
-import org.apache.causeway.commons.collections.Can;
import org.springframework.stereotype.Service;
-import org.apache.causeway.applib.id.LogicalType;
-import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.publishing.spi.EntityPropertyChange;
import org.apache.causeway.applib.services.publishing.spi.EntityPropertyChangeSubscriber;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.config.beans.CausewayBeanTypeRegistry;
import org.apache.causeway.core.config.beans.PersistenceStack;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/ExecutionSubscriberForTesting.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/ExecutionSubscriberForTesting.java
index 20039018f5..33475e35f2 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/ExecutionSubscriberForTesting.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/ExecutionSubscriberForTesting.java
@@ -24,13 +24,13 @@ import java.util.List;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.testdomain.util.kv.KVStoreForTesting;
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.services.iactn.Execution;
import org.apache.causeway.applib.services.publishing.spi.ExecutionSubscriber;
import org.apache.causeway.applib.util.schema.MemberExecutionDtoUtils;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.testdomain.util.kv.KVStoreForTesting;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/rospec/RoSpecSampler.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/rospec/RoSpecSampler.java
index 1dab77981f..d8c7789843 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/rospec/RoSpecSampler.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/rospec/RoSpecSampler.java
@@ -23,13 +23,12 @@ import java.util.List;
import javax.inject.Named;
-import org.apache.causeway.commons.internal.collections._Lists;
-
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.DomainService;
import org.apache.causeway.applib.annotation.NatureOfService;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.annotation.SemanticsOf;
+import org.apache.causeway.commons.internal.collections._Lists;
@Named("testdomain.RoSpecSampler")
@DomainService(
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/CollectionAssertions.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/CollectionAssertions.java
index 3de2041cea..7be86f20f8 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/CollectionAssertions.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/CollectionAssertions.java
@@ -22,13 +22,13 @@ import java.util.List;
import java.util.function.BiFunction;
import java.util.stream.Collectors;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.collections._Arrays;
import org.assertj.core.api.Assertions;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.apache.causeway.commons.internal.base._NullSafe;
+import org.apache.causeway.commons.internal.collections._Arrays;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import lombok.val;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/dto/BookDto.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/dto/BookDto.java
index a6643215fd..1d34ca1b8a 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/dto/BookDto.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/dto/BookDto.java
@@ -31,11 +31,10 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
+import org.apache.causeway.applib.annotation.Programmatic;
import org.apache.causeway.commons.internal.base._Bytes;
import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.applib.annotation.Programmatic;
-
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/event/LifecycleEventSubscriberJdoForTesting.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/event/LifecycleEventSubscriberJdoForTesting.java
index 88d35435c9..0331ea14e9 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/event/LifecycleEventSubscriberJdoForTesting.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/event/LifecycleEventSubscriberJdoForTesting.java
@@ -20,14 +20,14 @@ package org.apache.causeway.testdomain.util.event;
import javax.inject.Inject;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.testdomain.jdo.entities.JdoBook;
-import org.apache.causeway.testdomain.util.dto.BookDto;
-import org.apache.causeway.testdomain.util.kv.KVStoreForTesting;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.events.lifecycle.AbstractLifecycleEvent;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.testdomain.jdo.entities.JdoBook;
+import org.apache.causeway.testdomain.util.dto.BookDto;
+import org.apache.causeway.testdomain.util.kv.KVStoreForTesting;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/event/LifecycleEventSubscriberJpaForTesting.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/event/LifecycleEventSubscriberJpaForTesting.java
index 433e540464..b0278255f3 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/event/LifecycleEventSubscriberJpaForTesting.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/event/LifecycleEventSubscriberJpaForTesting.java
@@ -20,14 +20,14 @@ package org.apache.causeway.testdomain.util.event;
import javax.inject.Inject;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.testdomain.jpa.entities.JpaBook;
-import org.apache.causeway.testdomain.util.dto.BookDto;
-import org.apache.causeway.testdomain.util.kv.KVStoreForTesting;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.events.lifecycle.AbstractLifecycleEvent;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.testdomain.jpa.entities.JpaBook;
+import org.apache.causeway.testdomain.util.dto.BookDto;
+import org.apache.causeway.testdomain.util.kv.KVStoreForTesting;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/interaction/DataTableTester.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/interaction/DataTableTester.java
index ee5572e863..94c6e477a2 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/interaction/DataTableTester.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/interaction/DataTableTester.java
@@ -21,10 +21,9 @@ package org.apache.causeway.testdomain.util.interaction;
import java.util.List;
import java.util.stream.Collectors;
-import org.apache.causeway.commons.binding.Observable;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.apache.causeway.commons.binding.Observable;
import org.apache.causeway.core.metamodel.interactions.managed.nonscalar.DataColumn;
import org.apache.causeway.core.metamodel.interactions.managed.nonscalar.DataRow;
import org.apache.causeway.core.metamodel.interactions.managed.nonscalar.DataTableModel;
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 ec2789dacc..3a58cf0940 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,19 +28,17 @@ import java.util.stream.Stream;
import javax.inject.Inject;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.junit.jupiter.api.function.ThrowingSupplier;
import org.springframework.lang.Nullable;
import org.springframework.stereotype.Service;
+import static org.hamcrest.CoreMatchers.either;
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.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.annotation.Where;
@@ -50,6 +48,10 @@ import org.apache.causeway.applib.services.command.Command;
import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.inject.ServiceInjector;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants;
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 de8d1e4f43..4e5304f695 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
@@ -30,7 +30,6 @@ import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.iactn.Interaction;
import org.apache.causeway.core.interaction.scope.TransactionBoundaryAware;
-
import org.apache.causeway.core.transaction.events.TransactionAfterCompletionEvent;
import org.apache.causeway.core.transaction.events.TransactionBeforeCompletionEvent;
import org.apache.causeway.testdomain.util.kv.KVStoreForTesting;
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 48495e4991..e2078a9a08 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,14 +27,17 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.collections._Sets;
import org.springframework.lang.Nullable;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.wrapper.WrapperFactory;
+import org.apache.causeway.commons.internal.base._NullSafe;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.collections._Sets;
import org.apache.causeway.core.metamodel.interactions.managed.ActionInteraction;
import org.apache.causeway.core.metamodel.interactions.managed.CollectionInteraction;
import org.apache.causeway.core.metamodel.interactions.managed.PropertyInteraction;
@@ -45,9 +48,6 @@ import org.apache.causeway.testdomain.util.CollectionAssertions;
import org.apache.causeway.testdomain.util.kv.KVStoreForTesting;
import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import lombok.val;
public abstract class InteractionTestAbstract extends CausewayIntegrationTestAbstract {
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/kv/KVStoreForTesting.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/kv/KVStoreForTesting.java
index d3caf5def4..410575f11a 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/kv/KVStoreForTesting.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/kv/KVStoreForTesting.java
@@ -26,9 +26,10 @@ import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.inject.Singleton;
+import org.springframework.stereotype.Service;
+
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.collections._Maps;
-import org.springframework.stereotype.Service;
import lombok.NonNull;
import lombok.SneakyThrows;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/rest/RestEndpointService.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/rest/RestEndpointService.java
index 718fd701d7..ecba8bfe1e 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/rest/RestEndpointService.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/rest/RestEndpointService.java
@@ -25,13 +25,13 @@ import javax.ws.rs.client.Invocation;
import javax.ws.rs.core.GenericType;
import javax.xml.bind.JAXBException;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.functional.Try;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.client.SuppressionType;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.functional.Try;
import org.apache.causeway.core.config.RestEasyConfiguration;
import org.apache.causeway.core.config.viewer.web.WebAppContextPath;
import org.apache.causeway.testdomain.jdo.JdoInventoryJaxbVm;
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/wrapperfactory/CounterRepository.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/wrapperfactory/CounterRepository.java
index c08d30250e..2c1c7a1ba4 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/wrapperfactory/CounterRepository.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/wrapperfactory/CounterRepository.java
@@ -25,9 +25,10 @@ import java.util.Objects;
import javax.inject.Inject;
-import org.apache.causeway.applib.services.repository.RepositoryService;
import org.springframework.stereotype.Repository;
+import org.apache.causeway.applib.services.repository.RepositoryService;
+
@Repository
public class CounterRepository {
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/wrapperfactory/WrapperTestFixtures.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/wrapperfactory/WrapperTestFixtures.java
index 450fcc75c3..dfe6845beb 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/wrapperfactory/WrapperTestFixtures.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/wrapperfactory/WrapperTestFixtures.java
@@ -20,13 +20,14 @@
package org.apache.causeway.testdomain.wrapperfactory;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
-import org.apache.causeway.testing.fixtures.applib.modules.ModuleWithFixtures;
-import org.apache.causeway.testing.fixtures.applib.teardown.jdo.TeardownFixtureJdoAbstract;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
+import org.apache.causeway.testing.fixtures.applib.modules.ModuleWithFixtures;
+import org.apache.causeway.testing.fixtures.applib.teardown.jdo.TeardownFixtureJdoAbstract;
+
@Configuration
@Import({
})
diff --git a/testing/archtestsupport/applib/src/main/java/org/apache/causeway/testing/archtestsupport/applib/classrules/_LogicalNaming.java b/testing/archtestsupport/applib/src/main/java/org/apache/causeway/testing/archtestsupport/applib/classrules/_LogicalNaming.java
index e3c31d7fa0..54b2296815 100644
--- a/testing/archtestsupport/applib/src/main/java/org/apache/causeway/testing/archtestsupport/applib/classrules/_LogicalNaming.java
+++ b/testing/archtestsupport/applib/src/main/java/org/apache/causeway/testing/archtestsupport/applib/classrules/_LogicalNaming.java
@@ -24,9 +24,8 @@ import javax.inject.Named;
import com.tngtech.archunit.core.domain.JavaClass;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.annotation.DomainObject;
+import org.apache.causeway.commons.internal.base._Strings;
import lombok.val;
import lombok.experimental.UtilityClass;
diff --git a/testing/archtestsupport/applib/src/main/java/org/apache/causeway/testing/archtestsupport/applib/modulerules/SubpackageEnum.java b/testing/archtestsupport/applib/src/main/java/org/apache/causeway/testing/archtestsupport/applib/modulerules/SubpackageEnum.java
index 6a41bd1c56..fbaf3badde 100644
--- a/testing/archtestsupport/applib/src/main/java/org/apache/causeway/testing/archtestsupport/applib/modulerules/SubpackageEnum.java
+++ b/testing/archtestsupport/applib/src/main/java/org/apache/causeway/testing/archtestsupport/applib/modulerules/SubpackageEnum.java
@@ -23,6 +23,7 @@ import java.util.List;
import static java.util.Arrays.asList;
import static java.util.Collections.emptyList;
import static java.util.Collections.singletonList;
+
import lombok.RequiredArgsConstructor;
/**
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 c5a12f4e6b..22e51d7135 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
@@ -20,7 +20,11 @@ package org.apache.causeway.testing.archtestsupport.applib.entity.jdo.dom;
import java.util.Comparator;
-import javax.jdo.annotations.*;
+import javax.jdo.annotations.DatastoreIdentity;
+import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.Unique;
+import javax.jdo.annotations.Version;
import javax.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/modules/customer/CustomerModule.java b/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/modules/customer/CustomerModule.java
index 3ce3109c40..a2d5454efc 100644
--- a/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/modules/customer/CustomerModule.java
+++ b/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/modules/customer/CustomerModule.java
@@ -18,9 +18,10 @@
*/
package org.apache.causeway.testing.archtestsupport.applib.modules.customer;
-import org.apache.causeway.testing.archtestsupport.applib.modules.base.BaseModule;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.testing.archtestsupport.applib.modules.base.BaseModule;
+
@Import({ BaseModule.class })
public class CustomerModule {
}
diff --git a/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/modules/order/OrderModule.java b/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/modules/order/OrderModule.java
index 0703af9ec3..ae77cc6a83 100644
--- a/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/modules/order/OrderModule.java
+++ b/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/modules/order/OrderModule.java
@@ -18,9 +18,10 @@
*/
package org.apache.causeway.testing.archtestsupport.applib.modules.order;
-import org.apache.causeway.testing.archtestsupport.applib.modules.customer.CustomerModule;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.testing.archtestsupport.applib.modules.customer.CustomerModule;
+
@Import({ CustomerModule.class })
public class OrderModule {
}
diff --git a/testing/fakedata/applib/src/main/java/org/apache/causeway/testing/fakedata/applib/services/BigIntegers.java b/testing/fakedata/applib/src/main/java/org/apache/causeway/testing/fakedata/applib/services/BigIntegers.java
index 8fe1deaab0..73d11cbd6b 100644
--- a/testing/fakedata/applib/src/main/java/org/apache/causeway/testing/fakedata/applib/services/BigIntegers.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/causeway/testing/fakedata/applib/services/BigIntegers.java
@@ -20,8 +20,6 @@ package org.apache.causeway.testing.fakedata.applib.services;
import java.math.BigInteger;
-import org.apache.causeway.applib.annotation.Programmatic;
-
/**
* Returns random {@link BigInteger}s.
*
diff --git a/testing/fakedata/applib/src/main/java/org/apache/causeway/testing/fakedata/applib/services/CausewayBlobs.java b/testing/fakedata/applib/src/main/java/org/apache/causeway/testing/fakedata/applib/services/CausewayBlobs.java
index 17cc757155..c087d9fd90 100644
--- a/testing/fakedata/applib/src/main/java/org/apache/causeway/testing/fakedata/applib/services/CausewayBlobs.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/causeway/testing/fakedata/applib/services/CausewayBlobs.java
@@ -23,13 +23,10 @@ import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
+import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.commons.internal.base._Bytes;
import org.apache.causeway.commons.internal.resources._Resources;
-import org.apache.causeway.applib.value.Blob;
-
-import lombok.val;
-
/**
* Returns random {@link Blob} values, optionally constrained to either PDFs or JPGs.
*
@@ -81,7 +78,7 @@ public class CausewayBlobs extends AbstractRandomValueGenerator {
}
private static Blob asBlob(final String fileName) {
- try(val is = _Resources.load(CausewayBlobs.class, "blobs/" + fileName)){
+ try(var is = _Resources.load(CausewayBlobs.class, "blobs/" + fileName)){
return new Blob(fileName, mimeTypeFor(fileName), _Bytes.of(is));
} catch (IOException e) {
throw new RuntimeException(e);
diff --git a/testing/fakedata/applib/src/main/java/org/apache/causeway/testing/fakedata/applib/services/CausewayClobs.java b/testing/fakedata/applib/src/main/java/org/apache/causeway/testing/fakedata/applib/services/CausewayClobs.java
index a7736dc3a1..d873645483 100644
--- a/testing/fakedata/applib/src/main/java/org/apache/causeway/testing/fakedata/applib/services/CausewayClobs.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/causeway/testing/fakedata/applib/services/CausewayClobs.java
@@ -24,13 +24,10 @@ import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
+import org.apache.causeway.applib.value.Clob;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.resources._Resources;
-import org.apache.causeway.applib.value.Clob;
-
-import lombok.val;
-
/**
* Returns random {@link Clob} values, optionally constrained to either XMLs or RTFs.
*
@@ -111,7 +108,7 @@ public class CausewayClobs extends AbstractRandomValueGenerator {
}
private static Clob asClob(final String fileName) {
- try(val is = _Resources.load(CausewayBlobs.class, "clobs/" + fileName)) {
+ try(var is = _Resources.load(CausewayBlobs.class, "clobs/" + fileName)) {
return new Clob(fileName, mimeTypeFor(fileName), _Strings.read(is, StandardCharsets.US_ASCII));
} catch (IOException e) {
throw new RuntimeException(e);
diff --git a/testing/fakedata/applib/src/main/java/org/apache/causeway/testing/fakedata/applib/services/Strings.java b/testing/fakedata/applib/src/main/java/org/apache/causeway/testing/fakedata/applib/services/Strings.java
index d2d93da32b..4449b128a6 100644
--- a/testing/fakedata/applib/src/main/java/org/apache/causeway/testing/fakedata/applib/services/Strings.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/causeway/testing/fakedata/applib/services/Strings.java
@@ -18,8 +18,6 @@
*/
package org.apache.causeway.testing.fakedata.applib.services;
-import org.apache.causeway.applib.annotation.Programmatic;
-
/**
* Returns random strings, specifying the number of characters.
*
diff --git a/testing/fakedata/applib/src/main/java/org/apache/causeway/testing/fakedata/applib/services/Urls.java b/testing/fakedata/applib/src/main/java/org/apache/causeway/testing/fakedata/applib/services/Urls.java
index 6bc90aa274..2836fae604 100644
--- a/testing/fakedata/applib/src/main/java/org/apache/causeway/testing/fakedata/applib/services/Urls.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/causeway/testing/fakedata/applib/services/Urls.java
@@ -21,8 +21,6 @@ package org.apache.causeway.testing.fakedata.applib.services;
import java.net.MalformedURLException;
import java.net.URL;
-import org.apache.causeway.applib.annotation.Programmatic;
-
/**
* Returns random but well-formed {@link URL}s.
*
diff --git a/testing/fakedata/applib/src/test/java/org/apache/causeway/testing/fakedata/applib/services/FakeDataServiceTest.java b/testing/fakedata/applib/src/test/java/org/apache/causeway/testing/fakedata/applib/services/FakeDataServiceTest.java
index 9730dc6a82..169a8b0dbb 100644
--- a/testing/fakedata/applib/src/test/java/org/apache/causeway/testing/fakedata/applib/services/FakeDataServiceTest.java
+++ b/testing/fakedata/applib/src/test/java/org/apache/causeway/testing/fakedata/applib/services/FakeDataServiceTest.java
@@ -31,12 +31,6 @@ import java.util.Set;
import java.util.UUID;
import java.util.function.Predicate;
-import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.commons.internal.collections._Sets;
-import org.apache.causeway.testing.fakedata.applib.services.FakeDataService;
-import org.apache.causeway.testing.fakedata.applib.services.CausewayBlobs;
-import org.apache.causeway.testing.fakedata.applib.services.CausewayClobs;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Before;
@@ -51,6 +45,9 @@ import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.applib.value.Clob;
import org.apache.causeway.applib.value.Password;
+import org.apache.causeway.commons.internal.collections._Lists;
+import org.apache.causeway.commons.internal.collections._Sets;
+import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2;
public class FakeDataServiceTest {
diff --git a/testing/fakedata/fixtures/src/main/java/org/apache/causeway/testing/fakedata/fixtures/CausewayModuleTestingFakeDataFixtures.java b/testing/fakedata/fixtures/src/main/java/org/apache/causeway/testing/fakedata/fixtures/CausewayModuleTestingFakeDataFixtures.java
index 812e1d5a14..550da47c4d 100644
--- a/testing/fakedata/fixtures/src/main/java/org/apache/causeway/testing/fakedata/fixtures/CausewayModuleTestingFakeDataFixtures.java
+++ b/testing/fakedata/fixtures/src/main/java/org/apache/causeway/testing/fakedata/fixtures/CausewayModuleTestingFakeDataFixtures.java
@@ -18,13 +18,14 @@
*/
package org.apache.causeway.testing.fakedata.fixtures;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
import org.apache.causeway.testing.fakedata.applib.CausewayModuleTestingFakeDataApplib;
import org.apache.causeway.testing.fakedata.fixtures.demoapp.demomodule.fixturescripts.FakeDataDemoObjectWithAll_tearDown;
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.causeway.testing.fixtures.applib.modules.ModuleWithFixtures;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
@Configuration
@Import({
diff --git a/testing/fakedata/fixtures/src/main/java/org/apache/causeway/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java b/testing/fakedata/fixtures/src/main/java/org/apache/causeway/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java
index e99d3c8501..5983eb1739 100644
--- a/testing/fakedata/fixtures/src/main/java/org/apache/causeway/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java
+++ b/testing/fakedata/fixtures/src/main/java/org/apache/causeway/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java
@@ -22,12 +22,12 @@ import java.util.List;
import javax.inject.Inject;
+import org.apache.causeway.applib.annotation.Programmatic;
import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.testing.fakedata.applib.services.FakeDataService;
import org.apache.causeway.testing.fakedata.fixtures.demoapp.demomodule.dom.FakeDataDemoObjectWithAll;
import org.apache.causeway.testing.fakedata.fixtures.demoapp.demomodule.fixturescripts.data.FakeDataDemoObjectWithAll_create_withFakeData;
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
-import org.apache.causeway.applib.annotation.Programmatic;
import lombok.Getter;
import lombok.Setter;
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 28dcf53d64..ddf1e67cd5 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
@@ -20,13 +20,6 @@ package org.apache.causeway.testing.fakedata.integtests;
import javax.transaction.Transactional;
-import org.apache.causeway.core.config.presets.CausewayPresets;
-import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
-import org.apache.causeway.persistence.jdo.applib.CausewayModulePersistenceJdoApplib;
-import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
-import org.apache.causeway.testing.fakedata.fixtures.CausewayModuleTestingFakeDataFixtures;
-import org.apache.causeway.testing.fixtures.applib.CausewayIntegrationTestAbstractWithFixtures;
-import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
@@ -35,6 +28,14 @@ import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestPropertySource;
+import org.apache.causeway.core.config.presets.CausewayPresets;
+import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
+import org.apache.causeway.persistence.jdo.applib.CausewayModulePersistenceJdoApplib;
+import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
+import org.apache.causeway.testing.fakedata.fixtures.CausewayModuleTestingFakeDataFixtures;
+import org.apache.causeway.testing.fixtures.applib.CausewayIntegrationTestAbstractWithFixtures;
+import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib;
+
@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 977c0b2fa1..4c98a735b2 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
@@ -18,11 +18,12 @@
*/
package org.apache.causeway.testing.fakedata.integtests.tests;
-import org.apache.causeway.testing.fakedata.integtests.FakeDataModuleIntegTestAbstract;
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;
+
@Disabled("conext not setup correctly")
@Transactional
class Bootstrap_IntegTest extends FakeDataModuleIntegTestAbstract {
diff --git a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/CausewayIntegrationTestAbstractWithFixtures.java b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/CausewayIntegrationTestAbstractWithFixtures.java
index 790a74cb85..514cda7558 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/CausewayIntegrationTestAbstractWithFixtures.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/CausewayIntegrationTestAbstractWithFixtures.java
@@ -20,14 +20,15 @@ package org.apache.causeway.testing.fixtures.applib;
import javax.inject.Inject;
+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;
import org.apache.causeway.testing.fixtures.applib.personas.BuilderScriptAbstract;
import org.apache.causeway.testing.fixtures.applib.personas.PersonaWithBuilderScript;
import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
/**
* @since 2.x {@index}
diff --git a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/CausewayModuleTestingFixturesApplib.java b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/CausewayModuleTestingFixturesApplib.java
index a53aefa6bc..f207092225 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/CausewayModuleTestingFixturesApplib.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/CausewayModuleTestingFixturesApplib.java
@@ -18,12 +18,13 @@
*/
package org.apache.causeway.testing.fixtures.applib;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.causeway.testing.fixtures.applib.modules.ModuleWithFixturesService;
import org.apache.causeway.testing.fixtures.applib.queryresultscache.QueryResultsCacheControlForFixtures;
import org.apache.causeway.testing.fixtures.applib.services.InitialFixtureScriptsInstaller;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
/**
* @since 2.0 {@index}
diff --git a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/ExecutionParametersDefault.java b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/ExecutionParametersDefault.java
index 4328864bfd..985a0a12fe 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/ExecutionParametersDefault.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/ExecutionParametersDefault.java
@@ -25,15 +25,16 @@ import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.base._Text;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.joda.time.DateTime;
import org.joda.time.LocalDate;
import org.joda.time.LocalDateTime;
import org.joda.time.format.ISODateTimeFormat;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.base._Text;
+import org.apache.causeway.commons.internal.collections._Maps;
+
/**
* Responsible for parsing the string parameter passed when executing
* fixtures through the UI to the {@link FixtureScripts} domain service.
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 23fcc95fd3..455f0394e4 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
@@ -31,13 +31,6 @@ import java.util.stream.Stream;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.commons.internal.collections._Maps;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
-import org.apache.causeway.testing.fixtures.applib.personas.BuilderScriptAbstract;
-import org.apache.causeway.testing.fixtures.applib.personas.PersonaWithBuilderScript;
import org.joda.time.LocalDate;
import org.joda.time.LocalDateTime;
import org.springframework.transaction.PlatformTransactionManager;
@@ -52,6 +45,13 @@ import org.apache.causeway.applib.services.user.UserService;
import org.apache.causeway.applib.services.wrapper.WrapperFactory;
import org.apache.causeway.applib.services.wrapper.control.SyncControl;
import org.apache.causeway.applib.services.xactn.TransactionService;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.collections._Lists;
+import org.apache.causeway.commons.internal.collections._Maps;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
+import org.apache.causeway.testing.fixtures.applib.personas.BuilderScriptAbstract;
+import org.apache.causeway.testing.fixtures.applib.personas.PersonaWithBuilderScript;
import lombok.Getter;
import lombok.Setter;
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 d7bad7449c..8e1ad0763f 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScripts.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScripts.java
@@ -31,14 +31,6 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.xml.bind.annotation.XmlRootElement;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.collections._Maps;
-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.personas.BuilderScriptAbstract;
-import org.apache.causeway.testing.fixtures.applib.personas.PersonaWithBuilderScript;
import org.apache.causeway.applib.ViewModel;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
@@ -61,6 +53,14 @@ import org.apache.causeway.applib.services.registry.ServiceRegistry;
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.applib.services.title.TitleService;
import org.apache.causeway.applib.services.xactn.TransactionService;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.commons.internal.collections._Maps;
+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.personas.BuilderScriptAbstract;
+import org.apache.causeway.testing.fixtures.applib.personas.PersonaWithBuilderScript;
import lombok.Getter;
import lombok.Setter;
diff --git a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/modules/ModuleWithFixtures.java b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/modules/ModuleWithFixtures.java
index 9f61dabddf..8ebc6666c6 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/modules/ModuleWithFixtures.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/modules/ModuleWithFixtures.java
@@ -18,10 +18,11 @@
*/
package org.apache.causeway.testing.fixtures.applib.modules;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
+
/**
* A module is a class that implements this {@link ModuleWithFixtures} interface, but in addition is expected to be annotated with
* {@link Configuration @Configuration} and which defines a dependency other modules by {@link Import @Import}ing them,
diff --git a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/modules/ModuleWithFixturesService.java b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/modules/ModuleWithFixturesService.java
index 9e68cf5558..4147cee9e7 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/modules/ModuleWithFixturesService.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/modules/ModuleWithFixturesService.java
@@ -31,12 +31,6 @@ import javax.annotation.Priority;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.causeway.applib.annotation.PriorityPrecedence;
-import org.apache.causeway.commons.internal.reflection._Reflect;
-import org.apache.causeway.core.runtimeservices.spring.BeanDescriptor;
-import org.apache.causeway.core.runtimeservices.spring.ContextBeans;
-import org.apache.causeway.core.runtimeservices.spring.SpringBeansService;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Configuration;
@@ -45,6 +39,13 @@ import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Service;
+import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.commons.internal.reflection._Reflect;
+import org.apache.causeway.core.runtimeservices.spring.BeanDescriptor;
+import org.apache.causeway.core.runtimeservices.spring.ContextBeans;
+import org.apache.causeway.core.runtimeservices.spring.SpringBeansService;
+import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
+
import lombok.Data;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/setup/PersonaEnumPersistAll.java b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/setup/PersonaEnumPersistAll.java
index 64b1dda55c..b9b8bda471 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/setup/PersonaEnumPersistAll.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/setup/PersonaEnumPersistAll.java
@@ -20,13 +20,13 @@ package org.apache.causeway.testing.fixtures.applib.setup;
import java.util.List;
+import org.apache.causeway.applib.annotation.Programmatic;
import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptWithExecutionStrategy;
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.causeway.testing.fixtures.applib.personas.BuilderScriptAbstract;
import org.apache.causeway.testing.fixtures.applib.personas.PersonaWithBuilderScript;
-import org.apache.causeway.applib.annotation.Programmatic;
/**
* @since 2.x {@index}
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 7ca9d20689..ef6d97722e 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
@@ -26,10 +26,10 @@ import javax.jdo.metadata.DiscriminatorMetadata;
import javax.jdo.metadata.InheritanceMetadata;
import javax.jdo.metadata.TypeMetadata;
+import org.apache.causeway.applib.annotation.Programmatic;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.persistence.jdo.applib.services.JdoSupportService;
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
-import org.apache.causeway.applib.annotation.Programmatic;
/**
* @since 2.x {@index}
diff --git a/testing/fixtures/applib/src/test/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/ExecutionContext_Test.java b/testing/fixtures/applib/src/test/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/ExecutionContext_Test.java
index db219d22fe..a46fb6fbcf 100644
--- a/testing/fixtures/applib/src/test/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/ExecutionContext_Test.java
+++ b/testing/fixtures/applib/src/test/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/ExecutionContext_Test.java
@@ -20,7 +20,6 @@ package org.apache.causeway.testing.fixtures.applib.fixturescripts;
import java.util.Map;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
diff --git a/testing/fixtures/applib/src/test/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/ExecutionParametersDefault_AsKeyValueMap_Test.java b/testing/fixtures/applib/src/test/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/ExecutionParametersDefault_AsKeyValueMap_Test.java
index 46be197c7a..4e28b30dd8 100644
--- a/testing/fixtures/applib/src/test/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/ExecutionParametersDefault_AsKeyValueMap_Test.java
+++ b/testing/fixtures/applib/src/test/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/ExecutionParametersDefault_AsKeyValueMap_Test.java
@@ -20,7 +20,6 @@ package org.apache.causeway.testing.fixtures.applib.fixturescripts;
import java.util.Map;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersDefault;
import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
diff --git a/testing/fixtures/applib/src/test/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/ExecutionParametersDefault_Test.java b/testing/fixtures/applib/src/test/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/ExecutionParametersDefault_Test.java
index 94ef210be7..d97aba778b 100644
--- a/testing/fixtures/applib/src/test/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/ExecutionParametersDefault_Test.java
+++ b/testing/fixtures/applib/src/test/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/ExecutionParametersDefault_Test.java
@@ -21,8 +21,6 @@ package org.apache.causeway.testing.fixtures.applib.fixturescripts;
import java.math.BigDecimal;
import java.math.BigInteger;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParameters;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersDefault;
import org.joda.time.LocalDate;
import org.joda.time.LocalDateTime;
import org.junit.jupiter.api.BeforeEach;
diff --git a/testing/h2console/ui/src/main/java/org/apache/causeway/testing/h2console/ui/webmodule/H2WebServerWrapper.java b/testing/h2console/ui/src/main/java/org/apache/causeway/testing/h2console/ui/webmodule/H2WebServerWrapper.java
index af0416dc5f..8348061ebf 100644
--- a/testing/h2console/ui/src/main/java/org/apache/causeway/testing/h2console/ui/webmodule/H2WebServerWrapper.java
+++ b/testing/h2console/ui/src/main/java/org/apache/causeway/testing/h2console/ui/webmodule/H2WebServerWrapper.java
@@ -20,13 +20,14 @@ package org.apache.causeway.testing.h2console.ui.webmodule;
import java.util.function.Consumer;
+import org.h2.server.web.ConnectionInfo;
+import org.h2.server.web.WebServer;
+import org.h2.server.web.WebServlet;
+
import org.apache.causeway.commons.internal._Constants;
import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.commons.internal.reflection._Reflect;
-import org.h2.server.web.ConnectionInfo;
-import org.h2.server.web.WebServer;
-import org.h2.server.web.WebServlet;
import lombok.NonNull;
import lombok.SneakyThrows;
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 0ce7845a28..23d5bd7bf3 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
@@ -24,8 +24,6 @@ import javax.servlet.ServletContext;
import javax.servlet.ServletContextListener;
import javax.servlet.ServletException;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.base._Strings;
import org.h2.server.web.ConnectionInfo;
import org.h2.server.web.WebServlet;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -35,6 +33,8 @@ import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.inject.ServiceInjector;
import org.apache.causeway.applib.value.LocalResourcePath;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.datasources.DataSourceIntrospectionService;
import org.apache.causeway.core.config.datasources.DataSourceIntrospectionService.DataSourceInfo;
@@ -42,6 +42,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/hsqldbmgr/ui/src/main/java/org/apache/causeway/extensions/hsqldbmgr/dom/services/HsqlDbManagerMenu.java b/testing/hsqldbmgr/ui/src/main/java/org/apache/causeway/extensions/hsqldbmgr/dom/services/HsqlDbManagerMenu.java
index 5dc324011d..3034d7d3c5 100644
--- a/testing/hsqldbmgr/ui/src/main/java/org/apache/causeway/extensions/hsqldbmgr/dom/services/HsqlDbManagerMenu.java
+++ b/testing/hsqldbmgr/ui/src/main/java/org/apache/causeway/extensions/hsqldbmgr/dom/services/HsqlDbManagerMenu.java
@@ -21,8 +21,6 @@ package org.apache.causeway.extensions.hsqldbmgr.dom.services;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.context._Context;
import org.hsqldb.util.DatabaseManagerSwing;
import org.apache.causeway.applib.CausewayModuleApplib;
@@ -34,6 +32,8 @@ import org.apache.causeway.applib.annotation.NatureOfService;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.annotation.RestrictTo;
import org.apache.causeway.applib.annotation.SemanticsOf;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.context._Context;
import org.apache.causeway.core.config.datasources.DataSourceIntrospectionService;
import org.apache.causeway.core.config.datasources.DataSourceIntrospectionService.DataSourceInfo;
import org.apache.causeway.extensions.hsqldbmgr.dom.CausewayModuleExtHsqldbMgr;
diff --git a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/UserMementoRefiners.java b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/UserMementoRefiners.java
index c2a348f056..169eb2916a 100644
--- a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/UserMementoRefiners.java
+++ b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/UserMementoRefiners.java
@@ -23,7 +23,6 @@ package org.apache.causeway.testing.integtestsupport.applib;
import org.junit.jupiter.api.extension.BeforeEachCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
-import org.apache.causeway.applib.services.sudo.SudoService;
import org.apache.causeway.applib.services.user.UserMemento;
import org.apache.causeway.core.security.authentication.manager.UserMementoRefiner;
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 5449a19bfe..9c9f01ec11 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
@@ -20,15 +20,15 @@ package org.apache.causeway.testing.integtestsupport.applib;
import java.util.Optional;
-import org.apache.causeway.commons.internal.reflection._Annotations;
-import org.apache.causeway.testing.integtestsupport.applib.annotation.InteractAs;
-import org.apache.causeway.testing.integtestsupport.applib.annotation.InteractAsUtils;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.apache.causeway.applib.services.exceprecog.ExceptionRecognizerService;
import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
+import org.apache.causeway.commons.internal.reflection._Annotations;
+import org.apache.causeway.testing.integtestsupport.applib.annotation.InteractAs;
+import org.apache.causeway.testing.integtestsupport.applib.annotation.InteractAsUtils;
class _Helper {
diff --git a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/annotation/InteractAsUtils.java b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/annotation/InteractAsUtils.java
index 34fedbf7b7..4739570d78 100644
--- a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/annotation/InteractAsUtils.java
+++ b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/annotation/InteractAsUtils.java
@@ -20,12 +20,11 @@ package org.apache.causeway.testing.integtestsupport.applib.annotation;
import java.util.Locale;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.clock.VirtualClock;
import org.apache.causeway.applib.locale.UserLocale;
import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
import org.apache.causeway.applib.services.user.UserMemento;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants.DateTimeFormat;
import lombok.val;
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 79daef7eb0..70b3ef493f 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
@@ -28,7 +28,6 @@ import java.util.stream.Stream;
import javax.inject.Inject;
-import org.apache.causeway.commons.collections.Can;
import org.junit.jupiter.api.Assertions;
import org.opentest4j.AssertionFailedError;
import org.springframework.lang.Nullable;
@@ -36,6 +35,7 @@ import org.springframework.lang.Nullable;
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.exceptions.unrecoverable.DomainModelException;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
+import org.apache.causeway.commons.collections.Can;
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/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 3bfce2191e..d061f0f70a 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
@@ -21,14 +21,12 @@ package org.apache.causeway.testing.specsupport.applib.integration;
import java.lang.reflect.Constructor;
import java.util.Map;
-import org.apache.causeway.commons.internal.collections._Maps;
-
import org.apache.causeway.applib.services.inject.ServiceInjector;
-
-import lombok.RequiredArgsConstructor;
+import org.apache.causeway.commons.internal.collections._Maps;
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/dom/AbstractApplyToAllContractTest.java b/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/dom/AbstractApplyToAllContractTest.java
index da3a58c34f..2ba3b6f98c 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/dom/AbstractApplyToAllContractTest.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/dom/AbstractApplyToAllContractTest.java
@@ -26,9 +26,10 @@ import java.util.Comparator;
import java.util.Set;
import java.util.TreeSet;
+import org.junit.jupiter.api.Test;
+
import org.apache.causeway.commons.internal._Constants;
import org.apache.causeway.testing.unittestsupport.applib.io.IndentPrinter;
-import org.junit.jupiter.api.Test;
/**
* Provides some basic infrastructure to iterate over all entity types and
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/dom/comparable/ComparableContractTester.java b/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/dom/comparable/ComparableContractTester.java
index def9cc0b33..d2f18fb9b9 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/dom/comparable/ComparableContractTester.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/dom/comparable/ComparableContractTester.java
@@ -20,12 +20,13 @@ package org.apache.causeway.testing.unittestsupport.applib.dom.comparable;
import java.util.List;
-import org.apache.causeway.commons.internal.collections._Lists;
import org.hamcrest.Matchers;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.apache.causeway.commons.internal.collections._Lists;
+
/**
* @since 2.0 {@index}
*/
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester.java b/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester.java
index 23ad088782..6f5d2a005d 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester.java
@@ -46,12 +46,12 @@ import java.util.TreeSet;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.regex.Pattern;
-import org.apache.causeway.commons.internal.collections._Lists;
import org.joda.time.DateTime;
import org.opentest4j.AssertionFailedError;
import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.applib.value.Clob;
+import org.apache.causeway.commons.internal.collections._Lists;
import lombok.Getter;
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/dom/sortedsets/SortedSetsContractTestAbstract.java b/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/dom/sortedsets/SortedSetsContractTestAbstract.java
index 6ccd762bf4..330dd192c6 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/dom/sortedsets/SortedSetsContractTestAbstract.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/dom/sortedsets/SortedSetsContractTestAbstract.java
@@ -23,13 +23,14 @@ import java.util.Collection;
import java.util.Set;
import java.util.SortedSet;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import org.apache.causeway.commons.internal.reflection._Reflect;
import org.apache.causeway.testing.unittestsupport.applib.dom.AbstractApplyToAllContractTest;
import static org.apache.causeway.commons.internal.collections._Collections.toHashSet;
import static org.apache.causeway.commons.internal.reflection._Reflect.withTypeAssignableTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
/**
* @since 2.0 {@index}
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/dom/value/ValueTypeContractTestAbstract.java b/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/dom/value/ValueTypeContractTestAbstract.java
index 2fb928e77e..206ebc1b4a 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/dom/value/ValueTypeContractTestAbstract.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/dom/value/ValueTypeContractTestAbstract.java
@@ -23,12 +23,12 @@ import java.util.List;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assume.assumeThat;
/**
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/ImposteriserUsingCodegenPlugin.java b/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/ImposteriserUsingCodegenPlugin.java
index 50c1085916..64d4d771e6 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/ImposteriserUsingCodegenPlugin.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/ImposteriserUsingCodegenPlugin.java
@@ -21,13 +21,14 @@ package org.apache.causeway.testing.unittestsupport.applib.jmocking;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-import org.apache.causeway.commons.internal.proxy._ProxyFactory;
-import org.apache.causeway.core.codegen.bytebuddy.services.ProxyFactoryServiceByteBuddy;
import org.jmock.api.Imposteriser;
import org.jmock.api.Invocation;
import org.jmock.api.Invokable;
import org.jmock.lib.JavaReflectionImposteriser;
+import org.apache.causeway.commons.internal.proxy._ProxyFactory;
+import org.apache.causeway.core.codegen.bytebuddy.services.ProxyFactoryServiceByteBuddy;
+
class ImposteriserUsingCodegenPlugin implements Imposteriser {
public static final Imposteriser INSTANCE = new ImposteriserUsingCodegenPlugin();
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 dc85e26fac..08d3ae87de 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
@@ -28,8 +28,6 @@ import java.util.function.Consumer;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.reflection._Reflect;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.jmock.integration.junit4.JUnit4Mockery;
@@ -43,9 +41,11 @@ import org.picocontainer.PicoBuilder;
import static org.junit.Assert.fail;
-import lombok.RequiredArgsConstructor;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.commons.internal.reflection._Reflect;
import junit.framework.AssertionFailedError;
+import lombok.RequiredArgsConstructor;
/**
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/MyMockomatic.java b/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/MyMockomatic.java
index 08043db4b2..cf5b53c466 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/MyMockomatic.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/MyMockomatic.java
@@ -22,12 +22,13 @@ import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
-import org.apache.causeway.commons.internal.reflection._Reflect;
import org.jmock.Sequence;
import org.jmock.States;
import org.jmock.auto.Auto;
import org.jmock.auto.Mock;
+import org.apache.causeway.commons.internal.reflection._Reflect;
+
class MyMockomatic {
private final JUnitRuleMockery2 context;
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/matchers/StringMatchers.java b/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/matchers/StringMatchers.java
index 0279c488d0..c78def3a17 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/matchers/StringMatchers.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/matchers/StringMatchers.java
@@ -18,9 +18,6 @@
*/
package org.apache.causeway.testing.unittestsupport.applib.matchers;
-import java.io.File;
-import java.io.IOException;
-
import org.hamcrest.CoreMatchers;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/matchers/ThrowableMatchers.java b/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/matchers/ThrowableMatchers.java
index 7893b76885..86d47a882e 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/matchers/ThrowableMatchers.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/matchers/ThrowableMatchers.java
@@ -18,11 +18,12 @@
*/
package org.apache.causeway.testing.unittestsupport.applib.matchers;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
+
/**
* @since 2.0 {@index}
*/
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/comparable/CategorizedDomainObjectComparableContractTest_compareTo.java b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/comparable/CategorizedDomainObjectComparableContractTest_compareTo.java
index 85cdcf4725..b4bfa1c280 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/comparable/CategorizedDomainObjectComparableContractTest_compareTo.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/comparable/CategorizedDomainObjectComparableContractTest_compareTo.java
@@ -20,8 +20,6 @@ package org.apache.causeway.testing.unittestsupport.applib.dom.comparable;
import java.util.List;
-import org.apache.causeway.testing.unittestsupport.applib.dom.comparable.ComparableContractTest_compareTo;
-
public class CategorizedDomainObjectComparableContractTest_compareTo extends ComparableContractTest_compareTo<CategorizedDomainObject> {
@Override
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_broken_Test.java b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_broken_Test.java
index 17beb51cee..3698e549dc 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_broken_Test.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_broken_Test.java
@@ -18,7 +18,6 @@
*/
package org.apache.causeway.testing.unittestsupport.applib.dom.pojo;
-import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.PojoTester;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.opentest4j.AssertionFailedError;
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_applib_Test.java b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_applib_Test.java
index 64c0b45ed1..a23bae3638 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_applib_Test.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_applib_Test.java
@@ -18,13 +18,13 @@
*/
package org.apache.causeway.testing.unittestsupport.applib.dom.pojo;
-import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.PojoTester;
-import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.holders.ApplibBlobHolder;
-import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.holders.ApplibClobHolder;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.opentest4j.AssertionFailedError;
+import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.holders.ApplibBlobHolder;
+import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.holders.ApplibClobHolder;
+
import lombok.val;
public class PojoTester_datatypes_applib_Test {
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_bean_Test.java b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_bean_Test.java
index c7075f5d76..0eaa228dec 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_bean_Test.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_bean_Test.java
@@ -18,13 +18,13 @@
*/
package org.apache.causeway.testing.unittestsupport.applib.dom.pojo;
-import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.PojoTester;
-import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.holders.ExampleBean;
-import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.holders.ExampleBeanHolder;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.opentest4j.AssertionFailedError;
+import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.holders.ExampleBean;
+import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.holders.ExampleBeanHolder;
+
import lombok.val;
public class PojoTester_datatypes_bean_Test {
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_enum_Test.java b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_enum_Test.java
index 053ae33aa6..a473a11ccc 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_enum_Test.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_enum_Test.java
@@ -18,14 +18,13 @@
*/
package org.apache.causeway.testing.unittestsupport.applib.dom.pojo;
-import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.PojoTester;
-import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.holders.ColourEnumHolder;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
+import org.opentest4j.AssertionFailedError;
-import lombok.val;
+import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.holders.ColourEnumHolder;
-import org.opentest4j.AssertionFailedError;
+import lombok.val;
public class PojoTester_datatypes_enum_Test {
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_java_time_Test.java b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_java_time_Test.java
index c394dd7d15..456658a5f6 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_java_time_Test.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_java_time_Test.java
@@ -18,14 +18,14 @@
*/
package org.apache.causeway.testing.unittestsupport.applib.dom.pojo;
-import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.PojoTester;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.opentest4j.AssertionFailedError;
+
import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.holders.JavaLocalDateHolder;
import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.holders.JavaLocalDateTimeHolder;
import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.holders.JavaLocalTimeHolder;
import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.holders.JavaOffsetDateTimeHolder;
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.opentest4j.AssertionFailedError;
import lombok.val;
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_joda_Test.java b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_joda_Test.java
index 11bbb1af89..6b2da58c33 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_joda_Test.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_joda_Test.java
@@ -18,17 +18,16 @@
*/
package org.apache.causeway.testing.unittestsupport.applib.dom.pojo;
-import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.PojoTester;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.opentest4j.AssertionFailedError;
+
import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.holders.JodaLocalDateHolder;
import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.holders.JodaLocalDateTimeHolder;
import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.holders.JodaLocalTimeHolder;
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.Test;
import lombok.val;
-import org.opentest4j.AssertionFailedError;
-
public class PojoTester_datatypes_joda_Test {
@Test
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_no_data_factory_Test.java b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_no_data_factory_Test.java
index 760fc6607f..e2a11071b8 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_no_data_factory_Test.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_no_data_factory_Test.java
@@ -18,8 +18,6 @@
*/
package org.apache.causeway.testing.unittestsupport.applib.dom.pojo;
-import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.PojoTester;
-import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.holders.JodaLocalDateHolder;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.opentest4j.AssertionFailedError;
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_primitive_Test.java b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_primitive_Test.java
index aca7601180..44e6ed60e3 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_primitive_Test.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_primitive_Test.java
@@ -18,7 +18,10 @@
*/
package org.apache.causeway.testing.unittestsupport.applib.dom.pojo;
-import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.PojoTester;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.opentest4j.AssertionFailedError;
+
import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.holders.BooleanHolder;
import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.holders.ByteHolder;
import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.holders.DoubleHolder;
@@ -26,13 +29,9 @@ import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.holders.Float
import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.holders.IntHolder;
import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.holders.LongHolder;
import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.holders.ShortHolder;
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.Test;
import lombok.val;
-import org.opentest4j.AssertionFailedError;
-
public class PojoTester_datatypes_primitive_Test {
@Test
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_string_Test.java b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_string_Test.java
index 99406de19f..43d82f28bd 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_string_Test.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_string_Test.java
@@ -18,14 +18,13 @@
*/
package org.apache.causeway.testing.unittestsupport.applib.dom.pojo;
-import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.PojoTester;
-import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.holders.StringHolder;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
+import org.opentest4j.AssertionFailedError;
-import lombok.val;
+import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.holders.StringHolder;
-import org.opentest4j.AssertionFailedError;
+import lombok.val;
public class PojoTester_datatypes_string_Test {
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_wrapper_Test.java b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_wrapper_Test.java
index 75cb91ddde..5d909aea82 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_wrapper_Test.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/pojo/PojoTester_datatypes_wrapper_Test.java
@@ -18,7 +18,10 @@
*/
package org.apache.causeway.testing.unittestsupport.applib.dom.pojo;
-import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.PojoTester;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.opentest4j.AssertionFailedError;
+
import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.holders.BooleanWrapperHolder;
import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.holders.ByteWrapperHolder;
import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.holders.DoubleWrapperHolder;
@@ -26,13 +29,9 @@ import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.holders.Float
import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.holders.IntWrapperHolder;
import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.holders.LongWrapperHolder;
import org.apache.causeway.testing.unittestsupport.applib.dom.pojo.holders.ShortWrapperHolder;
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.Test;
import lombok.val;
-import org.opentest4j.AssertionFailedError;
-
public class PojoTester_datatypes_wrapper_Test {
@Test
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/sortedsets/SortedSetsContractTestAll.java b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/sortedsets/SortedSetsContractTestAll.java
index 085f622018..c7c6c15116 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/sortedsets/SortedSetsContractTestAll.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/sortedsets/SortedSetsContractTestAll.java
@@ -18,8 +18,6 @@
*/
package org.apache.causeway.testing.unittestsupport.applib.dom.sortedsets;
-import org.apache.causeway.testing.unittestsupport.applib.dom.sortedsets.SortedSetsContractTestAbstract;
-
public class SortedSetsContractTestAll extends SortedSetsContractTestAbstract {
public SortedSetsContractTestAll() {
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/value/ValueTypeContractTestAbstract_BigIntegerTest.java b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/value/ValueTypeContractTestAbstract_BigIntegerTest.java
index d7b72b7b6e..9f6925c429 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/value/ValueTypeContractTestAbstract_BigIntegerTest.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/value/ValueTypeContractTestAbstract_BigIntegerTest.java
@@ -22,8 +22,6 @@ import java.math.BigInteger;
import java.util.Arrays;
import java.util.List;
-import org.apache.causeway.testing.unittestsupport.applib.dom.value.ValueTypeContractTestAbstract;
-
public class ValueTypeContractTestAbstract_BigIntegerTest extends ValueTypeContractTestAbstract<BigInteger> {
@Override
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/value/ValueTypeContractTestAbstract_ColorTest.java b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/value/ValueTypeContractTestAbstract_ColorTest.java
index ecb2801d10..a11e645ad5 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/value/ValueTypeContractTestAbstract_ColorTest.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/value/ValueTypeContractTestAbstract_ColorTest.java
@@ -22,8 +22,6 @@ import java.awt.Color;
import java.util.Arrays;
import java.util.List;
-import org.apache.causeway.testing.unittestsupport.applib.dom.value.ValueTypeContractTestAbstract;
-
public class ValueTypeContractTestAbstract_ColorTest extends ValueTypeContractTestAbstract<Color> {
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/value/ValueTypeContractTestAbstract_StringTest.java b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/value/ValueTypeContractTestAbstract_StringTest.java
index 93f74976df..a20e73928e 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/value/ValueTypeContractTestAbstract_StringTest.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/dom/value/ValueTypeContractTestAbstract_StringTest.java
@@ -21,8 +21,6 @@ package org.apache.causeway.testing.unittestsupport.applib.dom.value;
import java.util.Arrays;
import java.util.List;
-import org.apache.causeway.testing.unittestsupport.applib.dom.value.ValueTypeContractTestAbstract;
-
public class ValueTypeContractTestAbstract_StringTest extends ValueTypeContractTestAbstract<String> {
@Override
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/CausewayActionsTest_returnNewTransientInstance.java b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/CausewayActionsTest_returnNewTransientInstance.java
index 5b6af22277..8d51309069 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/CausewayActionsTest_returnNewTransientInstance.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/CausewayActionsTest_returnNewTransientInstance.java
@@ -18,8 +18,6 @@
*/
package org.apache.causeway.testing.unittestsupport.applib.jmocking;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.CausewayActions;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/ImposteriserTestUsingCodegenPlugin_Test.java b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/ImposteriserTestUsingCodegenPlugin_Test.java
index 6ad1567c2f..4b51387701 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/ImposteriserTestUsingCodegenPlugin_Test.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/ImposteriserTestUsingCodegenPlugin_Test.java
@@ -23,9 +23,6 @@ import java.net.URL;
import java.net.URLClassLoader;
import java.util.Date;
-import org.apache.causeway.commons.internal.context._Context;
-import org.apache.causeway.commons.internal.reflection._Reflect;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.Imposterisers;
import org.jmock.Expectations;
import org.jmock.api.Imposteriser;
import org.jmock.api.Invocation;
@@ -43,6 +40,9 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
+import org.apache.causeway.commons.internal.context._Context;
+import org.apache.causeway.commons.internal.reflection._Reflect;
+
import lombok.val;
class ImposteriserTestUsingCodegenPlugin_Test {
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JMockActionsTest_returnArgument.java b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JMockActionsTest_returnArgument.java
index 2049ba16a2..6acb2562f6 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JMockActionsTest_returnArgument.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JMockActionsTest_returnArgument.java
@@ -18,16 +18,15 @@
*/
package org.apache.causeway.testing.unittestsupport.applib.jmocking;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JMockActions;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
-import static org.hamcrest.Matchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
public class JMockActionsTest_returnArgument {
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JMockActionsTest_returnEach.java b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JMockActionsTest_returnEach.java
index 021875da95..f932ceed9e 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JMockActionsTest_returnEach.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JMockActionsTest_returnEach.java
@@ -18,16 +18,15 @@
*/
package org.apache.causeway.testing.unittestsupport.applib.jmocking;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JMockActions;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
-import static org.hamcrest.Matchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
public class JMockActionsTest_returnEach {
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test.java b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test.java
index ff83c4dde2..c9d66e3c09 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test.java
@@ -18,13 +18,13 @@
*/
package org.apache.causeway.testing.unittestsupport.applib.jmocking;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
+import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
+
public class JUnitRuleMockery2Test {
@Rule
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java
index dc86710b50..7ef64dd9dc 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java
@@ -18,17 +18,17 @@
*/
package org.apache.causeway.testing.unittestsupport.applib.jmocking;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
+
+import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
public class JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase {
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java
index 50941e6779..ac6e4a1506 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java
@@ -18,12 +18,12 @@
*/
package org.apache.causeway.testing.unittestsupport.applib.jmocking;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
+import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
+
public class JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest {
@Rule
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java
index 52069dc92e..11394391c2 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java
@@ -18,14 +18,14 @@
*/
package org.apache.causeway.testing.unittestsupport.applib.jmocking;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
import org.jmock.auto.Mock;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
+import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
+
public class JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest {
@Rule
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java
index b8142978d5..7aeed65e9e 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java
@@ -18,17 +18,17 @@
*/
package org.apache.causeway.testing.unittestsupport.applib.jmocking;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
+
+import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
public class JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase {
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java
index 575d7b5dea..9f51114277 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java
@@ -18,14 +18,14 @@
*/
package org.apache.causeway.testing.unittestsupport.applib.jmocking;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Allowing;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
+import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Allowing;
+import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
+
public class JUnitRuleMockery2Test_mockAnnotatedWithAllowing {
@Rule
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java
index 31cdba918d..1637f82503 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java
@@ -18,14 +18,14 @@
*/
package org.apache.causeway.testing.unittestsupport.applib.jmocking;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Ignoring;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
+import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Ignoring;
+import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
+
public class JUnitRuleMockery2Test_mockAnnotatedWithIgnoring {
@Rule
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java
index 5d241d97c0..eea0b30936 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java
@@ -18,14 +18,14 @@
*/
package org.apache.causeway.testing.unittestsupport.applib.jmocking;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Never;
import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
+import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Never;
+
public class JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase {
@Rule
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java
index 70d427cb23..9593638dfc 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java
@@ -18,15 +18,15 @@
*/
package org.apache.causeway.testing.unittestsupport.applib.jmocking;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Never;
import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
+import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Never;
+
public class JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase {
@Rule
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java
index de1ed570f0..7b630278f8 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java
@@ -18,14 +18,14 @@
*/
package org.apache.causeway.testing.unittestsupport.applib.jmocking;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.One;
import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
+import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.One;
+
public class JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase {
@Rule
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java
index 8760459c20..b60c5cd8a9 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java
@@ -18,15 +18,15 @@
*/
package org.apache.causeway.testing.unittestsupport.applib.jmocking;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.One;
import org.jmock.auto.Mock;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
+import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.One;
+
public class JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase {
@Rule
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/util/Files_deleteFileUtils_Test.java b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/util/Files_deleteFileUtils_Test.java
index adfe35aeda..36f1b08066 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/util/Files_deleteFileUtils_Test.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/causeway/testing/unittestsupport/applib/util/Files_deleteFileUtils_Test.java
@@ -21,8 +21,6 @@ package org.apache.causeway.testing.unittestsupport.applib.util;
import java.io.File;
import java.io.IOException;
-import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2;
-import org.apache.causeway.testing.unittestsupport.applib.util.FileUtils;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
@@ -31,6 +29,8 @@ import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
+import org.apache.causeway.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2;
+
public class Files_deleteFileUtils_Test {