You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2024/02/25 10:08:53 UTC
(causeway) branch spring6 updated: CAUSEWAY-2297: batch org. imports (core packages)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch spring6
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/spring6 by this push:
new c15d1310c6 CAUSEWAY-2297: batch org. imports (core packages)
c15d1310c6 is described below
commit c15d1310c6bfc231c35f4198521b66754b62b92b
Author: andi-huber <ah...@apache.org>
AuthorDate: Sun Feb 25 11:08:45 2024 +0100
CAUSEWAY-2297: batch org. imports (core packages)
---
.../CausewayModuleApplibChangeAndExecutionLoggers.java | 7 ++++++-
.../apache/causeway/applib/annotation/ActionLayout.java | 4 ++--
.../causeway/applib/annotation/DomainService.java | 6 +++---
.../org/apache/causeway/applib/annotation/Nature.java | 2 ++
.../apache/causeway/applib/annotation/SemanticsOf.java | 4 ++--
.../causeway/applib/annotation/ValueSemantics.java | 2 ++
.../org/apache/causeway/applib/annotation/Where.java | 4 ++--
.../apache/causeway/applib/domain/DomainObjectList.java | 13 +++++++------
.../org/apache/causeway/applib/graph/SimpleEdge.java | 4 ++--
.../org/apache/causeway/applib/graph/tree/TreeNode.java | 3 ++-
.../java/org/apache/causeway/applib/id/LogicalType.java | 5 +++--
.../causeway/applib/jaxb/JavaSqlJaxbAdapters.java | 1 +
.../causeway/applib/jaxb/JavaTimeJaxbAdapters.java | 1 +
.../causeway/applib/jaxb/JavaUtilJaxbAdapters.java | 1 +
.../causeway/applib/jaxb/PersistentEntitiesAdapter.java | 5 +++--
.../causeway/applib/jaxb/PersistentEntityAdapter.java | 5 +++--
.../causeway/applib/jaxb/PrimitiveJaxbAdapters.java | 4 ++--
.../applib/layout/component/DomainObjectLayoutData.java | 8 ++++----
.../causeway/applib/layout/component/FieldSet.java | 6 +++---
.../applib/layout/component/HasBookmarking.java | 4 ++--
.../causeway/applib/layout/component/HasHidden.java | 4 ++--
.../applib/layout/component/PropertyLayoutData.java | 12 ++++++------
.../layout/component/ServiceActionLayoutData.java | 7 ++++---
.../causeway/applib/layout/grid/GridAbstract.java | 4 ++--
.../causeway/applib/layout/grid/bootstrap/BSCol.java | 12 ++++++------
.../causeway/applib/layout/grid/bootstrap/BSGrid.java | 12 ++++++------
.../causeway/applib/layout/grid/bootstrap/BSRow.java | 4 ++--
.../applib/layout/grid/bootstrap/BSRowContent.java | 4 ++--
.../causeway/applib/layout/grid/bootstrap/BSTab.java | 10 +++++-----
.../applib/layout/grid/bootstrap/BSTabGroup.java | 4 ++--
.../applib/layout/menubars/MenuBarsAbstract.java | 3 ++-
.../applib/layout/menubars/bootstrap/BSMenu.java | 7 ++++---
.../applib/layout/menubars/bootstrap/BSMenuBar.java | 6 +++---
.../applib/layout/menubars/bootstrap/BSMenuBars.java | 8 ++++----
.../applib/layout/menubars/bootstrap/BSMenuSection.java | 6 +++---
.../causeway/applib/mixins/dto/Dto_downloadXml.java | 3 ++-
.../causeway/applib/mixins/dto/Dto_downloadXsd.java | 3 ++-
.../applib/mixins/layout/Object_downloadLayout.java | 3 ++-
.../mixins/metamodel/Object_downloadMetamodelXml.java | 3 ++-
.../mixins/metamodel/Object_rebuildMetamodel.java | 3 ++-
.../causeway/applib/mixins/rest/Object_openRestApi.java | 3 ++-
.../mixins/system/HasTarget_openTargetObject.java | 3 ++-
.../applib/services/appfeat/ApplicationFeature.java | 4 ++--
.../applib/services/appfeat/ApplicationFeatureSort.java | 4 ++--
.../services/appfeatui/ApplicationFeatureMenu.java | 6 +++---
.../services/appfeatui/ApplicationFeatureViewModel.java | 5 +++--
.../applib/services/appfeatui/ApplicationNamespace.java | 6 +++---
.../applib/services/appfeatui/ApplicationType.java | 6 +++---
.../services/appfeatui/ApplicationTypeAction.java | 6 +++---
.../services/appfeatui/ApplicationTypeCollection.java | 6 +++---
.../services/appfeatui/ApplicationTypeMember.java | 3 ++-
.../services/appfeatui/ApplicationTypeProperty.java | 5 +++--
.../causeway/applib/services/bookmark/Bookmark.java | 1 -
.../applib/services/bookmark/BookmarkHolder_lookup.java | 3 ++-
.../applib/services/bookmark/BookmarkHolder_object.java | 3 ++-
.../applib/services/bookmark/BookmarkService.java | 4 ++--
.../causeway/applib/services/clock/ClockService.java | 7 ++++---
.../applib/services/command/CommandExecutorService.java | 1 +
.../conmap/ContentMappingServiceForCommandDto.java | 9 +++++----
.../conmap/ContentMappingServiceForCommandsDto.java | 10 +++++-----
.../spi/CommandDtoProcessorServiceIdentity.java | 4 ++--
.../applib/services/confview/ConfigurationMenu.java | 5 +++--
.../applib/services/confview/ConfigurationProperty.java | 13 +++++++------
.../services/confview/ConfigurationViewmodel.java | 4 ++--
.../applib/services/conmap/ContentMappingService.java | 4 ++--
.../exceprecog/ExceptionRecognizerAbstract.java | 3 ++-
.../causeway/applib/services/iactn/Execution.java | 4 ++--
.../services/jaxb/CatalogingSchemaOutputResolver.java | 4 ++--
.../causeway/applib/services/jaxb/CausewaySchemas.java | 4 ++--
.../applib/services/layout/LayoutServiceMenu.java | 3 +--
.../applib/services/publishing/log/CommandLogger.java | 5 +++--
.../services/publishing/log/EntityChangesLogger.java | 5 +++--
.../publishing/log/EntityPropertyChangeLogger.java | 5 +++--
.../applib/services/publishing/log/ExecutionLogger.java | 5 +++--
.../services/queryresultscache/QueryResultsCache.java | 5 +++--
.../services/registry/InstanceByPriorityComparator.java | 3 ++-
.../causeway/applib/services/session/SessionLogger.java | 5 +++--
.../applib/services/sitemap/SitemapServiceMenu.java | 4 ++--
.../causeway/applib/services/sudo/SudoService.java | 7 ++++---
.../apache/causeway/applib/services/swagger/Format.java | 4 ++--
.../causeway/applib/services/swagger/Visibility.java | 4 ++--
.../causeway/applib/services/user/ImpersonateMenu.java | 5 +++--
.../applib/services/user/ImpersonateStopMenu.java | 5 +++--
.../causeway/applib/services/user/UserService.java | 9 +++++----
.../causeway/applib/services/userui/UserMenu.java | 5 +++--
.../java/org/apache/causeway/applib/value/Markup.java | 7 ++++---
.../apache/causeway/applib/value/NamedWithMimeType.java | 5 +++--
.../java/org/apache/causeway/applib/value/Password.java | 8 ++++----
.../applib/services/user/UserMemento_contains_Test.java | 5 +++--
.../services/wrapper/control/AsyncControl_Test.java | 1 +
.../commons/internal/base/_Bytes_ZLibCompressor.java | 1 +
.../commons/internal/codec/_DocumentFactories.java | 3 ++-
.../causeway/commons/internal/hardening/_Hardening.java | 1 +
.../java/org/apache/causeway/commons/io/YamlUtils.java | 3 ++-
.../commons/internal/reflection/AnnotationsTest.java | 3 ++-
.../internal/reflection/GenericReflectionMagicTest.java | 5 +++--
.../commons/internal/reflection/ReflectTest.java | 3 ++-
.../causeway/core/config/CausewayConfiguration.java | 1 -
.../causeway/core/config/DatanucleusConfiguration.java | 5 +++--
.../datasources/DataSourceIntrospectionService.java | 3 ++-
.../PatternOptionalStringConstraintValidator.java | 7 ++++---
.../core/metamodel/CausewayModuleCoreMetamodel.java | 6 ++----
.../core/metamodel/facets/DomainEventHelper.java | 2 +-
.../annotation/HomePageFacetAnnotationFactory.java | 1 +
.../actions/layout/HiddenFacetForActionLayoutXml.java | 1 +
.../actions/position/ActionPositionFacetFallback.java | 1 +
.../all/named/MemberNamedFacetForStaticMemberName.java | 1 +
.../CollectionAccessorFacetViaAccessorFactory.java | 1 +
.../layout/CssClassFacetForCollectionLayoutXml.java | 1 +
.../layout/HiddenFacetForCollectionLayoutXml.java | 1 +
.../layout/PagedFacetForCollectionLayoutAnnotation.java | 5 +++--
.../layout/PagedFacetForCollectionLayoutXml.java | 1 +
...ableDecoratorFacetForCollectionLayoutAnnotation.java | 4 ++--
.../parented/ParentedFacetSinceCollectionFactory.java | 1 +
.../disabled/method/DisableForContextFacetNone.java | 1 +
.../members/hidden/method/HideForContextFacetNone.java | 1 +
.../method/HideForContextFacetViaMethodFactory.java | 1 +
.../layout/group/LayoutGroupFacetForLayoutXml.java | 1 +
.../CommandPublishingFacetForActionFallback.java | 1 +
.../choices/enums/ChoicesFacetFromEnumFactory.java | 1 +
...omainEventDefaultFacetForDomainObjectAnnotation.java | 1 +
.../editing/ImmutableFacetFromConfiguration.java | 1 +
.../BookmarkPolicyFacetForDomainObjectLayoutXml.java | 1 +
.../PagedFacetForDomainObjectLayoutAnnotation.java | 5 +++--
...leDecoratorFacetForDomainObjectLayoutAnnotation.java | 4 ++--
.../facets/object/entity/_EntityFacetForTesting.java | 1 +
.../ignore/javalang/RemoveMethodsFacetFactory.java | 1 +
.../impl/ObjectValidPropertiesFacetImplFactory.java | 1 +
.../ViewModelFacetForSerializableInterface.java | 1 +
.../DateRenderAdjustFacetAbstract.java | 1 +
.../objectvalue/digits/MaxFractionalDigitsFacet.java | 4 ++--
.../objectvalue/labelat/LabelAtFacetAbstract.java | 1 +
.../objectvalue/mandatory/MandatoryFacetAbstract.java | 1 +
.../choices/ActionParameterChoicesFacetFromAction.java | 1 +
.../parameter/ParameterAnnotationFacetFactory.java | 1 +
.../ActionParameterSupportFacetFactoryAbstract.java | 1 +
.../method/PropertyChoicesFacetViaMethodFactory.java | 1 +
.../dflt/MandatoryFacetOnProperyDefaultFactory.java | 1 +
.../mandatory/MandatoryFacetForPropertyAnnotation.java | 1 +
.../propertylayout/HiddenFacetForPropertyLayoutXml.java | 1 +
.../MemberDescribedFacetForPropertyLayoutXml.java | 1 +
.../RenderedAdjustedFacetForPropertyLayoutXml.java | 1 +
.../fromtype/TypicalLengthFacetOnPropertyFromType.java | 1 +
.../method/PropertyValidateFacetViaMethodFactory.java | 1 +
...lDigitsFacetFromJavaxValidationDigitsAnnotation.java | 4 ++--
...lDigitsFacetFromJavaxValidationDigitsAnnotation.java | 4 ++--
.../object/_ManagedObjectEntityBookmarked.java | 1 +
.../metamodel/object/_ManagedObjectEntityHybrid.java | 1 +
.../metamodel/object/_ManagedObjectEntityTransient.java | 1 +
.../core/metamodel/object/_ManagedObjectMixin.java | 1 +
.../objectmanager/memento/_RecreatableLookup.java | 1 +
.../columnorder/ColumnOrderTxtFileServiceDefault.java | 10 +++++-----
.../services/grid/GridSystemServiceAbstract.java | 4 ++--
.../services/metamodel/MetaModelServiceDefault.java | 2 +-
.../tablecol/TableColumnOrderServiceUsingTxtFile.java | 3 +--
.../core/metamodel/specloader/SpecificationLoader.java | 2 +-
.../specloader/SpecificationLoaderDefault.java | 2 +-
.../specloader/specimpl/FacetedMethodsBuilder.java | 2 +-
.../specimpl/ObjectSpecificationAbstract.java | 7 +++----
.../specimpl/dflt/ObjectSpecificationDefault.java | 2 +-
.../specimpl/dflt/_AssociationsAsColumns.java | 6 +++---
.../valuesemantics/BigDecimalValueSemantics.java | 3 +--
.../core/metamodel/MetaModelContext_configTest.java | 3 ++-
.../DomainObjectAnnotationFacetFactoryTest.java | 17 ++++++++---------
.../NavigableParentAnnotationFacetFactoryTest.java | 3 ++-
.../recreatable/RecreatableObjectFacetFactoryTest.java | 3 ++-
.../parameter/ParameterAnnotationFacetFactoryTest.java | 3 ++-
...OrNullableAnnotationOnParameterFacetFactoryTest.java | 3 ++-
...yOrNullableAnnotationOnPropertyFacetFactoryTest.java | 3 ++-
.../facets/value/BlobValueSemanticsProviderTest.java | 2 +-
.../facets/value/ClobValueSemanticsProviderTest.java | 2 +-
.../ServiceInjectorDefaultTest_usingFields.java | 7 ++++---
...rviceInjectorDefaultTest_validateServices_happy.java | 5 +++--
.../metamodel/services/ServiceInjectorLegacyTest.java | 1 +
.../core/metamodel/spec/TypeOfAnyCardinalityTest.java | 3 ++-
.../specimpl/IntrospectionState_comparable_Test.java | 4 ++--
.../bookmarks/BookmarkServiceDefault.java | 8 +++-----
.../menubars/bootstrap/MenuBarsServiceBootstrap.java | 2 +-
.../runtimeservices/message/MessageServiceDefault.java | 3 +--
.../transaction/TransactionServiceSpring.java | 3 +--
.../userreg/EmailNotificationServiceDefault.java | 10 +++++-----
.../core/runtimeservices/xml/XmlServiceDefault.java | 12 +++++++-----
.../xmlsnapshot/XmlSnapshotServiceDefault.java | 3 ++-
.../runtimeservices/RuntimeServicesTestAbstract.java | 1 +
.../menubars/bootstrap/MenuBarsServiceBSTest.java | 3 ++-
.../ExceptionRecognizerForDataAccessExceptionTest.java | 9 +++++----
.../standard/RandomCodeGeneratorDefault.java | 2 +-
.../authorization/manager/AuthorizationManager.java | 2 +-
.../core/transaction/CausewayModuleCoreTransaction.java | 5 ++---
.../changetracking/events/TimestampService.java | 2 +-
.../scope/NoopTransactionSynchronizationService.java | 4 ++--
.../confmenu/ConfigurationViewServiceDefault.java | 1 +
.../keyvaluestore/KeyValueStoreUsingHttpSession.java | 5 +++--
193 files changed, 427 insertions(+), 316 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/CausewayModuleApplibChangeAndExecutionLoggers.java b/api/applib/src/main/java/org/apache/causeway/applib/CausewayModuleApplibChangeAndExecutionLoggers.java
index e7635251bb..28f5bac7c5 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/CausewayModuleApplibChangeAndExecutionLoggers.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/CausewayModuleApplibChangeAndExecutionLoggers.java
@@ -18,10 +18,15 @@
*/
package org.apache.causeway.applib;
-import org.apache.causeway.applib.services.publishing.log.*;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.applib.services.publishing.log.CommandLogger;
+import org.apache.causeway.applib.services.publishing.log.EntityChangesLogger;
+import org.apache.causeway.applib.services.publishing.log.EntityPropertyChangeLogger;
+import org.apache.causeway.applib.services.publishing.log.ExecutionLogger;
+import org.apache.causeway.applib.services.publishing.log.PageRenderLogger;
+
/**
* Registers logging subscribers for the command/execution/change publishing subsystem.
*
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/annotation/ActionLayout.java b/api/applib/src/main/java/org/apache/causeway/applib/annotation/ActionLayout.java
index a5cc747217..2b7d33ea54 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/ActionLayout.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/annotation/ActionLayout.java
@@ -24,10 +24,10 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import org.apache.causeway.applib.layout.component.CssClassFaPosition;
-
import jakarta.xml.bind.annotation.XmlType;
+import org.apache.causeway.applib.layout.component.CssClassFaPosition;
+
/**
* Layout hints for actions.
*
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/annotation/DomainService.java b/api/applib/src/main/java/org/apache/causeway/applib/annotation/DomainService.java
index 9c5d6afd2c..2caa7da995 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/DomainService.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/annotation/DomainService.java
@@ -24,13 +24,13 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
+
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.services.bookmark.Bookmark;
-import jakarta.inject.Named;
-import jakarta.inject.Singleton;
-
/**
* Indicates that the class should be automatically recognized as a domain service.
*
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Nature.java b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Nature.java
index dd19c977ae..a6f6008ab5 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Nature.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Nature.java
@@ -18,6 +18,8 @@
*/
package org.apache.causeway.applib.annotation;
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import org.springframework.cglib.proxy.Mixin;
import org.apache.causeway.applib.ViewModel;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/annotation/SemanticsOf.java b/api/applib/src/main/java/org/apache/causeway/applib/annotation/SemanticsOf.java
index 1cdc7827c8..c9c7cff90c 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/SemanticsOf.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/annotation/SemanticsOf.java
@@ -18,11 +18,11 @@
*/
package org.apache.causeway.applib.annotation;
+import jakarta.inject.Named;
+
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.util.Enums;
-import jakarta.inject.Named;
-
/**
* @since 1.x {@index}
* @see <a href="https://causeway.apache.org/guides/rgant/rgant.html#_rgant-Action_semantics">Reference Guide</a>
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/annotation/ValueSemantics.java b/api/applib/src/main/java/org/apache/causeway/applib/annotation/ValueSemantics.java
index 677217a307..0acd141ecf 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/ValueSemantics.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/annotation/ValueSemantics.java
@@ -27,6 +27,8 @@ import java.math.BigDecimal;
import java.time.format.FormatStyle;
import java.util.Locale;
+import jakarta.persistence.Column;
+
import org.apache.causeway.applib.value.semantics.ValueSemanticsProvider;
/**
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Where.java b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Where.java
index 26e2200ecc..84443799ad 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Where.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Where.java
@@ -18,10 +18,10 @@
*/
package org.apache.causeway.applib.annotation;
-import org.apache.causeway.applib.util.Enums;
-
import jakarta.xml.bind.annotation.XmlType;
+import org.apache.causeway.applib.util.Enums;
+
/**
* Represents the location in the user interface where a class member is to be rendered.
*
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/domain/DomainObjectList.java b/api/applib/src/main/java/org/apache/causeway/applib/domain/DomainObjectList.java
index d41b92051b..e3c7f48637 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/domain/DomainObjectList.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/domain/DomainObjectList.java
@@ -21,6 +21,13 @@ package org.apache.causeway.applib.domain;
import java.util.ArrayList;
import java.util.List;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.Collection;
import org.apache.causeway.applib.annotation.DomainObject;
@@ -32,12 +39,6 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.jaxb.PersistentEntitiesAdapter;
-import jakarta.inject.Named;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
-import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import lombok.Getter;
/**
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/graph/SimpleEdge.java b/api/applib/src/main/java/org/apache/causeway/applib/graph/SimpleEdge.java
index dce42053bc..2fcd3a92eb 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/graph/SimpleEdge.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/graph/SimpleEdge.java
@@ -18,11 +18,11 @@
*/
package org.apache.causeway.applib.graph;
+import jakarta.inject.Named;
+
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.Value;
-import jakarta.inject.Named;
-
/**
* Fundamental building block for graph structures.
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/graph/tree/TreeNode.java b/api/applib/src/main/java/org/apache/causeway/applib/graph/tree/TreeNode.java
index 421e700e7e..b792b1cefc 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/graph/tree/TreeNode.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/graph/tree/TreeNode.java
@@ -27,6 +27,8 @@ import java.util.concurrent.atomic.LongAdder;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
+import jakarta.inject.Named;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.CausewayModuleApplib;
@@ -39,7 +41,6 @@ import org.apache.causeway.commons.internal.base._Lazy;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
-import jakarta.inject.Named;
import lombok.SneakyThrows;
/**
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/id/LogicalType.java b/api/applib/src/main/java/org/apache/causeway/applib/id/LogicalType.java
index ee7c4ffa49..0d006d1d60 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/id/LogicalType.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/id/LogicalType.java
@@ -26,14 +26,15 @@ import java.util.Objects;
import java.util.Optional;
import java.util.function.Supplier;
+import jakarta.inject.Named;
+import jakarta.persistence.Table;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.commons.internal.reflection._Annotations;
-import jakarta.persistence.Table;
-import jakarta.inject.Named;
import lombok.Getter;
import lombok.NonNull;
import lombok.Synchronized;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/jaxb/JavaSqlJaxbAdapters.java b/api/applib/src/main/java/org/apache/causeway/applib/jaxb/JavaSqlJaxbAdapters.java
index a13628cbb6..4e97634ce2 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/jaxb/JavaSqlJaxbAdapters.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/jaxb/JavaSqlJaxbAdapters.java
@@ -24,6 +24,7 @@ import java.sql.Timestamp;
import javax.xml.datatype.XMLGregorianCalendar;
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+
import lombok.experimental.UtilityClass;
/**
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/jaxb/JavaTimeJaxbAdapters.java b/api/applib/src/main/java/org/apache/causeway/applib/jaxb/JavaTimeJaxbAdapters.java
index 340a8edca7..d654f4a050 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/jaxb/JavaTimeJaxbAdapters.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/jaxb/JavaTimeJaxbAdapters.java
@@ -28,6 +28,7 @@ import java.time.Period;
import java.time.ZonedDateTime;
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+
import lombok.experimental.UtilityClass;
/**
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/jaxb/JavaUtilJaxbAdapters.java b/api/applib/src/main/java/org/apache/causeway/applib/jaxb/JavaUtilJaxbAdapters.java
index a8528f1536..a94ac8eedf 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/jaxb/JavaUtilJaxbAdapters.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/jaxb/JavaUtilJaxbAdapters.java
@@ -21,6 +21,7 @@ package org.apache.causeway.applib.jaxb;
import java.util.Date;
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+
import lombok.experimental.UtilityClass;
/**
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/jaxb/PersistentEntitiesAdapter.java b/api/applib/src/main/java/org/apache/causeway/applib/jaxb/PersistentEntitiesAdapter.java
index e8d2879711..a60f3a705f 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/jaxb/PersistentEntitiesAdapter.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/jaxb/PersistentEntitiesAdapter.java
@@ -21,12 +21,13 @@ package org.apache.causeway.applib.jaxb;
import java.util.ArrayList;
import java.util.List;
+import jakarta.inject.Inject;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.bookmark.BookmarkService;
import org.apache.causeway.schema.common.v2.OidsDto;
-import jakarta.inject.Inject;
-import jakarta.xml.bind.annotation.adapters.XmlAdapter;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.val;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/jaxb/PersistentEntityAdapter.java b/api/applib/src/main/java/org/apache/causeway/applib/jaxb/PersistentEntityAdapter.java
index 3029debaad..e93b36391b 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/jaxb/PersistentEntityAdapter.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/jaxb/PersistentEntityAdapter.java
@@ -16,12 +16,13 @@
*/
package org.apache.causeway.applib.jaxb;
+import jakarta.inject.Inject;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.bookmark.BookmarkService;
import org.apache.causeway.schema.common.v2.OidDto;
-import jakarta.inject.Inject;
-import jakarta.xml.bind.annotation.adapters.XmlAdapter;
import lombok.val;
/**
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/jaxb/PrimitiveJaxbAdapters.java b/api/applib/src/main/java/org/apache/causeway/applib/jaxb/PrimitiveJaxbAdapters.java
index 6227295bda..cf2a73046b 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/jaxb/PrimitiveJaxbAdapters.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/jaxb/PrimitiveJaxbAdapters.java
@@ -20,11 +20,11 @@ package org.apache.causeway.applib.jaxb;
import java.nio.charset.StandardCharsets;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+
import org.apache.causeway.commons.internal.base._Bytes;
import org.apache.causeway.commons.internal.base._Strings;
-import jakarta.xml.bind.annotation.adapters.XmlAdapter;
-
/**
* @since 2.0 {@index}
*/
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/DomainObjectLayoutData.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/DomainObjectLayoutData.java
index 06aa00c68a..536148ee30 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/DomainObjectLayoutData.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/DomainObjectLayoutData.java
@@ -20,16 +20,16 @@ package org.apache.causeway.applib.layout.component;
import java.io.Serializable;
-import org.apache.causeway.applib.annotation.BookmarkPolicy;
-import org.apache.causeway.applib.annotation.TableDecorator;
-import org.apache.causeway.applib.layout.links.Link;
-
import jakarta.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlTransient;
import jakarta.xml.bind.annotation.XmlType;
+import org.apache.causeway.applib.annotation.BookmarkPolicy;
+import org.apache.causeway.applib.annotation.TableDecorator;
+import org.apache.causeway.applib.layout.links.Link;
+
/**
* Describes the layout of the title and icon of a domain object, broadly corresponding to {@link org.apache.causeway.applib.annotation.DomainObjectLayout}.
*
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/FieldSet.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/FieldSet.java
index 2b4bf9b402..4624859f27 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/FieldSet.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/FieldSet.java
@@ -22,15 +22,15 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import org.apache.causeway.applib.annotation.PropertyLayout;
-import org.apache.causeway.applib.layout.grid.bootstrap.BSCol;
-
import jakarta.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlTransient;
import jakarta.xml.bind.annotation.XmlType;
+import org.apache.causeway.applib.annotation.PropertyLayout;
+import org.apache.causeway.applib.layout.grid.bootstrap.BSCol;
+
/**
* A {@link MemberRegion region} of the page containing a set of
* related {@link PropertyLayoutData properties} and associated
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/HasBookmarking.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/HasBookmarking.java
index 76ff6bcf38..a6c9ae4ad7 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/HasBookmarking.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/HasBookmarking.java
@@ -18,10 +18,10 @@
*/
package org.apache.causeway.applib.layout.component;
-import org.apache.causeway.applib.annotation.BookmarkPolicy;
-
import jakarta.xml.bind.annotation.XmlAttribute;
+import org.apache.causeway.applib.annotation.BookmarkPolicy;
+
/**
* @since 2.0 {@index}
*/
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/HasHidden.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/HasHidden.java
index 9b53cab89a..55f7e40dda 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/HasHidden.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/HasHidden.java
@@ -18,10 +18,10 @@
*/
package org.apache.causeway.applib.layout.component;
-import org.apache.causeway.applib.annotation.Where;
-
import jakarta.xml.bind.annotation.XmlAttribute;
+import org.apache.causeway.applib.annotation.Where;
+
/**
* @since 2.0 {@index}
*/
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/PropertyLayoutData.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/PropertyLayoutData.java
index c2725f63bd..85b0f3f059 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/PropertyLayoutData.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/PropertyLayoutData.java
@@ -22,18 +22,18 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import org.apache.causeway.applib.annotation.LabelPosition;
-import org.apache.causeway.applib.annotation.PromptStyle;
-import org.apache.causeway.applib.annotation.Repainting;
-import org.apache.causeway.applib.annotation.Where;
-import org.apache.causeway.applib.layout.links.Link;
-
import jakarta.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlTransient;
import jakarta.xml.bind.annotation.XmlType;
+import org.apache.causeway.applib.annotation.LabelPosition;
+import org.apache.causeway.applib.annotation.PromptStyle;
+import org.apache.causeway.applib.annotation.Repainting;
+import org.apache.causeway.applib.annotation.Where;
+import org.apache.causeway.applib.layout.links.Link;
+
/**
* Describes the layout of a single property, broadly corresponds to the {@link org.apache.causeway.applib.annotation.PropertyLayout} annotation.
*
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/ServiceActionLayoutData.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/ServiceActionLayoutData.java
index 0867877087..ad3b76f539 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/ServiceActionLayoutData.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/ServiceActionLayoutData.java
@@ -20,14 +20,15 @@ package org.apache.causeway.applib.layout.component;
import java.io.Serializable;
-import org.apache.causeway.applib.annotation.BookmarkPolicy;
-import org.apache.causeway.applib.layout.links.Link;
-
import jakarta.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlTransient;
import jakarta.xml.bind.annotation.XmlType;
+
+import org.apache.causeway.applib.annotation.BookmarkPolicy;
+import org.apache.causeway.applib.layout.links.Link;
+
import lombok.Getter;
import lombok.Setter;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/GridAbstract.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/GridAbstract.java
index 4f0993f934..f19b6c8af3 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/GridAbstract.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/GridAbstract.java
@@ -22,6 +22,8 @@ import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
+import jakarta.xml.bind.annotation.XmlTransient;
+
import org.apache.causeway.applib.annotation.Programmatic;
import org.apache.causeway.applib.layout.component.ActionLayoutData;
import org.apache.causeway.applib.layout.component.ActionLayoutDataOwner;
@@ -33,8 +35,6 @@ import org.apache.causeway.applib.layout.component.PropertyLayoutData;
import org.apache.causeway.applib.layout.grid.bootstrap.BSGrid;
import org.apache.causeway.applib.services.layout.LayoutService;
-import jakarta.xml.bind.annotation.XmlTransient;
-
/**
* All top-level page layout classes should implement this interface.
*
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSCol.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSCol.java
index 332965523f..67e867b5dd 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSCol.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSCol.java
@@ -21,6 +21,12 @@ package org.apache.causeway.applib.layout.grid.bootstrap;
import java.util.ArrayList;
import java.util.List;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementRef;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
import org.apache.causeway.applib.layout.component.ActionLayoutData;
import org.apache.causeway.applib.layout.component.ActionLayoutDataOwner;
import org.apache.causeway.applib.layout.component.CollectionLayoutData;
@@ -32,12 +38,6 @@ import org.apache.causeway.applib.layout.component.FieldSetOwner;
import org.apache.causeway.commons.internal.primitives._Ints;
import org.apache.causeway.commons.internal.primitives._Ints.Bound;
-import jakarta.xml.bind.annotation.XmlAttribute;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlElementRef;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
-
/**
* A column within a row which, depending on its {@link #getSpan()}, could be as narrow as 1/12th of the page's width, all the way up to spanning the entire page.
*
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSGrid.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSGrid.java
index 740dda3ba5..0929452a5b 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSGrid.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSGrid.java
@@ -22,6 +22,12 @@ import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
+
import org.apache.causeway.applib.annotation.Programmatic;
import org.apache.causeway.applib.layout.component.ActionLayoutData;
import org.apache.causeway.applib.layout.component.CollectionLayoutData;
@@ -32,12 +38,6 @@ import org.apache.causeway.applib.layout.grid.Grid;
import org.apache.causeway.applib.layout.grid.GridAbstract;
import org.apache.causeway.applib.mixins.dto.Dto;
-import jakarta.xml.bind.annotation.XmlAttribute;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlTransient;
-import jakarta.xml.bind.annotation.XmlType;
-
/**
* This is the top-level for rendering the domain object's properties, collections and actions. It simply consists
* of a number of rows.
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSRow.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSRow.java
index f6a5848750..2ca0246874 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSRow.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSRow.java
@@ -21,8 +21,6 @@ package org.apache.causeway.applib.layout.grid.bootstrap;
import java.util.ArrayList;
import java.util.List;
-import org.apache.causeway.applib.annotation.Programmatic;
-
import jakarta.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlElementRef;
@@ -30,6 +28,8 @@ import jakarta.xml.bind.annotation.XmlElementRefs;
import jakarta.xml.bind.annotation.XmlTransient;
import jakarta.xml.bind.annotation.XmlType;
+import org.apache.causeway.applib.annotation.Programmatic;
+
/**
* Contains a row of content, either on the top-level {@link BSGrid page} or at any other lower-level element that can
* contain rows, eg {@link BSTab tabs}.
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSRowContent.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSRowContent.java
index af15c5ab8a..bcbfda5310 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSRowContent.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSRowContent.java
@@ -18,11 +18,11 @@
*/
package org.apache.causeway.applib.layout.grid.bootstrap;
-import org.apache.causeway.applib.annotation.Programmatic;
-
import jakarta.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlTransient;
+import org.apache.causeway.applib.annotation.Programmatic;
+
/**
* Common superclass for any content of a row.
*
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSTab.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSTab.java
index 10b03f888f..f41cf30f6b 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSTab.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSTab.java
@@ -23,17 +23,17 @@ import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Predicate;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
+
import org.apache.causeway.applib.annotation.Programmatic;
import org.apache.causeway.applib.layout.component.ActionLayoutData;
import org.apache.causeway.applib.layout.component.CollectionLayoutData;
import org.apache.causeway.applib.layout.component.DomainObjectLayoutData;
import org.apache.causeway.applib.layout.component.PropertyLayoutData;
-import jakarta.xml.bind.annotation.XmlAttribute;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlTransient;
-import jakarta.xml.bind.annotation.XmlType;
-
/**
* Represents a tab within a {@link BSTabGroup tab group}.
*
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSTabGroup.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSTabGroup.java
index c9bef88542..a0c3886446 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSTabGroup.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSTabGroup.java
@@ -21,13 +21,13 @@ package org.apache.causeway.applib.layout.grid.bootstrap;
import java.util.ArrayList;
import java.util.List;
-import org.apache.causeway.applib.annotation.Programmatic;
-
import jakarta.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlTransient;
import jakarta.xml.bind.annotation.XmlType;
+import org.apache.causeway.applib.annotation.Programmatic;
+
/**
* Represents a tab group containing one or more {@link BSTab tab}s.
*
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/MenuBarsAbstract.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/MenuBarsAbstract.java
index 5b9a23b75d..7266d4865a 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/MenuBarsAbstract.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/MenuBarsAbstract.java
@@ -21,10 +21,11 @@ package org.apache.causeway.applib.layout.menubars;
import java.io.Serializable;
import java.util.LinkedHashMap;
+import jakarta.xml.bind.annotation.XmlTransient;
+
import org.apache.causeway.applib.annotation.Programmatic;
import org.apache.causeway.applib.layout.component.ServiceActionLayoutData;
-import jakarta.xml.bind.annotation.XmlTransient;
import lombok.val;
/**
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/BSMenu.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/BSMenu.java
index cece4fec9e..ad466ea510 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/BSMenu.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/BSMenu.java
@@ -22,12 +22,13 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import org.apache.causeway.applib.annotation.DomainServiceLayout;
-import org.apache.causeway.applib.layout.menubars.Menu;
-
import jakarta.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlType;
+
+import org.apache.causeway.applib.annotation.DomainServiceLayout;
+import org.apache.causeway.applib.layout.menubars.Menu;
+
import lombok.ToString;
/**
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/BSMenuBar.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/BSMenuBar.java
index 71e9125487..96ebfec2ba 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/BSMenuBar.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/BSMenuBar.java
@@ -22,12 +22,12 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import org.apache.causeway.applib.annotation.DomainServiceLayout;
-import org.apache.causeway.applib.layout.menubars.MenuBar;
-
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlType;
+import org.apache.causeway.applib.annotation.DomainServiceLayout;
+import org.apache.causeway.applib.layout.menubars.MenuBar;
+
/**
* Describes the collection of domain services into menubars, broadly corresponding to the aggregation of information of {@link org.apache.causeway.applib.annotation.DomainServiceLayout} that have the same value of {@link DomainServiceLayout#named()}.
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/BSMenuBars.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/BSMenuBars.java
index 8e45c627d0..d0eb5d5e9a 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/BSMenuBars.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/BSMenuBars.java
@@ -21,14 +21,14 @@ package org.apache.causeway.applib.layout.menubars.bootstrap;
import java.util.List;
import java.util.function.Consumer;
-import org.apache.causeway.applib.annotation.DomainServiceLayout;
-import org.apache.causeway.applib.layout.component.ServiceActionLayoutData;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
-
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlType;
+import org.apache.causeway.applib.annotation.DomainServiceLayout;
+import org.apache.causeway.applib.layout.component.ServiceActionLayoutData;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
+
/**
* Describes the collection of domain services into menubars, broadly corresponding to the aggregation of information within {@link org.apache.causeway.applib.annotation.DomainServiceLayout}.
*
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/BSMenuSection.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/BSMenuSection.java
index c942be1b73..6b977c4e4c 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/BSMenuSection.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/BSMenuSection.java
@@ -22,13 +22,13 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
+
import org.apache.causeway.applib.layout.component.ServiceActionLayoutData;
import org.apache.causeway.applib.layout.component.ServiceActionLayoutDataOwner;
import org.apache.causeway.applib.layout.menubars.MenuSection;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlType;
-
/**
* Corresponds to a domain service that contributes its serviceActions under a particular {@link BSMenuBar}.
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/mixins/dto/Dto_downloadXml.java b/api/applib/src/main/java/org/apache/causeway/applib/mixins/dto/Dto_downloadXml.java
index 3dddbcf5b4..b206562ac4 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/mixins/dto/Dto_downloadXml.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/mixins/dto/Dto_downloadXml.java
@@ -18,6 +18,8 @@
*/
package org.apache.causeway.applib.mixins.dto;
+import jakarta.inject.Inject;
+
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
import org.apache.causeway.applib.annotation.MemberSupport;
@@ -29,7 +31,6 @@ import org.apache.causeway.applib.services.jaxb.JaxbService;
import org.apache.causeway.applib.value.Clob;
import org.apache.causeway.applib.value.NamedWithMimeType.CommonMimeType;
-import jakarta.inject.Inject;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/mixins/dto/Dto_downloadXsd.java b/api/applib/src/main/java/org/apache/causeway/applib/mixins/dto/Dto_downloadXsd.java
index 1b6afbef50..b172e31146 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/mixins/dto/Dto_downloadXsd.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/mixins/dto/Dto_downloadXsd.java
@@ -20,6 +20,8 @@ package org.apache.causeway.applib.mixins.dto;
import java.util.Map;
+import jakarta.inject.Inject;
+
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
import org.apache.causeway.applib.annotation.MemberSupport;
@@ -35,7 +37,6 @@ import org.apache.causeway.applib.value.Clob;
import org.apache.causeway.applib.value.NamedWithMimeType.CommonMimeType;
import org.apache.causeway.commons.io.ZipUtils;
-import jakarta.inject.Inject;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/mixins/layout/Object_downloadLayout.java b/api/applib/src/main/java/org/apache/causeway/applib/mixins/layout/Object_downloadLayout.java
index a5060ce8f5..d79fc4baae 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/mixins/layout/Object_downloadLayout.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/mixins/layout/Object_downloadLayout.java
@@ -20,6 +20,8 @@ package org.apache.causeway.applib.mixins.layout;
import java.util.Set;
+import jakarta.inject.Inject;
+
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
import org.apache.causeway.applib.annotation.MemberSupport;
@@ -34,7 +36,6 @@ import org.apache.causeway.applib.services.layout.LayoutService;
import org.apache.causeway.applib.value.Clob;
import org.apache.causeway.applib.value.NamedWithMimeType.CommonMimeType;
-import jakarta.inject.Inject;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/mixins/metamodel/Object_downloadMetamodelXml.java b/api/applib/src/main/java/org/apache/causeway/applib/mixins/metamodel/Object_downloadMetamodelXml.java
index 6176556f94..7bb16012a0 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/mixins/metamodel/Object_downloadMetamodelXml.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/mixins/metamodel/Object_downloadMetamodelXml.java
@@ -21,6 +21,8 @@ package org.apache.causeway.applib.mixins.metamodel;
import java.util.Objects;
import java.util.Optional;
+import jakarta.inject.Inject;
+
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
import org.apache.causeway.applib.annotation.MemberSupport;
@@ -38,7 +40,6 @@ import org.apache.causeway.applib.services.metamodel.MetaModelService;
import org.apache.causeway.applib.value.Clob;
import org.apache.causeway.applib.value.NamedWithMimeType.CommonMimeType;
-import jakarta.inject.Inject;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/mixins/metamodel/Object_rebuildMetamodel.java b/api/applib/src/main/java/org/apache/causeway/applib/mixins/metamodel/Object_rebuildMetamodel.java
index 286dc9beaa..304d126893 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/mixins/metamodel/Object_rebuildMetamodel.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/mixins/metamodel/Object_rebuildMetamodel.java
@@ -18,6 +18,8 @@
*/
package org.apache.causeway.applib.mixins.metamodel;
+import jakarta.inject.Inject;
+
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
import org.apache.causeway.applib.annotation.MemberSupport;
@@ -27,7 +29,6 @@ import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.layout.LayoutConstants;
import org.apache.causeway.applib.services.metamodel.MetaModelService;
-import jakarta.inject.Inject;
import lombok.RequiredArgsConstructor;
/**
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/mixins/rest/Object_openRestApi.java b/api/applib/src/main/java/org/apache/causeway/applib/mixins/rest/Object_openRestApi.java
index ee63bfb5e2..0b4b2fe561 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/mixins/rest/Object_openRestApi.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/mixins/rest/Object_openRestApi.java
@@ -20,6 +20,8 @@ package org.apache.causeway.applib.mixins.rest;
import java.util.Optional;
+import jakarta.inject.Inject;
+
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
import org.apache.causeway.applib.annotation.MemberSupport;
@@ -30,7 +32,6 @@ import org.apache.causeway.applib.layout.LayoutConstants;
import org.apache.causeway.applib.services.bookmark.BookmarkService;
import org.apache.causeway.applib.value.LocalResourcePath;
-import jakarta.inject.Inject;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/mixins/system/HasTarget_openTargetObject.java b/api/applib/src/main/java/org/apache/causeway/applib/mixins/system/HasTarget_openTargetObject.java
index 52487ed805..1f588939af 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/mixins/system/HasTarget_openTargetObject.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/mixins/system/HasTarget_openTargetObject.java
@@ -18,6 +18,8 @@
*/
package org.apache.causeway.applib.mixins.system;
+import jakarta.inject.Inject;
+
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
import org.apache.causeway.applib.annotation.MemberSupport;
@@ -29,7 +31,6 @@ import org.apache.causeway.applib.services.message.MessageService;
import org.apache.causeway.applib.services.metamodel.BeanSort;
import org.apache.causeway.applib.services.metamodel.MetaModelService;
-import jakarta.inject.Inject;
import lombok.RequiredArgsConstructor;
/**
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeat/ApplicationFeature.java b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeat/ApplicationFeature.java
index 4b8e0a3d44..6c32011d57 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeat/ApplicationFeature.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeat/ApplicationFeature.java
@@ -23,12 +23,12 @@ import java.util.Optional;
import java.util.OptionalInt;
import java.util.SortedSet;
+import jakarta.inject.Named;
+
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.annotation.Value;
-import jakarta.inject.Named;
-
/**
*
* @since 1.x revised for 2.0 {@index}
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeat/ApplicationFeatureSort.java b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeat/ApplicationFeatureSort.java
index f3528967aa..4fee278ca7 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeat/ApplicationFeatureSort.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeat/ApplicationFeatureSort.java
@@ -18,11 +18,11 @@
*/
package org.apache.causeway.applib.services.appfeat;
+import jakarta.inject.Named;
+
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.Value;
-import jakarta.inject.Named;
-
/**
*
* @since 1.x revised for 2.0 {@index}
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationFeatureMenu.java b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationFeatureMenu.java
index c777dd589e..af342ef21a 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationFeatureMenu.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationFeatureMenu.java
@@ -21,6 +21,9 @@ package org.apache.causeway.applib.services.appfeatui;
import java.util.Collection;
import java.util.List;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
@@ -37,9 +40,6 @@ import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.commons.internal.collections._Lists;
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-
/**
* @since 2.x {@index}
*/
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationFeatureViewModel.java b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationFeatureViewModel.java
index 9586e67f10..c7a4bfd3a1 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationFeatureViewModel.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationFeatureViewModel.java
@@ -26,6 +26,9 @@ import java.util.List;
import java.util.Optional;
import java.util.function.Function;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.ViewModel;
import org.apache.causeway.applib.annotation.DomainObject;
@@ -52,8 +55,6 @@ import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.commons.internal.collections._Lists;
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
import lombok.Getter;
import lombok.NonNull;
import lombok.Setter;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationNamespace.java b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationNamespace.java
index 9787920f95..330b43c0b1 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationNamespace.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationNamespace.java
@@ -25,6 +25,9 @@ import java.lang.annotation.Target;
import java.util.List;
import java.util.SortedSet;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.Collection;
import org.apache.causeway.applib.annotation.CollectionLayout;
@@ -34,9 +37,6 @@ import org.apache.causeway.applib.annotation.MemberSupport;
import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
import org.apache.causeway.applib.services.appfeat.ApplicationFeatureSort;
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-
/**
* @since 2.x {@index}
*/
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationType.java b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationType.java
index 89b77c8868..fe51def628 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationType.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationType.java
@@ -25,6 +25,9 @@ import java.lang.annotation.Target;
import java.util.List;
import java.util.SortedSet;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.BookmarkPolicy;
import org.apache.causeway.applib.annotation.Collection;
@@ -33,9 +36,6 @@ import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-
/**
* @since 2.x {@index}
*/
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeAction.java b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeAction.java
index d516d75510..9fe0db6c83 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeAction.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeAction.java
@@ -23,6 +23,9 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.DomainObjectLayout;
@@ -31,9 +34,6 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-
/**
* @since 2.x {@index}
*/
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeCollection.java b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeCollection.java
index 432ab59db5..d76515458a 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeCollection.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeCollection.java
@@ -22,6 +22,9 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.DomainObjectLayout;
@@ -29,9 +32,6 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-
/**
* @since 2.x {@index}
*/
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeMember.java b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeMember.java
index fbfc311131..695da8acf0 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeMember.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeMember.java
@@ -23,6 +23,8 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import jakarta.inject.Named;
+
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.BookmarkPolicy;
import org.apache.causeway.applib.annotation.DomainObject;
@@ -31,7 +33,6 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
-import jakarta.inject.Named;
import lombok.NoArgsConstructor;
/**
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeProperty.java b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeProperty.java
index bff7e144ec..8ce876e024 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeProperty.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeProperty.java
@@ -23,6 +23,9 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.DomainObjectLayout;
@@ -32,8 +35,6 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
import lombok.val;
/**
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/Bookmark.java b/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/Bookmark.java
index b113b7ee8e..856db45505 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/Bookmark.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/Bookmark.java
@@ -22,7 +22,6 @@ import java.util.Objects;
import java.util.Optional;
import java.util.StringTokenizer;
-
import jakarta.inject.Named;
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/BookmarkHolder_lookup.java b/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/BookmarkHolder_lookup.java
index 2e042b6bb7..f60199679a 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/BookmarkHolder_lookup.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/BookmarkHolder_lookup.java
@@ -18,6 +18,8 @@
*/
package org.apache.causeway.applib.services.bookmark;
+import jakarta.inject.Inject;
+
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
@@ -25,7 +27,6 @@ import org.apache.causeway.applib.annotation.MemberSupport;
import org.apache.causeway.applib.annotation.Publishing;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import jakarta.inject.Inject;
import lombok.RequiredArgsConstructor;
/**
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/BookmarkHolder_object.java b/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/BookmarkHolder_object.java
index 6bebe50f10..12a583b012 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/BookmarkHolder_object.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/BookmarkHolder_object.java
@@ -18,11 +18,12 @@
*/
package org.apache.causeway.applib.services.bookmark;
+import jakarta.inject.Inject;
+
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.MemberSupport;
import org.apache.causeway.applib.annotation.Property;
-import jakarta.inject.Inject;
import lombok.RequiredArgsConstructor;
/**
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/BookmarkService.java b/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/BookmarkService.java
index 756cd787a7..3559bcdb54 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/BookmarkService.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/BookmarkService.java
@@ -21,11 +21,11 @@ package org.apache.causeway.applib.services.bookmark;
import java.util.List;
import java.util.Optional;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.DomainService;
-import org.springframework.lang.Nullable;
-
import lombok.NonNull;
/**
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/clock/ClockService.java b/api/applib/src/main/java/org/apache/causeway/applib/services/clock/ClockService.java
index 3ad7a0ae9d..1144843b02 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/clock/ClockService.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/clock/ClockService.java
@@ -18,6 +18,10 @@
*/
package org.apache.causeway.applib.services.clock;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
+
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
@@ -27,9 +31,6 @@ import org.apache.causeway.applib.clock.VirtualClock;
import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker;
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-import jakarta.inject.Provider;
import lombok.RequiredArgsConstructor;
/**
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/command/CommandExecutorService.java b/api/applib/src/main/java/org/apache/causeway/applib/services/command/CommandExecutorService.java
index 981148cf19..12a42918c7 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/command/CommandExecutorService.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/command/CommandExecutorService.java
@@ -24,6 +24,7 @@ import java.util.function.BiFunction;
import org.apache.causeway.applib.clock.VirtualClock;
import org.apache.causeway.applib.jaxb.JavaSqlXMLGregorianCalendarMarshalling;
import org.apache.causeway.applib.services.bookmark.Bookmark;
+import org.apache.causeway.applib.services.command.CommandExecutorService.InteractionContextPolicy;
import org.apache.causeway.applib.services.iactn.Interaction;
import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
import org.apache.causeway.applib.services.user.UserMemento;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/commanddto/conmap/ContentMappingServiceForCommandDto.java b/api/applib/src/main/java/org/apache/causeway/applib/services/commanddto/conmap/ContentMappingServiceForCommandDto.java
index eec2c70a17..8209a54fea 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/commanddto/conmap/ContentMappingServiceForCommandDto.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/commanddto/conmap/ContentMappingServiceForCommandDto.java
@@ -20,6 +20,11 @@ package org.apache.causeway.applib.services.commanddto.conmap;
import java.util.List;
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.ws.rs.core.MediaType;
+
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.lang.Nullable;
import org.springframework.stereotype.Service;
@@ -33,10 +38,6 @@ import org.apache.causeway.applib.services.conmap.ContentMappingService;
import org.apache.causeway.applib.services.metamodel.MetaModelService;
import org.apache.causeway.schema.cmd.v2.CommandDto;
-import jakarta.annotation.Priority;
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-import jakarta.ws.rs.core.MediaType;
import lombok.val;
/**
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/commanddto/conmap/ContentMappingServiceForCommandsDto.java b/api/applib/src/main/java/org/apache/causeway/applib/services/commanddto/conmap/ContentMappingServiceForCommandsDto.java
index 679e6b0dfe..014321c405 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/commanddto/conmap/ContentMappingServiceForCommandsDto.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/commanddto/conmap/ContentMappingServiceForCommandsDto.java
@@ -20,6 +20,11 @@ package org.apache.causeway.applib.services.commanddto.conmap;
import java.util.List;
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.ws.rs.core.MediaType;
+
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
@@ -29,11 +34,6 @@ import org.apache.causeway.applib.services.conmap.ContentMappingService;
import org.apache.causeway.schema.cmd.v2.CommandDto;
import org.apache.causeway.schema.cmd.v2.CommandsDto;
-import jakarta.annotation.Priority;
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-import jakarta.ws.rs.core.MediaType;
-
/**
*
* @since 2.0 {@index}
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/commanddto/processor/spi/CommandDtoProcessorServiceIdentity.java b/api/applib/src/main/java/org/apache/causeway/applib/services/commanddto/processor/spi/CommandDtoProcessorServiceIdentity.java
index 9172c8a862..4429fe4ab9 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/commanddto/processor/spi/CommandDtoProcessorServiceIdentity.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/commanddto/processor/spi/CommandDtoProcessorServiceIdentity.java
@@ -18,14 +18,14 @@
*/
package org.apache.causeway.applib.services.commanddto.processor.spi;
+import jakarta.inject.Named;
+
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.schema.cmd.v2.CommandDto;
-import jakarta.inject.Named;
-
/**
* At least one implementation is required.
*
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/confview/ConfigurationMenu.java b/api/applib/src/main/java/org/apache/causeway/applib/services/confview/ConfigurationMenu.java
index 7341463f04..2dba08feff 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/confview/ConfigurationMenu.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/confview/ConfigurationMenu.java
@@ -18,6 +18,9 @@
*/
package org.apache.causeway.applib.services.confview;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
@@ -30,8 +33,6 @@ import org.apache.causeway.applib.annotation.Publishing;
import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.services.factory.FactoryService;
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
import lombok.RequiredArgsConstructor;
/**
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/confview/ConfigurationProperty.java b/api/applib/src/main/java/org/apache/causeway/applib/services/confview/ConfigurationProperty.java
index 8fb7276899..ceee685fca 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/confview/ConfigurationProperty.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/confview/ConfigurationProperty.java
@@ -18,6 +18,13 @@
*/
package org.apache.causeway.applib.services.confview;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.DomainObjectLayout;
@@ -25,12 +32,6 @@ import org.apache.causeway.applib.annotation.Editing;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.commons.internal.base._Objects;
-import jakarta.inject.Named;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/confview/ConfigurationViewmodel.java b/api/applib/src/main/java/org/apache/causeway/applib/services/confview/ConfigurationViewmodel.java
index 67f15f7d7d..675ab040b4 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/confview/ConfigurationViewmodel.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/confview/ConfigurationViewmodel.java
@@ -21,6 +21,8 @@ package org.apache.causeway.applib.services.confview;
import java.util.Collections;
import java.util.Set;
+import jakarta.inject.Named;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.apache.causeway.applib.CausewayModuleApplib;
@@ -30,8 +32,6 @@ import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.ObjectSupport;
import org.apache.causeway.applib.services.confview.ConfigurationViewService.Scope;
-import jakarta.inject.Named;
-
/**
* As returned by {@link ConfigurationMenu.configuration#act() ConfigurationMenu}.
*
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/conmap/ContentMappingService.java b/api/applib/src/main/java/org/apache/causeway/applib/services/conmap/ContentMappingService.java
index 3748413bb4..425bc6ff1f 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/conmap/ContentMappingService.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/conmap/ContentMappingService.java
@@ -22,10 +22,10 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import org.apache.causeway.commons.internal.base._NullSafe;
-
import jakarta.ws.rs.core.MediaType;
+import org.apache.causeway.commons.internal.base._NullSafe;
+
/**
*
* @since 1.x {@index}
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/exceprecog/ExceptionRecognizerAbstract.java b/api/applib/src/main/java/org/apache/causeway/applib/services/exceprecog/ExceptionRecognizerAbstract.java
index 37ba2b2e98..7c3e76c351 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/exceprecog/ExceptionRecognizerAbstract.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/exceprecog/ExceptionRecognizerAbstract.java
@@ -23,12 +23,13 @@ import java.util.Optional;
import java.util.function.Function;
import java.util.function.Predicate;
+import jakarta.inject.Inject;
+
import org.apache.causeway.applib.exceptions.TranslatableException;
import org.apache.causeway.applib.services.i18n.TranslationService;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
-import jakarta.inject.Inject;
import lombok.Getter;
import lombok.Setter;
import lombok.val;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/iactn/Execution.java b/api/applib/src/main/java/org/apache/causeway/applib/services/iactn/Execution.java
index ef8447d899..3fd0dd5464 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/iactn/Execution.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/iactn/Execution.java
@@ -22,6 +22,8 @@ import java.sql.Timestamp;
import java.util.Collections;
import java.util.List;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.events.domain.AbstractDomainEvent;
import org.apache.causeway.applib.jaxb.JavaSqlXMLGregorianCalendarMarshalling;
@@ -38,8 +40,6 @@ import org.apache.causeway.schema.ixn.v2.MemberExecutionDto;
import org.apache.causeway.schema.ixn.v2.MetricsDto;
import org.apache.causeway.schema.ixn.v2.ObjectCountsDto;
-import org.springframework.lang.Nullable;
-
import lombok.Getter;
import lombok.val;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/jaxb/CatalogingSchemaOutputResolver.java b/api/applib/src/main/java/org/apache/causeway/applib/services/jaxb/CatalogingSchemaOutputResolver.java
index e51e23af85..97359808e2 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/jaxb/CatalogingSchemaOutputResolver.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/jaxb/CatalogingSchemaOutputResolver.java
@@ -31,6 +31,8 @@ import javax.xml.transform.Transformer;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
+import jakarta.xml.bind.SchemaOutputResolver;
+
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -42,8 +44,6 @@ import org.apache.causeway.commons.internal.codec._DocumentFactories;
import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.commons.internal.collections._Maps;
-import jakarta.xml.bind.SchemaOutputResolver;
-
/**
* An implementation of {@link SchemaOutputResolver} that keeps track of all the schemas for which it has
* {@link #createOutput(String, String) created} an output {@link StreamResult} containing the content
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/jaxb/CausewaySchemas.java b/api/applib/src/main/java/org/apache/causeway/applib/services/jaxb/CausewaySchemas.java
index 41c7808681..028d301c82 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/jaxb/CausewaySchemas.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/jaxb/CausewaySchemas.java
@@ -18,12 +18,12 @@
*/
package org.apache.causeway.applib.services.jaxb;
+import jakarta.inject.Named;
+
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.Value;
import org.apache.causeway.applib.mixins.dto.Dto_downloadXsd;
-import jakarta.inject.Named;
-
/**
* Controls whether, when generating {@link JaxbService#toXsd(Object, CausewaySchemas) XML schemas},
* any of the common Causeway schemas (in the namespace <code>http://org.apache.causeway.schema</code>) should be included
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/layout/LayoutServiceMenu.java b/api/applib/src/main/java/org/apache/causeway/applib/services/layout/LayoutServiceMenu.java
index 944f2bc710..b9e68ba717 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/layout/LayoutServiceMenu.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/layout/LayoutServiceMenu.java
@@ -22,6 +22,7 @@ import java.util.Set;
import jakarta.activation.MimeType;
import jakarta.activation.MimeTypeParseException;
+import jakarta.inject.Named;
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.Action;
@@ -39,8 +40,6 @@ import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.applib.value.Clob;
import org.apache.causeway.applib.value.NamedWithMimeType.CommonMimeType;
-import jakarta.inject.Named;
-
/**
* Provides a UI to allow layouts (obtained from {@link LayoutService}) to be downloaded.
*
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/CommandLogger.java b/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/CommandLogger.java
index 739ae04751..20d52b053b 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/CommandLogger.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/CommandLogger.java
@@ -18,6 +18,9 @@
*/
package org.apache.causeway.applib.services.publishing.log;
+import jakarta.annotation.Priority;
+import jakarta.inject.Named;
+
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
@@ -27,8 +30,6 @@ import org.apache.causeway.applib.services.command.Command;
import org.apache.causeway.applib.services.publishing.spi.CommandSubscriber;
import org.apache.causeway.applib.util.schema.CommandDtoUtils;
-import jakarta.annotation.Priority;
-import jakarta.inject.Named;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/EntityChangesLogger.java b/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/EntityChangesLogger.java
index 08419fca43..a1e7d2eb64 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/EntityChangesLogger.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/EntityChangesLogger.java
@@ -18,6 +18,9 @@
*/
package org.apache.causeway.applib.services.publishing.log;
+import jakarta.annotation.Priority;
+import jakarta.inject.Named;
+
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
@@ -28,8 +31,6 @@ import org.apache.causeway.applib.services.publishing.spi.EntityChangesSubscribe
import org.apache.causeway.applib.util.schema.ChangesDtoUtils;
import org.apache.causeway.schema.chg.v2.ChangesDto;
-import jakarta.annotation.Priority;
-import jakarta.inject.Named;
import lombok.extern.log4j.Log4j2;
/**
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/EntityPropertyChangeLogger.java b/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/EntityPropertyChangeLogger.java
index e618689106..c83b735be9 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/EntityPropertyChangeLogger.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/EntityPropertyChangeLogger.java
@@ -18,6 +18,9 @@
*/
package org.apache.causeway.applib.services.publishing.log;
+import jakarta.annotation.Priority;
+import jakarta.inject.Named;
+
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
@@ -26,8 +29,6 @@ import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.publishing.spi.EntityPropertyChange;
import org.apache.causeway.applib.services.publishing.spi.EntityPropertyChangeSubscriber;
-import jakarta.annotation.Priority;
-import jakarta.inject.Named;
import lombok.extern.log4j.Log4j2;
/**
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/ExecutionLogger.java b/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/ExecutionLogger.java
index d725fe4b01..9f3a009ff9 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/ExecutionLogger.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/ExecutionLogger.java
@@ -18,6 +18,9 @@
*/
package org.apache.causeway.applib.services.publishing.log;
+import jakarta.annotation.Priority;
+import jakarta.inject.Named;
+
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
@@ -28,8 +31,6 @@ import org.apache.causeway.applib.services.publishing.spi.ExecutionSubscriber;
import org.apache.causeway.applib.util.schema.InteractionDtoUtils;
import org.apache.causeway.schema.ixn.v2.InteractionDto;
-import jakarta.annotation.Priority;
-import jakarta.inject.Named;
import lombok.extern.log4j.Log4j2;
/**
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/queryresultscache/QueryResultsCache.java b/api/applib/src/main/java/org/apache/causeway/applib/services/queryresultscache/QueryResultsCache.java
index 9eaf870168..68808b452b 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/queryresultscache/QueryResultsCache.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/queryresultscache/QueryResultsCache.java
@@ -23,6 +23,9 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.Callable;
+import jakarta.annotation.Priority;
+import jakarta.inject.Named;
+
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -35,8 +38,6 @@ import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.internal.collections._Maps;
-import jakarta.annotation.Priority;
-import jakarta.inject.Named;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.Getter;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/registry/InstanceByPriorityComparator.java b/api/applib/src/main/java/org/apache/causeway/applib/services/registry/InstanceByPriorityComparator.java
index 915cab4e2a..17522be453 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/registry/InstanceByPriorityComparator.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/registry/InstanceByPriorityComparator.java
@@ -20,12 +20,13 @@ package org.apache.causeway.applib.services.registry;
import java.util.Comparator;
+import jakarta.annotation.Priority;
+
import org.springframework.context.annotation.Primary;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.commons.internal.reflection._Reflect;
-import jakarta.annotation.Priority;
import lombok.val;
/**
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/session/SessionLogger.java b/api/applib/src/main/java/org/apache/causeway/applib/services/session/SessionLogger.java
index ebc3e04bad..78422370bd 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/session/SessionLogger.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/session/SessionLogger.java
@@ -21,14 +21,15 @@ package org.apache.causeway.applib.services.session;
import java.util.Date;
import java.util.UUID;
+import jakarta.annotation.Priority;
+import jakarta.inject.Named;
+
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
-import jakarta.annotation.Priority;
-import jakarta.inject.Named;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/sitemap/SitemapServiceMenu.java b/api/applib/src/main/java/org/apache/causeway/applib/services/sitemap/SitemapServiceMenu.java
index a7b04ddee5..cbf77c74ec 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/sitemap/SitemapServiceMenu.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/sitemap/SitemapServiceMenu.java
@@ -18,6 +18,8 @@
*/
package org.apache.causeway.applib.services.sitemap;
+import jakarta.inject.Named;
+
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
@@ -33,8 +35,6 @@ import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.value.Clob;
import org.apache.causeway.commons.internal.base._Strings;
-import jakarta.inject.Named;
-
/**
* Simply provides a UI to allow a site-map (obtained from {@link SitemapService}) to be downloaded.
*
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/sudo/SudoService.java b/api/applib/src/main/java/org/apache/causeway/applib/services/sudo/SudoService.java
index a4f1d61a97..4d08bc2416 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/sudo/SudoService.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/sudo/SudoService.java
@@ -22,6 +22,10 @@ import java.util.List;
import java.util.concurrent.Callable;
import java.util.function.UnaryOperator;
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
@@ -34,9 +38,6 @@ import org.apache.causeway.applib.services.user.RoleMemento;
import org.apache.causeway.applib.services.user.UserService;
import org.apache.causeway.commons.functional.ThrowingRunnable;
-import jakarta.annotation.Priority;
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/swagger/Format.java b/api/applib/src/main/java/org/apache/causeway/applib/services/swagger/Format.java
index d0d0a91f78..356b6ee925 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/swagger/Format.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/swagger/Format.java
@@ -18,11 +18,11 @@
*/
package org.apache.causeway.applib.services.swagger;
+import jakarta.inject.Named;
+
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.Value;
-import jakarta.inject.Named;
-
/**
* The format to generate the representation of the swagger spec.
*
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/swagger/Visibility.java b/api/applib/src/main/java/org/apache/causeway/applib/services/swagger/Visibility.java
index 2a86ec8813..7d39c20a62 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/swagger/Visibility.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/swagger/Visibility.java
@@ -18,6 +18,8 @@
*/
package org.apache.causeway.applib.services.swagger;
+import jakarta.inject.Named;
+
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.DomainObject;
@@ -26,8 +28,6 @@ import org.apache.causeway.applib.annotation.NatureOfService;
import org.apache.causeway.applib.annotation.RestrictTo;
import org.apache.causeway.applib.annotation.Value;
-import jakarta.inject.Named;
-
/**
* Specifies which elements of the metamodel are included within the generated
* swagger spec.
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/user/ImpersonateMenu.java b/api/applib/src/main/java/org/apache/causeway/applib/services/user/ImpersonateMenu.java
index 396ff27893..85eecc7f25 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/user/ImpersonateMenu.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/user/ImpersonateMenu.java
@@ -22,6 +22,9 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
@@ -36,8 +39,6 @@ import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.services.message.MessageService;
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/user/ImpersonateStopMenu.java b/api/applib/src/main/java/org/apache/causeway/applib/services/user/ImpersonateStopMenu.java
index 6f66877615..c6ec4db912 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/user/ImpersonateStopMenu.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/user/ImpersonateStopMenu.java
@@ -18,6 +18,9 @@
*/
package org.apache.causeway.applib.services.user;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
@@ -32,8 +35,6 @@ import org.apache.causeway.applib.annotation.RestrictTo;
import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.services.message.MessageService;
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
import lombok.RequiredArgsConstructor;
/**
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserService.java b/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserService.java
index 657e2a345e..a6d7688c77 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserService.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserService.java
@@ -21,6 +21,11 @@ package org.apache.causeway.applib.services.user;
import java.util.List;
import java.util.Optional;
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
+
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.lang.Nullable;
import org.springframework.stereotype.Service;
@@ -34,10 +39,6 @@ import org.apache.causeway.applib.services.sudo.SudoService;
import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
-import jakarta.annotation.Priority;
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-import jakarta.inject.Provider;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/userui/UserMenu.java b/api/applib/src/main/java/org/apache/causeway/applib/services/userui/UserMenu.java
index 4b140b0461..f681f49580 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/userui/UserMenu.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/userui/UserMenu.java
@@ -18,6 +18,9 @@
*/
package org.apache.causeway.applib.services.userui;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
@@ -31,8 +34,6 @@ import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.services.user.UserMemento;
import org.apache.causeway.applib.services.user.UserService;
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
import lombok.RequiredArgsConstructor;
/**
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/value/Markup.java b/api/applib/src/main/java/org/apache/causeway/applib/value/Markup.java
index d39b872e15..d77af316c0 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/value/Markup.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/value/Markup.java
@@ -23,15 +23,16 @@ import java.nio.charset.StandardCharsets;
import java.util.Base64;
import java.util.stream.Collectors;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.Value;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.base._Text;
import org.apache.causeway.commons.io.TextUtils;
-import jakarta.inject.Named;
-import jakarta.xml.bind.annotation.adapters.XmlAdapter;
-import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import lombok.EqualsAndHashCode;
/**
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/value/NamedWithMimeType.java b/api/applib/src/main/java/org/apache/causeway/applib/value/NamedWithMimeType.java
index 90be701cdf..65e6a3046e 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/value/NamedWithMimeType.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/value/NamedWithMimeType.java
@@ -22,13 +22,14 @@ import java.io.Serializable;
import java.util.Optional;
import java.util.stream.Stream;
+import jakarta.activation.MimeType;
+import jakarta.activation.MimeTypeParseException;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._Strings;
-import jakarta.activation.MimeType;
-import jakarta.activation.MimeTypeParseException;
import lombok.Getter;
import lombok.val;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/value/Password.java b/api/applib/src/main/java/org/apache/causeway/applib/value/Password.java
index bd1acb4126..6a135ecd75 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/value/Password.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/value/Password.java
@@ -21,15 +21,15 @@ package org.apache.causeway.applib.value;
import java.io.Serializable;
import java.util.Objects;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.Value;
import org.apache.causeway.applib.services.placeholder.PlaceholderRenderService;
import org.apache.causeway.applib.services.placeholder.PlaceholderRenderService.PlaceholderLiteral;
-import jakarta.inject.Named;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-
/**
* Represents a password that will not displayed to the UI but can be persisted.
*
diff --git a/api/applib/src/test/java/org/apache/causeway/applib/services/user/UserMemento_contains_Test.java b/api/applib/src/test/java/org/apache/causeway/applib/services/user/UserMemento_contains_Test.java
index 6689ba07c6..e25c6ef68f 100644
--- a/api/applib/src/test/java/org/apache/causeway/applib/services/user/UserMemento_contains_Test.java
+++ b/api/applib/src/test/java/org/apache/causeway/applib/services/user/UserMemento_contains_Test.java
@@ -18,11 +18,12 @@
*/
package org.apache.causeway.applib.services.user;
-import org.apache.causeway.applib.services.sudo.SudoService;
-import org.apache.causeway.commons.collections.Can;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
+import org.apache.causeway.applib.services.sudo.SudoService;
+import org.apache.causeway.commons.collections.Can;
+
class UserMemento_contains_Test {
diff --git a/api/applib/src/test/java/org/apache/causeway/applib/services/wrapper/control/AsyncControl_Test.java b/api/applib/src/test/java/org/apache/causeway/applib/services/wrapper/control/AsyncControl_Test.java
index eb88608cd0..649004e5d0 100644
--- a/api/applib/src/test/java/org/apache/causeway/applib/services/wrapper/control/AsyncControl_Test.java
+++ b/api/applib/src/test/java/org/apache/causeway/applib/services/wrapper/control/AsyncControl_Test.java
@@ -22,6 +22,7 @@ import java.util.stream.Collectors;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
+
import org.springframework.core.task.support.ExecutorServiceAdapter;
import org.springframework.core.task.support.TaskExecutorAdapter;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/base/_Bytes_ZLibCompressor.java b/commons/src/main/java/org/apache/causeway/commons/internal/base/_Bytes_ZLibCompressor.java
index cf6fb9c5f7..5d66268f4e 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/base/_Bytes_ZLibCompressor.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/base/_Bytes_ZLibCompressor.java
@@ -24,6 +24,7 @@ import java.io.IOException;
import java.util.zip.DeflaterOutputStream;
import java.util.zip.Inflater;
import java.util.zip.InflaterInputStream;
+
import lombok.experimental.UtilityClass;
/**
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/codec/_DocumentFactories.java b/commons/src/main/java/org/apache/causeway/commons/internal/codec/_DocumentFactories.java
index 164b5d0122..d4d5f58601 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/codec/_DocumentFactories.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/codec/_DocumentFactories.java
@@ -30,10 +30,11 @@ import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.TransformerFactory;
import org.jdom2.input.SAXBuilder;
-import org.springframework.lang.Nullable;
import org.w3c.dom.Document;
import org.xml.sax.InputSource;
+import org.springframework.lang.Nullable;
+
import lombok.SneakyThrows;
import lombok.val;
import lombok.experimental.UtilityClass;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/hardening/_Hardening.java b/commons/src/main/java/org/apache/causeway/commons/internal/hardening/_Hardening.java
index 984bf6f129..cbca3619c2 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/hardening/_Hardening.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/hardening/_Hardening.java
@@ -20,6 +20,7 @@ package org.apache.causeway.commons.internal.hardening;
import org.jsoup.Jsoup;
import org.jsoup.safety.Safelist;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.commons.internal.base._Strings;
diff --git a/commons/src/main/java/org/apache/causeway/commons/io/YamlUtils.java b/commons/src/main/java/org/apache/causeway/commons/io/YamlUtils.java
index 52154bfac4..14e26a7e96 100644
--- a/commons/src/main/java/org/apache/causeway/commons/io/YamlUtils.java
+++ b/commons/src/main/java/org/apache/causeway/commons/io/YamlUtils.java
@@ -26,11 +26,12 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator;
-import org.springframework.lang.Nullable;
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.DumperOptions.LineBreak;
import org.yaml.snakeyaml.LoaderOptions;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.functional.Try;
import lombok.NonNull;
diff --git a/commons/src/test/java/org/apache/causeway/commons/internal/reflection/AnnotationsTest.java b/commons/src/test/java/org/apache/causeway/commons/internal/reflection/AnnotationsTest.java
index 1f281f7e0a..2ff81026cd 100644
--- a/commons/src/test/java/org/apache/causeway/commons/internal/reflection/AnnotationsTest.java
+++ b/commons/src/test/java/org/apache/causeway/commons/internal/reflection/AnnotationsTest.java
@@ -21,12 +21,13 @@ package org.apache.causeway.commons.internal.reflection;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
-import org.springframework.util.ClassUtils;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.springframework.util.ClassUtils;
+
import org.apache.causeway.commons.internal._Constants;
import lombok.Getter;
diff --git a/commons/src/test/java/org/apache/causeway/commons/internal/reflection/GenericReflectionMagicTest.java b/commons/src/test/java/org/apache/causeway/commons/internal/reflection/GenericReflectionMagicTest.java
index d6db05984a..7040881b00 100644
--- a/commons/src/test/java/org/apache/causeway/commons/internal/reflection/GenericReflectionMagicTest.java
+++ b/commons/src/test/java/org/apache/causeway/commons/internal/reflection/GenericReflectionMagicTest.java
@@ -19,11 +19,12 @@
package org.apache.causeway.commons.internal.reflection;
import org.junit.jupiter.api.Test;
-import org.springframework.core.GenericTypeResolver;
-import org.springframework.core.MethodParameter;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.springframework.core.GenericTypeResolver;
+import org.springframework.core.MethodParameter;
+
import org.apache.causeway.commons.collections.Can;
import lombok.val;
diff --git a/commons/src/test/java/org/apache/causeway/commons/internal/reflection/ReflectTest.java b/commons/src/test/java/org/apache/causeway/commons/internal/reflection/ReflectTest.java
index e7a9884e55..b4c84a960b 100644
--- a/commons/src/test/java/org/apache/causeway/commons/internal/reflection/ReflectTest.java
+++ b/commons/src/test/java/org/apache/causeway/commons/internal/reflection/ReflectTest.java
@@ -24,13 +24,14 @@ import java.util.List;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.springframework.util.ReflectionUtils;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.springframework.util.ReflectionUtils;
+
class ReflectTest {
static class Parent {
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java b/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java
index c8cbeefb01..e34b537f15 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java
@@ -108,7 +108,6 @@ import lombok.Getter;
import lombok.Value;
import lombok.val;
-
/**
* Configuration 'beans' with meta-data (IDE-support).
*
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/DatanucleusConfiguration.java b/core/config/src/main/java/org/apache/causeway/core/config/DatanucleusConfiguration.java
index c21bbb8ab1..514517d527 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/DatanucleusConfiguration.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/DatanucleusConfiguration.java
@@ -18,11 +18,12 @@
*/
package org.apache.causeway.core.config;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.validation.annotation.Validated;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
import lombok.Data;
/**
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/datasources/DataSourceIntrospectionService.java b/core/config/src/main/java/org/apache/causeway/core/config/datasources/DataSourceIntrospectionService.java
index da3a782044..e89e69e50b 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/datasources/DataSourceIntrospectionService.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/datasources/DataSourceIntrospectionService.java
@@ -24,9 +24,10 @@ import java.util.List;
import java.util.Optional;
import java.util.stream.Stream;
+import javax.sql.DataSource;
+
import jakarta.annotation.Priority;
import jakarta.inject.Named;
-import javax.sql.DataSource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/validators/PatternOptionalStringConstraintValidator.java b/core/config/src/main/java/org/apache/causeway/core/config/validators/PatternOptionalStringConstraintValidator.java
index 3328e7a449..4af6143cd7 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/validators/PatternOptionalStringConstraintValidator.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/validators/PatternOptionalStringConstraintValidator.java
@@ -20,12 +20,13 @@ package org.apache.causeway.core.config.validators;
import java.util.Optional;
-import org.hibernate.validator.internal.constraintvalidators.bv.PatternValidator;
-import org.springframework.stereotype.Component;
-
import jakarta.validation.ConstraintValidator;
import jakarta.validation.ConstraintValidatorContext;
+import org.hibernate.validator.internal.constraintvalidators.bv.PatternValidator;
+
+import org.springframework.stereotype.Component;
+
@Component
public class PatternOptionalStringConstraintValidator
implements ConstraintValidator<jakarta.validation.constraints.Pattern, Optional<String>> {
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/CausewayModuleCoreMetamodel.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/CausewayModuleCoreMetamodel.java
index cb6555170a..8c9c9f251b 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/CausewayModuleCoreMetamodel.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/CausewayModuleCoreMetamodel.java
@@ -20,10 +20,6 @@ package org.apache.causeway.core.metamodel;
import java.util.stream.Stream;
-import org.apache.causeway.core.metamodel.services.columnorder.ColumnOrderTxtFileServiceDefault;
-
-import org.apache.causeway.core.metamodel.services.grid.spi.LayoutResourceLoaderDefault;
-
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
@@ -58,12 +54,14 @@ import org.apache.causeway.core.metamodel.services.classsubstitutor.ClassSubstit
import org.apache.causeway.core.metamodel.services.classsubstitutor.ClassSubstitutorForCollections;
import org.apache.causeway.core.metamodel.services.classsubstitutor.ClassSubstitutorForDomainObjects;
import org.apache.causeway.core.metamodel.services.classsubstitutor.ClassSubstitutorRegistry;
+import org.apache.causeway.core.metamodel.services.columnorder.ColumnOrderTxtFileServiceDefault;
import org.apache.causeway.core.metamodel.services.events.MetamodelEventService;
import org.apache.causeway.core.metamodel.services.exceprecog.ExceptionRecognizerForRecoverableException;
import org.apache.causeway.core.metamodel.services.grid.GridLoaderServiceDefault;
import org.apache.causeway.core.metamodel.services.grid.GridServiceDefault;
import org.apache.causeway.core.metamodel.services.grid.bootstrap.GridMarshallerServiceBootstrap;
import org.apache.causeway.core.metamodel.services.grid.bootstrap.GridSystemServiceBootstrap;
+import org.apache.causeway.core.metamodel.services.grid.spi.LayoutResourceLoaderDefault;
import org.apache.causeway.core.metamodel.services.idstringifier.IdStringifierLookupService;
import org.apache.causeway.core.metamodel.services.layout.LayoutServiceDefault;
import org.apache.causeway.core.metamodel.services.metamodel.MetaModelServiceDefault;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/DomainEventHelper.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/DomainEventHelper.java
index 5cbffc426d..dcb962dfaa 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/DomainEventHelper.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/DomainEventHelper.java
@@ -55,8 +55,8 @@ import static org.apache.causeway.commons.internal.reflection._Reflect.predicate
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@RequiredArgsConstructor(staticName = "ofEventService")
@Log4j2
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotationFactory.java
index 766c22c973..b40064923a 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotationFactory.java
@@ -32,6 +32,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.FacetedMethod;
import org.apache.causeway.core.metamodel.facets.actions.homepage.HomePageFacet;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/HiddenFacetForActionLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/HiddenFacetForActionLayoutXml.java
index 39ab3bf49e..b3425ddc39 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/HiddenFacetForActionLayoutXml.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/HiddenFacetForActionLayoutXml.java
@@ -22,6 +22,7 @@ import java.util.Optional;
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.layout.component.ActionLayoutData;
+import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.all.hide.HiddenFacet;
import org.apache.causeway.core.metamodel.facets.members.hidden.HiddenFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/position/ActionPositionFacetFallback.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/position/ActionPositionFacetFallback.java
index 62c07a59f3..b7106ca413 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/position/ActionPositionFacetFallback.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/position/ActionPositionFacetFallback.java
@@ -19,6 +19,7 @@
package org.apache.causeway.core.metamodel.facets.actions.position;
import org.apache.causeway.applib.annotation.ActionLayout;
+import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
public class ActionPositionFacetFallback extends ActionPositionFacetAbstract {
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/named/MemberNamedFacetForStaticMemberName.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/named/MemberNamedFacetForStaticMemberName.java
index 1c9e6def0e..fc2fb8d729 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/named/MemberNamedFacetForStaticMemberName.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/named/MemberNamedFacetForStaticMemberName.java
@@ -18,6 +18,7 @@
*/
package org.apache.causeway.core.metamodel.facets.all.named;
+import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
public class MemberNamedFacetForStaticMemberName
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessorFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessorFactory.java
index 052dc70af9..d68c531d48 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessorFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessorFactory.java
@@ -29,6 +29,7 @@ import org.apache.causeway.core.metamodel.commons.MethodUtil;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
import org.apache.causeway.core.metamodel.facetapi.MethodRemover;
+import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.causeway.core.metamodel.facets.PropertyOrCollectionIdentifyingFacetFactoryAbstract;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/CssClassFacetForCollectionLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/CssClassFacetForCollectionLayoutXml.java
index 7c2fe96f49..ded9a4b9d1 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/CssClassFacetForCollectionLayoutXml.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/CssClassFacetForCollectionLayoutXml.java
@@ -22,6 +22,7 @@ import java.util.Optional;
import org.apache.causeway.applib.layout.component.CollectionLayoutData;
import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.members.cssclass.CssClassFacet;
import org.apache.causeway.core.metamodel.facets.members.cssclass.CssClassFacetSimple;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/HiddenFacetForCollectionLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/HiddenFacetForCollectionLayoutXml.java
index c7262bbbcd..7eddc25b15 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/HiddenFacetForCollectionLayoutXml.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/HiddenFacetForCollectionLayoutXml.java
@@ -22,6 +22,7 @@ import java.util.Optional;
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.layout.component.CollectionLayoutData;
+import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.all.hide.HiddenFacet;
import org.apache.causeway.core.metamodel.facets.members.hidden.HiddenFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/PagedFacetForCollectionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/PagedFacetForCollectionLayoutAnnotation.java
index 2e7555258e..b64869ec0f 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/PagedFacetForCollectionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/PagedFacetForCollectionLayoutAnnotation.java
@@ -18,7 +18,8 @@
*/
package org.apache.causeway.core.metamodel.facets.collections.layout;
-import lombok.val;
+import java.util.Optional;
+
import org.apache.causeway.applib.annotation.CollectionLayout;
import org.apache.causeway.applib.annotation.TableDecorator;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
@@ -26,7 +27,7 @@ import org.apache.causeway.core.metamodel.facets.object.paged.PagedFacet;
import org.apache.causeway.core.metamodel.facets.object.paged.PagedFacetAbstract;
import org.apache.causeway.core.metamodel.facets.object.tabledec.TableDecoratorFacet;
-import java.util.Optional;
+import lombok.val;
public class PagedFacetForCollectionLayoutAnnotation extends PagedFacetAbstract {
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/PagedFacetForCollectionLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/PagedFacetForCollectionLayoutXml.java
index 2f88d757bb..c1c9f91a8c 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/PagedFacetForCollectionLayoutXml.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/PagedFacetForCollectionLayoutXml.java
@@ -21,6 +21,7 @@ package org.apache.causeway.core.metamodel.facets.collections.layout;
import java.util.Optional;
import org.apache.causeway.applib.layout.component.CollectionLayoutData;
+import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.object.paged.PagedFacet;
import org.apache.causeway.core.metamodel.facets.object.paged.PagedFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/TableDecoratorFacetForCollectionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/TableDecoratorFacetForCollectionLayoutAnnotation.java
index 5377d83af1..6aff4c6245 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/TableDecoratorFacetForCollectionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/TableDecoratorFacetForCollectionLayoutAnnotation.java
@@ -19,6 +19,8 @@
*/
package org.apache.causeway.core.metamodel.facets.collections.layout.tabledec;
+import java.util.Optional;
+
import org.apache.causeway.applib.annotation.CollectionLayout;
import org.apache.causeway.applib.annotation.TableDecorator;
import org.apache.causeway.commons.internal.base._Optionals;
@@ -26,8 +28,6 @@ import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.object.tabledec.TableDecoratorFacet;
import org.apache.causeway.core.metamodel.facets.object.tabledec.TableDecoratorFacetAbstract;
-import java.util.Optional;
-
public class TableDecoratorFacetForCollectionLayoutAnnotation
extends TableDecoratorFacetAbstract {
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/parented/ParentedFacetSinceCollectionFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/parented/ParentedFacetSinceCollectionFactory.java
index 4bf7cf6d0e..7a6f0a3fb2 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/parented/ParentedFacetSinceCollectionFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/parented/ParentedFacetSinceCollectionFactory.java
@@ -23,6 +23,7 @@ import jakarta.inject.Inject;
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.facets.collections.CollectionFacet;
import org.apache.causeway.core.metamodel.facets.collections.javautilcollection.CollectionFacetFactory;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/disabled/method/DisableForContextFacetNone.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/disabled/method/DisableForContextFacetNone.java
index e9efc58671..61fad59e59 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/disabled/method/DisableForContextFacetNone.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/disabled/method/DisableForContextFacetNone.java
@@ -21,6 +21,7 @@ package org.apache.causeway.core.metamodel.facets.members.disabled.method;
import java.util.Optional;
import org.apache.causeway.core.metamodel.consent.Consent.VetoReason;
+import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.interactions.UsabilityContext;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/hidden/method/HideForContextFacetNone.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/hidden/method/HideForContextFacetNone.java
index 463804cb27..0ffc81a8a7 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/hidden/method/HideForContextFacetNone.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/hidden/method/HideForContextFacetNone.java
@@ -18,6 +18,7 @@
*/
package org.apache.causeway.core.metamodel.facets.members.hidden.method;
+import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.interactions.VisibilityContext;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/hidden/method/HideForContextFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/hidden/method/HideForContextFacetViaMethodFactory.java
index d857fb2f99..df6f8d1800 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/hidden/method/HideForContextFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/hidden/method/HideForContextFacetViaMethodFactory.java
@@ -23,6 +23,7 @@ import jakarta.inject.Inject;
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants.MemberSupportPrefix;
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.members.support.MemberSupportFacetFactoryAbstract;
import org.apache.causeway.core.metamodel.methods.MethodFinder;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/layout/group/LayoutGroupFacetForLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/layout/group/LayoutGroupFacetForLayoutXml.java
index 4ed1f6f0d6..b148d1b5c8 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/layout/group/LayoutGroupFacetForLayoutXml.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/layout/group/LayoutGroupFacetForLayoutXml.java
@@ -23,6 +23,7 @@ import java.util.Optional;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.layout.component.FieldSet;
+import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import lombok.NonNull;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/command/CommandPublishingFacetForActionFallback.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/command/CommandPublishingFacetForActionFallback.java
index 9c254341e9..4c535a17a5 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/command/CommandPublishingFacetForActionFallback.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/command/CommandPublishingFacetForActionFallback.java
@@ -19,6 +19,7 @@
package org.apache.causeway.core.metamodel.facets.members.publish.command;
import org.apache.causeway.applib.services.inject.ServiceInjector;
+import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
public class CommandPublishingFacetForActionFallback extends CommandPublishingFacetAbstract {
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/choices/enums/ChoicesFacetFromEnumFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/choices/enums/ChoicesFacetFromEnumFactory.java
index e787cfbbaf..452064a0be 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/choices/enums/ChoicesFacetFromEnumFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/choices/enums/ChoicesFacetFromEnumFactory.java
@@ -22,6 +22,7 @@ import jakarta.inject.Inject;
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/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/domainevents/PropertyDomainEventDefaultFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/domainevents/PropertyDomainEventDefaultFacetForDomainObjectAnnotation.java
index 3827e1f7a9..124399d3e8 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/domainevents/PropertyDomainEventDefaultFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/domainevents/PropertyDomainEventDefaultFacetForDomainObjectAnnotation.java
@@ -24,6 +24,7 @@ import org.apache.causeway.applib.events.domain.PropertyDomainEvent;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.DomainEventFacetAbstract;
+import org.apache.causeway.core.metamodel.facets.DomainEventFacetAbstract.EventTypeOrigin;
import org.apache.causeway.core.metamodel.facets.actions.action.invocation.ActionDomainEventFacet;
/**
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/editing/ImmutableFacetFromConfiguration.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/editing/ImmutableFacetFromConfiguration.java
index f9a0a38231..4525d2e9c3 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/editing/ImmutableFacetFromConfiguration.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/editing/ImmutableFacetFromConfiguration.java
@@ -19,6 +19,7 @@
package org.apache.causeway.core.metamodel.facets.object.domainobject.editing;
import org.apache.causeway.core.metamodel.consent.Consent.VetoReason;
+import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.object.immutable.ImmutableFacet;
import org.apache.causeway.core.metamodel.facets.object.immutable.ImmutableFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/BookmarkPolicyFacetForDomainObjectLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/BookmarkPolicyFacetForDomainObjectLayoutXml.java
index de5983adfa..2477348aa4 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/BookmarkPolicyFacetForDomainObjectLayoutXml.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/BookmarkPolicyFacetForDomainObjectLayoutXml.java
@@ -23,6 +23,7 @@ import java.util.Optional;
import org.apache.causeway.applib.annotation.BookmarkPolicy;
import org.apache.causeway.applib.layout.component.DomainObjectLayoutData;
import org.apache.causeway.core.metamodel.facetapi.Facet;
+import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet;
import org.apache.causeway.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/PagedFacetForDomainObjectLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/PagedFacetForDomainObjectLayoutAnnotation.java
index e78b5cdf70..a55a9e3131 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/PagedFacetForDomainObjectLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/PagedFacetForDomainObjectLayoutAnnotation.java
@@ -18,7 +18,8 @@
*/
package org.apache.causeway.core.metamodel.facets.object.domainobjectlayout;
-import lombok.val;
+import java.util.Optional;
+
import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.annotation.TableDecorator;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
@@ -26,7 +27,7 @@ import org.apache.causeway.core.metamodel.facets.object.paged.PagedFacet;
import org.apache.causeway.core.metamodel.facets.object.paged.PagedFacetAbstract;
import org.apache.causeway.core.metamodel.facets.object.tabledec.TableDecoratorFacet;
-import java.util.Optional;
+import lombok.val;
public class PagedFacetForDomainObjectLayoutAnnotation extends PagedFacetAbstract {
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/TableDecoratorFacetForDomainObjectLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/TableDecoratorFacetForDomainObjectLayoutAnnotation.java
index ab8434d0f4..d06c78e9ac 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/TableDecoratorFacetForDomainObjectLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/TableDecoratorFacetForDomainObjectLayoutAnnotation.java
@@ -19,6 +19,8 @@
*/
package org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec;
+import java.util.Optional;
+
import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.annotation.TableDecorator;
import org.apache.causeway.commons.internal.base._Optionals;
@@ -26,8 +28,6 @@ import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.object.tabledec.TableDecoratorFacet;
import org.apache.causeway.core.metamodel.facets.object.tabledec.TableDecoratorFacetAbstract;
-import java.util.Optional;
-
public class TableDecoratorFacetForDomainObjectLayoutAnnotation
extends TableDecoratorFacetAbstract {
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/entity/_EntityFacetForTesting.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/entity/_EntityFacetForTesting.java
index 38ba7c8848..44c6e26ffb 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/entity/_EntityFacetForTesting.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/entity/_EntityFacetForTesting.java
@@ -29,6 +29,7 @@ import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.config.beans.PersistenceStack;
import org.apache.causeway.core.metamodel.facetapi.Facet;
+import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.object.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/ignore/javalang/RemoveMethodsFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/ignore/javalang/RemoveMethodsFacetFactory.java
index 4b2af8327d..864bd51bd2 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/ignore/javalang/RemoveMethodsFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/ignore/javalang/RemoveMethodsFacetFactory.java
@@ -27,6 +27,7 @@ import org.apache.causeway.commons.internal.reflection._Reflect;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
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.FacetFactoryAbstract;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/objectvalidprops/impl/ObjectValidPropertiesFacetImplFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/objectvalidprops/impl/ObjectValidPropertiesFacetImplFactory.java
index 512ffb1028..856c77dc71 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/objectvalidprops/impl/ObjectValidPropertiesFacetImplFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/objectvalidprops/impl/ObjectValidPropertiesFacetImplFactory.java
@@ -22,6 +22,7 @@ import jakarta.inject.Inject;
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;
public class ObjectValidPropertiesFacetImplFactory
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForSerializableInterface.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForSerializableInterface.java
index b0dcf7a6e1..1056eb3f17 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForSerializableInterface.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForSerializableInterface.java
@@ -29,6 +29,7 @@ import java.util.Optional;
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.commons.internal.base._Bytes;
import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/daterenderedadjust/DateRenderAdjustFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/daterenderedadjust/DateRenderAdjustFacetAbstract.java
index 4a8f98a0f6..1d32eeafd2 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/daterenderedadjust/DateRenderAdjustFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/daterenderedadjust/DateRenderAdjustFacetAbstract.java
@@ -21,6 +21,7 @@ package org.apache.causeway.core.metamodel.facets.objectvalue.daterenderedadjust
import java.util.function.BiConsumer;
import org.apache.causeway.core.metamodel.facetapi.Facet;
+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;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/digits/MaxFractionalDigitsFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/digits/MaxFractionalDigitsFacet.java
index 4b513184ea..da30a7738f 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/digits/MaxFractionalDigitsFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/digits/MaxFractionalDigitsFacet.java
@@ -18,11 +18,11 @@
*/
package org.apache.causeway.core.metamodel.facets.objectvalue.digits;
+import jakarta.validation.constraints.Digits;
+
import org.apache.causeway.applib.annotation.ValueSemantics;
import org.apache.causeway.core.metamodel.facetapi.Facet;
-import jakarta.validation.constraints.Digits;
-
/**
* The maximum allowed number of digits to the right of the decimal place (fractional part)
* for this number.
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/labelat/LabelAtFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/labelat/LabelAtFacetAbstract.java
index 40fe33231e..4aa5e0fdbe 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/labelat/LabelAtFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/labelat/LabelAtFacetAbstract.java
@@ -22,6 +22,7 @@ import java.util.function.BiConsumer;
import org.apache.causeway.applib.annotation.LabelPosition;
import org.apache.causeway.core.metamodel.facetapi.Facet;
+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;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/mandatory/MandatoryFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/mandatory/MandatoryFacetAbstract.java
index 0ab89fb336..323c855b23 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/mandatory/MandatoryFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/mandatory/MandatoryFacetAbstract.java
@@ -32,6 +32,7 @@ import org.apache.causeway.commons.internal.primitives._Ints;
import org.apache.causeway.commons.internal.primitives._Ints.Range;
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants;
import org.apache.causeway.core.metamodel.facetapi.Facet;
+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.interactions.ActionArgValidityContext;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/choices/ActionParameterChoicesFacetFromAction.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/choices/ActionParameterChoicesFacetFromAction.java
index 73d244099e..038e1990f3 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/choices/ActionParameterChoicesFacetFromAction.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/choices/ActionParameterChoicesFacetFromAction.java
@@ -23,6 +23,7 @@ import java.util.Optional;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
+import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.actions.action.choicesfrom.ChoicesFromFacet;
import org.apache.causeway.core.metamodel.facets.collections.CollectionFacet;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java
index ad3670ac9c..08b400420c 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java
@@ -24,6 +24,7 @@ import jakarta.validation.constraints.Pattern;
import org.apache.causeway.applib.annotation.Parameter;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
+import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessParameterContext;
import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.causeway.core.metamodel.facets.param.parameter.depdef.ParameterDependentDefaultsFacet;
import org.apache.causeway.core.metamodel.facets.param.parameter.fileaccept.FileAcceptFacetForParameterAnnotation;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/support/ActionParameterSupportFacetFactoryAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/support/ActionParameterSupportFacetFactoryAbstract.java
index e4988d6dbc..dc9a90d024 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/support/ActionParameterSupportFacetFactoryAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/support/ActionParameterSupportFacetFactoryAbstract.java
@@ -24,6 +24,7 @@ import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants.MemberSupportPrefix;
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.FacetedMethodParameter;
import org.apache.causeway.core.metamodel.facets.ParameterSupport;
import org.apache.causeway.core.metamodel.facets.ParameterSupport.ParamSupportingMethodSearchRequest;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethodFactory.java
index de2109202c..7f175c2d6b 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethodFactory.java
@@ -23,6 +23,7 @@ import jakarta.inject.Inject;
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants.MemberSupportPrefix;
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.members.support.MemberSupportFacetFactoryAbstract;
import org.apache.causeway.core.metamodel.methods.MethodFinder;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/mandatory/dflt/MandatoryFacetOnProperyDefaultFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/mandatory/dflt/MandatoryFacetOnProperyDefaultFactory.java
index 5badcb5ff8..1872111557 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/mandatory/dflt/MandatoryFacetOnProperyDefaultFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/mandatory/dflt/MandatoryFacetOnProperyDefaultFactory.java
@@ -24,6 +24,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.facets.FacetFactory;
+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.mandatory.MandatoryFacet;
import org.apache.causeway.core.metamodel.facets.objectvalue.mandatory.MandatoryFacetDefault;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/mandatory/MandatoryFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/mandatory/MandatoryFacetForPropertyAnnotation.java
index 572a39e5d0..3c6e560590 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/mandatory/MandatoryFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/mandatory/MandatoryFacetForPropertyAnnotation.java
@@ -22,6 +22,7 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.commons.internal.reflection._MethodFacades.MethodFacade;
import org.apache.causeway.core.metamodel.facetapi.Facet;
+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.MandatoryFacet;
import org.apache.causeway.core.metamodel.facets.objectvalue.mandatory.MandatoryFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/HiddenFacetForPropertyLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/HiddenFacetForPropertyLayoutXml.java
index 2e3ded06dd..a1e9be730a 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/HiddenFacetForPropertyLayoutXml.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/HiddenFacetForPropertyLayoutXml.java
@@ -22,6 +22,7 @@ import java.util.Optional;
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.layout.component.PropertyLayoutData;
+import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.all.hide.HiddenFacet;
import org.apache.causeway.core.metamodel.facets.members.hidden.HiddenFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/MemberDescribedFacetForPropertyLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/MemberDescribedFacetForPropertyLayoutXml.java
index 9919682538..f3cc4d2bf0 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/MemberDescribedFacetForPropertyLayoutXml.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/MemberDescribedFacetForPropertyLayoutXml.java
@@ -22,6 +22,7 @@ import java.util.Optional;
import org.apache.causeway.applib.layout.component.PropertyLayoutData;
import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.all.described.MemberDescribedFacet;
import org.apache.causeway.core.metamodel.facets.all.described.MemberDescribedFacetWithStaticTextAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/RenderedAdjustedFacetForPropertyLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/RenderedAdjustedFacetForPropertyLayoutXml.java
index 0bda7c5cb7..594f25d943 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/RenderedAdjustedFacetForPropertyLayoutXml.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/RenderedAdjustedFacetForPropertyLayoutXml.java
@@ -21,6 +21,7 @@ package org.apache.causeway.core.metamodel.facets.properties.propertylayout;
import java.util.Optional;
import org.apache.causeway.applib.layout.component.PropertyLayoutData;
+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.daterenderedadjust.DateRenderAdjustFacet;
import org.apache.causeway.core.metamodel.facets.objectvalue.daterenderedadjust.DateRenderAdjustFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/typicallen/fromtype/TypicalLengthFacetOnPropertyFromType.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/typicallen/fromtype/TypicalLengthFacetOnPropertyFromType.java
index 9abe7bb098..4f7728170f 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/typicallen/fromtype/TypicalLengthFacetOnPropertyFromType.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/typicallen/fromtype/TypicalLengthFacetOnPropertyFromType.java
@@ -20,6 +20,7 @@ package org.apache.causeway.core.metamodel.facets.properties.typicallen.fromtype
import java.util.function.BiConsumer;
+import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.FacetedMethod;
import org.apache.causeway.core.metamodel.facets.objectvalue.multiline.MultiLineFacet;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/validating/method/PropertyValidateFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/validating/method/PropertyValidateFacetViaMethodFactory.java
index e7e8177c67..ca5480dda2 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/validating/method/PropertyValidateFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/validating/method/PropertyValidateFacetViaMethodFactory.java
@@ -23,6 +23,7 @@ import jakarta.inject.Inject;
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants.MemberSupportPrefix;
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.members.support.MemberSupportFacetFactoryAbstract;
import org.apache.causeway.core.metamodel.methods.MethodFinder;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/value/semantics/MaxFractionalDigitsFacetFromJavaxValidationDigitsAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/value/semantics/MaxFractionalDigitsFacetFromJavaxValidationDigitsAnnotation.java
index 4535c0de57..6bb6acbfad 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/value/semantics/MaxFractionalDigitsFacetFromJavaxValidationDigitsAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/value/semantics/MaxFractionalDigitsFacetFromJavaxValidationDigitsAnnotation.java
@@ -20,12 +20,12 @@ package org.apache.causeway.core.metamodel.facets.value.semantics;
import java.util.Optional;
+import jakarta.validation.constraints.Digits;
+
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.objectvalue.digits.MaxFractionalDigitsFacet;
import org.apache.causeway.core.metamodel.facets.objectvalue.digits.MaxFractionalDigitsFacetAbstract;
-import jakarta.validation.constraints.Digits;
-
public class MaxFractionalDigitsFacetFromJavaxValidationDigitsAnnotation
extends MaxFractionalDigitsFacetAbstract {
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/value/semantics/MaxTotalDigitsFacetFromJavaxValidationDigitsAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/value/semantics/MaxTotalDigitsFacetFromJavaxValidationDigitsAnnotation.java
index a5e16a9e19..95c994a1bf 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/value/semantics/MaxTotalDigitsFacetFromJavaxValidationDigitsAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/value/semantics/MaxTotalDigitsFacetFromJavaxValidationDigitsAnnotation.java
@@ -20,12 +20,12 @@ package org.apache.causeway.core.metamodel.facets.value.semantics;
import java.util.Optional;
+import jakarta.validation.constraints.Digits;
+
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.objectvalue.digits.MaxTotalDigitsFacet;
import org.apache.causeway.core.metamodel.facets.objectvalue.digits.MaxTotalDigitsFacetAbstract;
-import jakarta.validation.constraints.Digits;
-
public class MaxTotalDigitsFacetFromJavaxValidationDigitsAnnotation
extends MaxTotalDigitsFacetAbstract {
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectEntityBookmarked.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectEntityBookmarked.java
index 6e811d6cff..90123ab7e6 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectEntityBookmarked.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectEntityBookmarked.java
@@ -30,6 +30,7 @@ import org.apache.causeway.commons.internal.debug._XrayEvent;
import org.apache.causeway.commons.internal.debug.xray.XrayUi;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.metamodel.facets.object.entity.EntityFacet;
+import org.apache.causeway.core.metamodel.object.ManagedObject.Specialization;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import lombok.NonNull;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectEntityHybrid.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectEntityHybrid.java
index 5414dc0c02..f550d11f8a 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectEntityHybrid.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectEntityHybrid.java
@@ -25,6 +25,7 @@ import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.repository.EntityState;
import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.causeway.commons.internal.base._Blackhole;
+import org.apache.causeway.core.metamodel.object.ManagedObject.Specialization;
import lombok.NonNull;
import lombok.SneakyThrows;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectEntityTransient.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectEntityTransient.java
index 5d8a63b9b9..0dd4cea3e1 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectEntityTransient.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectEntityTransient.java
@@ -21,6 +21,7 @@ package org.apache.causeway.core.metamodel.object;
import org.apache.causeway.applib.services.repository.EntityState;
import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.causeway.core.metamodel.facets.object.entity.EntityFacet;
+import org.apache.causeway.core.metamodel.object.ManagedObject.Specialization;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import lombok.Getter;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectMixin.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectMixin.java
index f7dcb7a7a6..0474683b64 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectMixin.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectMixin.java
@@ -20,6 +20,7 @@ package org.apache.causeway.core.metamodel.object;
import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
+import org.apache.causeway.core.metamodel.object.ManagedObject.Specialization;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import lombok.Getter;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/objectmanager/memento/_RecreatableLookup.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/objectmanager/memento/_RecreatableLookup.java
index 4451eabe1c..c98f123712 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/objectmanager/memento/_RecreatableLookup.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/objectmanager/memento/_RecreatableLookup.java
@@ -23,6 +23,7 @@ import org.springframework.lang.Nullable;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.object.ManagedObject;
+
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/columnorder/ColumnOrderTxtFileServiceDefault.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/columnorder/ColumnOrderTxtFileServiceDefault.java
index 70638e7f6d..b6b29b80ff 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/columnorder/ColumnOrderTxtFileServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/columnorder/ColumnOrderTxtFileServiceDefault.java
@@ -18,13 +18,13 @@
*/
package org.apache.causeway.core.metamodel.services.columnorder;
-import lombok.RequiredArgsConstructor;
-import lombok.val;
-
import jakarta.annotation.Priority;
import jakarta.inject.Inject;
import jakarta.inject.Named;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Service;
+
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.annotation.Programmatic;
import org.apache.causeway.applib.services.columnorder.ColumnOrderTxtFileService;
@@ -37,8 +37,8 @@ import org.apache.causeway.core.metamodel.spec.feature.ObjectFeature;
import org.apache.causeway.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Service;
+import lombok.RequiredArgsConstructor;
+import lombok.val;
/**
* since 2.0 {@index}
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/GridSystemServiceAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/GridSystemServiceAbstract.java
index bc6a845061..3cfa2e745d 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/GridSystemServiceAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/GridSystemServiceAbstract.java
@@ -41,8 +41,8 @@ import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetUtil;
import org.apache.causeway.core.metamodel.facets.actions.layout.ActionPositionFacetForActionLayoutXml;
-import org.apache.causeway.core.metamodel.facets.actions.layout.FaFacetForActionLayoutXml;
import org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFacetForActionLayoutXml;
+import org.apache.causeway.core.metamodel.facets.actions.layout.FaFacetForActionLayoutXml;
import org.apache.causeway.core.metamodel.facets.actions.layout.HiddenFacetForActionLayoutXml;
import org.apache.causeway.core.metamodel.facets.actions.layout.MemberDescribedFacetForActionLayoutXml;
import org.apache.causeway.core.metamodel.facets.actions.layout.MemberNamedFacetForActionLayoutXml;
@@ -60,8 +60,8 @@ import org.apache.causeway.core.metamodel.facets.members.layout.group.GroupIdAnd
import org.apache.causeway.core.metamodel.facets.members.layout.group.LayoutGroupFacetForLayoutXml;
import org.apache.causeway.core.metamodel.facets.members.layout.order.LayoutOrderFacetForLayoutXml;
import org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.BookmarkPolicyFacetForDomainObjectLayoutXml;
-import org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.FaFacetForDomainObjectLayoutXml;
import org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.CssClassFacetForDomainObjectLayoutXml;
+import org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.FaFacetForDomainObjectLayoutXml;
import org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.ObjectDescribedFacetForDomainObjectLayoutXml;
import org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.ObjectNamedFacetForDomainObjectLayoutXml;
import org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.TableDecoratorFacetForDomainObjectLayoutXml;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/metamodel/MetaModelServiceDefault.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/metamodel/MetaModelServiceDefault.java
index adf4f828d2..07af5efda9 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/metamodel/MetaModelServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/metamodel/MetaModelServiceDefault.java
@@ -29,7 +29,6 @@ import java.util.stream.Collectors;
import jakarta.annotation.Priority;
import jakarta.inject.Inject;
import jakarta.inject.Named;
-import org.apache.causeway.commons.collections.Can;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.lang.Nullable;
@@ -48,6 +47,7 @@ import org.apache.causeway.applib.services.metamodel.DomainMember;
import org.apache.causeway.applib.services.metamodel.DomainModel;
import org.apache.causeway.applib.services.metamodel.MetaModelService;
import org.apache.causeway.applib.services.metamodel.objgraph.ObjectGraph;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/tablecol/TableColumnOrderServiceUsingTxtFile.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/tablecol/TableColumnOrderServiceUsingTxtFile.java
index 7d64fca7fe..1110b3932c 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/tablecol/TableColumnOrderServiceUsingTxtFile.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/tablecol/TableColumnOrderServiceUsingTxtFile.java
@@ -25,11 +25,10 @@ import java.util.Optional;
import jakarta.annotation.Priority;
import jakarta.inject.Named;
-import org.apache.causeway.applib.annotation.CollectionLayout;
-
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
+import org.apache.causeway.applib.annotation.CollectionLayout;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.services.tablecol.TableColumnOrderService;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/SpecificationLoader.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/SpecificationLoader.java
index 5470e3dde4..918de935c8 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/SpecificationLoader.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/SpecificationLoader.java
@@ -33,10 +33,10 @@ import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.metamodel.progmodel.ProgrammingModel;
import org.apache.causeway.core.metamodel.services.classsubstitutor.ClassSubstitutor;
+import org.apache.causeway.core.metamodel.spec.IntrospectionState;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
import org.apache.causeway.core.metamodel.spec.feature.ObjectFeature;
-import org.apache.causeway.core.metamodel.spec.IntrospectionState;
import org.apache.causeway.core.metamodel.specloader.validator.MetaModelValidator;
import org.apache.causeway.core.metamodel.specloader.validator.ValidationFailure;
import org.apache.causeway.core.metamodel.specloader.validator.ValidationFailures;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/SpecificationLoaderDefault.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/SpecificationLoaderDefault.java
index aed4d52264..8d7bb1b25f 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/SpecificationLoaderDefault.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/SpecificationLoaderDefault.java
@@ -74,11 +74,11 @@ import org.apache.causeway.core.metamodel.progmodels.dflt.ProgrammingModelFacets
import org.apache.causeway.core.metamodel.services.classsubstitutor.ClassSubstitutor;
import org.apache.causeway.core.metamodel.services.classsubstitutor.ClassSubstitutor.Substitution;
import org.apache.causeway.core.metamodel.services.classsubstitutor.ClassSubstitutorRegistry;
+import org.apache.causeway.core.metamodel.spec.IntrospectionState;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
import org.apache.causeway.core.metamodel.specloader.facetprocessor.FacetProcessor;
import org.apache.causeway.core.metamodel.specloader.postprocessor.PostProcessor;
-import org.apache.causeway.core.metamodel.spec.IntrospectionState;
import org.apache.causeway.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
import org.apache.causeway.core.metamodel.specloader.validator.ValidationFailure;
import org.apache.causeway.core.metamodel.specloader.validator.ValidationFailures;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
index c0054d9abb..3d4bc6cf29 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
@@ -29,7 +29,6 @@ import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import org.apache.causeway.core.metamodel.spec.IntrospectionState;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.annotation.Action;
@@ -55,6 +54,7 @@ import org.apache.causeway.core.metamodel.facets.FacetedMethod;
import org.apache.causeway.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.causeway.core.metamodel.facets.object.mixin.MixinFacet;
import org.apache.causeway.core.metamodel.services.classsubstitutor.ClassSubstitutorRegistry;
+import org.apache.causeway.core.metamodel.spec.IntrospectionState;
import org.apache.causeway.core.metamodel.specloader.facetprocessor.FacetProcessor;
import org.apache.causeway.core.metamodel.specloader.typeextract.TypeExtractor;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index 30ec4feabc..a53e0287ca 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -26,10 +26,6 @@ import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import org.apache.causeway.core.metamodel.spec.IntrospectionState;
-
-import org.apache.causeway.core.metamodel.util.Facets;
-
import org.springframework.util.ClassUtils;
import org.apache.causeway.applib.Identifier;
@@ -85,6 +81,8 @@ import org.apache.causeway.core.metamodel.interactions.ObjectValidityContext;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.ManagedObjects;
import org.apache.causeway.core.metamodel.spec.ActionScope;
+import org.apache.causeway.core.metamodel.spec.Hierarchical.Depth;
+import org.apache.causeway.core.metamodel.spec.IntrospectionState;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.spec.feature.MixedIn;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
@@ -92,6 +90,7 @@ import org.apache.causeway.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.causeway.core.metamodel.spec.feature.ObjectMember;
import org.apache.causeway.core.metamodel.specloader.facetprocessor.FacetProcessor;
import org.apache.causeway.core.metamodel.specloader.postprocessor.PostProcessor;
+import org.apache.causeway.core.metamodel.util.Facets;
import static org.apache.causeway.commons.internal.base._NullSafe.stream;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
index bab9f25aab..3517ccf1cf 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
@@ -53,6 +53,7 @@ import org.apache.causeway.core.metamodel.facets.object.mixin.MixinFacetAbstract
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.services.classsubstitutor.ClassSubstitutorRegistry;
import org.apache.causeway.core.metamodel.spec.ActionScope;
+import org.apache.causeway.core.metamodel.spec.IntrospectionState;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.spec.feature.MixedIn;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
@@ -61,7 +62,6 @@ import org.apache.causeway.core.metamodel.spec.feature.ObjectMember;
import org.apache.causeway.core.metamodel.specloader.facetprocessor.FacetProcessor;
import org.apache.causeway.core.metamodel.specloader.postprocessor.PostProcessor;
import org.apache.causeway.core.metamodel.specloader.specimpl.FacetedMethodsBuilder;
-import org.apache.causeway.core.metamodel.spec.IntrospectionState;
import org.apache.causeway.core.metamodel.specloader.specimpl.ObjectActionDefault;
import org.apache.causeway.core.metamodel.specloader.specimpl.ObjectSpecificationAbstract;
import org.apache.causeway.core.metamodel.specloader.specimpl.OneToManyAssociationDefault;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/dflt/_AssociationsAsColumns.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/dflt/_AssociationsAsColumns.java
index 515431c9e8..3bbd3e0277 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/dflt/_AssociationsAsColumns.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/dflt/_AssociationsAsColumns.java
@@ -40,14 +40,14 @@ import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.spec.feature.MixedIn;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAssociation;
+import static org.apache.causeway.applib.annotation.Where.PARENTED_TABLES;
+import static org.apache.causeway.applib.annotation.Where.STANDALONE_TABLES;
+
import lombok.Getter;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.val;
-import static org.apache.causeway.applib.annotation.Where.PARENTED_TABLES;
-import static org.apache.causeway.applib.annotation.Where.STANDALONE_TABLES;
-
@RequiredArgsConstructor
class _AssociationsAsColumns implements HasMetaModelContext {
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BigDecimalValueSemantics.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BigDecimalValueSemantics.java
index bd782dfde2..c3682de7f9 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BigDecimalValueSemantics.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BigDecimalValueSemantics.java
@@ -28,8 +28,6 @@ import jakarta.annotation.Priority;
import jakarta.inject.Inject;
import jakarta.inject.Named;
-import org.apache.causeway.core.config.CausewayConfiguration;
-
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
@@ -41,6 +39,7 @@ import org.apache.causeway.applib.value.semantics.ValueDecomposition;
import org.apache.causeway.applib.value.semantics.ValueSemanticsAbstract;
import org.apache.causeway.applib.value.semantics.ValueSemanticsProvider;
import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
import org.apache.causeway.core.metamodel.util.Facets;
import org.apache.causeway.schema.common.v2.ValueType;
diff --git a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/MetaModelContext_configTest.java b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/MetaModelContext_configTest.java
index bccc4cd4a6..cfaaba5bfa 100644
--- a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/MetaModelContext_configTest.java
+++ b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/MetaModelContext_configTest.java
@@ -20,10 +20,11 @@ package org.apache.causeway.core.metamodel;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.springframework.core.env.ConfigurableEnvironment;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.springframework.core.env.ConfigurableEnvironment;
+
import org.apache.causeway.core.metamodel._testing.MetaModelContext_forTesting;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
diff --git a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
index ecfc5e78b2..7517ff6fd1 100644
--- a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
@@ -22,15 +22,6 @@ import java.util.UUID;
import jakarta.inject.Named;
-import lombok.val;
-
-import org.apache.causeway.core.metamodel._testing.MetaModelContext_forTesting;
-import org.apache.causeway.core.metamodel.facets.AbstractTestWithMetaModelContext;
-import org.apache.causeway.core.metamodel.progmodel.ProgrammingModelInitFilterDefault;
-import org.apache.causeway.core.metamodel.progmodels.dflt.ProgrammingModelFacetsJava11;
-import org.apache.causeway.core.metamodel.spec.IntrospectionState;
-import org.apache.causeway.core.metamodel.specloader.validator.ValidationFailures;
-
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -49,7 +40,9 @@ import org.apache.causeway.applib.annotation.DomainService;
import org.apache.causeway.applib.id.LogicalType;
import org.apache.causeway.applib.mixins.system.HasInteractionId;
import org.apache.causeway.core.config.metamodel.facets.DomainObjectConfigOptions;
+import org.apache.causeway.core.metamodel._testing.MetaModelContext_forTesting;
import org.apache.causeway.core.metamodel.facetapi.Facet;
+import org.apache.causeway.core.metamodel.facets.AbstractTestWithMetaModelContext;
import org.apache.causeway.core.metamodel.facets.FacetFactoryTestAbstract;
import org.apache.causeway.core.metamodel.facets.object.autocomplete.AutoCompleteFacet;
import org.apache.causeway.core.metamodel.facets.object.domainobject.autocomplete.AutoCompleteFacetForDomainObjectAnnotation;
@@ -66,6 +59,12 @@ import org.apache.causeway.core.metamodel.facets.object.publish.entitychange.Ent
import org.apache.causeway.core.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.causeway.core.metamodel.facets.object.viewmodel.ViewModelFacetForDomainObjectAnnotation;
import org.apache.causeway.core.metamodel.facets.objectvalue.choices.ChoicesFacet;
+import org.apache.causeway.core.metamodel.progmodel.ProgrammingModelInitFilterDefault;
+import org.apache.causeway.core.metamodel.progmodels.dflt.ProgrammingModelFacetsJava11;
+import org.apache.causeway.core.metamodel.spec.IntrospectionState;
+import org.apache.causeway.core.metamodel.specloader.validator.ValidationFailures;
+
+import lombok.val;
class DomainObjectAnnotationFacetFactoryTest
extends FacetFactoryTestAbstract {
diff --git a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactoryTest.java
index 20c3e3bbb0..a58c5e358b 100644
--- a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactoryTest.java
@@ -23,13 +23,14 @@ import java.util.stream.Stream;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
-import org.springframework.lang.Nullable;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.functional.Try;
import org.apache.causeway.commons.internal._Constants;
import org.apache.causeway.core.metamodel.facets.FacetFactoryTestAbstract;
diff --git a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactoryTest.java
index 1881a94bc2..e9c7559a52 100644
--- a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactoryTest.java
@@ -23,13 +23,14 @@ import java.util.Optional;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.springframework.lang.Nullable;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.applib.ViewModel;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.io.UrlUtils;
diff --git a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactoryTest.java
index a53bf534ec..7132365b29 100644
--- a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactoryTest.java
@@ -23,7 +23,6 @@ import java.util.regex.Pattern;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.springframework.lang.Nullable;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -31,6 +30,8 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Parameter;
import org.apache.causeway.applib.spec.Specification;
diff --git a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/param/parameter/ParameterOptionalityOrNullableAnnotationOnParameterFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/param/parameter/ParameterOptionalityOrNullableAnnotationOnParameterFacetFactoryTest.java
index e5a984f266..48eb5a418d 100644
--- a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/param/parameter/ParameterOptionalityOrNullableAnnotationOnParameterFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/param/parameter/ParameterOptionalityOrNullableAnnotationOnParameterFacetFactoryTest.java
@@ -20,12 +20,13 @@ package org.apache.causeway.core.metamodel.facets.param.parameter;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.springframework.lang.Nullable;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Parameter;
import org.apache.causeway.core.metamodel.facetapi.Facet;
diff --git a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/properties/property/PropertyOptionalityOrNullableAnnotationOnPropertyFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/properties/property/PropertyOptionalityOrNullableAnnotationOnPropertyFacetFactoryTest.java
index 780bff3167..850b6f76a1 100644
--- a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/properties/property/PropertyOptionalityOrNullableAnnotationOnPropertyFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/properties/property/PropertyOptionalityOrNullableAnnotationOnPropertyFacetFactoryTest.java
@@ -20,12 +20,13 @@ package org.apache.causeway.core.metamodel.facets.properties.property;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.springframework.lang.Nullable;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.core.metamodel.facetapi.Facet;
diff --git a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/value/BlobValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/value/BlobValueSemanticsProviderTest.java
index ec50700876..27c844be7b 100644
--- a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/value/BlobValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/value/BlobValueSemanticsProviderTest.java
@@ -24,8 +24,8 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.causeway.applib.value.Blob;
-import org.apache.causeway.core.metamodel.valuesemantics.BlobValueSemantics;
import org.apache.causeway.commons.internal.testing._DocumentTester;
+import org.apache.causeway.core.metamodel.valuesemantics.BlobValueSemantics;
class BlobValueSemanticsProviderTest
extends ValueSemanticsProviderAbstractTestCase<Blob> {
diff --git a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/value/ClobValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/value/ClobValueSemanticsProviderTest.java
index fd57594412..81c3ecf004 100644
--- a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/value/ClobValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/value/ClobValueSemanticsProviderTest.java
@@ -18,13 +18,13 @@
*/
package org.apache.causeway.core.metamodel.facets.value;
-import org.apache.causeway.commons.internal.testing._DocumentTester;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.causeway.applib.value.Clob;
+import org.apache.causeway.commons.internal.testing._DocumentTester;
import org.apache.causeway.core.metamodel.valuesemantics.ClobValueSemantics;
class ClobValueSemanticsProviderTest
diff --git a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/services/ServiceInjectorDefaultTest_usingFields.java b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/services/ServiceInjectorDefaultTest_usingFields.java
index 5a7f155bd8..e0c4c6b4e7 100644
--- a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/services/ServiceInjectorDefaultTest_usingFields.java
+++ b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/services/ServiceInjectorDefaultTest_usingFields.java
@@ -23,6 +23,10 @@ import jakarta.inject.Singleton;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.any;
+
import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Bean;
@@ -31,9 +35,6 @@ import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.annotation.DirtiesContext.ClassMode;
import org.springframework.test.context.ActiveProfiles;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.any;
-
import org.apache.causeway.applib.services.inject.ServiceInjector;
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.core.config.CausewayModuleCoreConfig;
diff --git a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/services/ServiceInjectorDefaultTest_validateServices_happy.java b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/services/ServiceInjectorDefaultTest_validateServices_happy.java
index b56c99a093..4029c8b82f 100644
--- a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/services/ServiceInjectorDefaultTest_validateServices_happy.java
+++ b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/services/ServiceInjectorDefaultTest_validateServices_happy.java
@@ -21,6 +21,9 @@ package org.apache.causeway.core.metamodel.services;
import jakarta.inject.Inject;
import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Component;
@@ -28,8 +31,6 @@ import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.annotation.DirtiesContext.ClassMode;
import org.springframework.test.context.ActiveProfiles;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import org.apache.causeway.applib.annotation.DomainService;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
import org.apache.causeway.core.config.CausewayModuleCoreConfig;
diff --git a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/services/ServiceInjectorLegacyTest.java b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/services/ServiceInjectorLegacyTest.java
index 5ee4a9e822..5a2f4e7d0f 100644
--- a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/services/ServiceInjectorLegacyTest.java
+++ b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/services/ServiceInjectorLegacyTest.java
@@ -20,6 +20,7 @@ package org.apache.causeway.core.metamodel.services;
import org.junit.jupiter.api.Disabled;
import org.mockito.Mockito;
+
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;
diff --git a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/spec/TypeOfAnyCardinalityTest.java b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/spec/TypeOfAnyCardinalityTest.java
index 8756c107e3..70e859ccd0 100644
--- a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/spec/TypeOfAnyCardinalityTest.java
+++ b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/spec/TypeOfAnyCardinalityTest.java
@@ -23,11 +23,12 @@ import java.util.Set;
import java.util.SortedSet;
import org.junit.jupiter.api.Test;
-import org.springframework.core.ResolvableType;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import org.springframework.core.ResolvableType;
+
import org.apache.causeway.commons.internal.reflection._GenericResolver;
import org.apache.causeway.commons.semantics.CollectionSemantics;
diff --git a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/specloader/specimpl/IntrospectionState_comparable_Test.java b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/specloader/specimpl/IntrospectionState_comparable_Test.java
index 4ff76803e7..00e41cd040 100644
--- a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/specloader/specimpl/IntrospectionState_comparable_Test.java
+++ b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/specloader/specimpl/IntrospectionState_comparable_Test.java
@@ -18,8 +18,6 @@
*/
package org.apache.causeway.core.metamodel.specloader.specimpl;
-import org.apache.causeway.core.metamodel.spec.IntrospectionState;
-
import org.hamcrest.Description;
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
@@ -28,6 +26,8 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.apache.causeway.core.metamodel.spec.IntrospectionState;
+
public class IntrospectionState_comparable_Test {
@Test
diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/bookmarks/BookmarkServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/bookmarks/BookmarkServiceDefault.java
index 29ae76d6b8..28420f2aa8 100644
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/bookmarks/BookmarkServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/bookmarks/BookmarkServiceDefault.java
@@ -27,21 +27,19 @@ import jakarta.annotation.Priority;
import jakarta.inject.Inject;
import jakarta.inject.Named;
-import org.apache.causeway.applib.id.LogicalType;
-import org.apache.causeway.applib.services.metamodel.MetaModelService;
-
-import org.apache.causeway.commons.collections.Can;
-
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.lang.Nullable;
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.exceptions.unrecoverable.ObjectNotFoundException;
+import org.apache.causeway.applib.id.LogicalType;
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.bookmark.BookmarkHolder;
import org.apache.causeway.applib.services.bookmark.BookmarkService;
+import org.apache.causeway.applib.services.metamodel.MetaModelService;
import org.apache.causeway.applib.services.wrapper.WrapperFactory;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/menubars/bootstrap/MenuBarsServiceBootstrap.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/menubars/bootstrap/MenuBarsServiceBootstrap.java
index f03b15604b..da41fa66cb 100644
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/menubars/bootstrap/MenuBarsServiceBootstrap.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/menubars/bootstrap/MenuBarsServiceBootstrap.java
@@ -54,8 +54,8 @@ import org.apache.causeway.commons.internal.collections._Sets;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence;
import org.apache.causeway.core.metamodel.facetapi.FacetUtil;
-import org.apache.causeway.core.metamodel.facets.actions.layout.FaFacetForMenuBarXml;
import org.apache.causeway.core.metamodel.facets.actions.layout.CssClassFacetForMenuBarXml;
+import org.apache.causeway.core.metamodel.facets.actions.layout.FaFacetForMenuBarXml;
import org.apache.causeway.core.metamodel.facets.actions.layout.MemberDescribedFacetForMenuBarXml;
import org.apache.causeway.core.metamodel.facets.actions.layout.MemberNamedFacetForMenuBarXml;
import org.apache.causeway.core.metamodel.facets.actions.notinservicemenu.NotInServiceMenuFacet;
diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/message/MessageServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/message/MessageServiceDefault.java
index ae8e744528..c5a1fcf4c2 100644
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/message/MessageServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/message/MessageServiceDefault.java
@@ -25,13 +25,12 @@ import jakarta.inject.Inject;
import jakarta.inject.Named;
import jakarta.inject.Provider;
-import org.apache.causeway.applib.events.metamodel.MetamodelListener;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.applib.events.metamodel.MetamodelListener;
import org.apache.causeway.applib.exceptions.RecoverableException;
import org.apache.causeway.applib.services.i18n.TranslatableString;
import org.apache.causeway.applib.services.i18n.TranslationContext;
diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/transaction/TransactionServiceSpring.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/transaction/TransactionServiceSpring.java
index 75042bce28..ac207b601d 100644
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/transaction/TransactionServiceSpring.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/transaction/TransactionServiceSpring.java
@@ -28,8 +28,6 @@ import jakarta.inject.Inject;
import jakarta.inject.Named;
import jakarta.inject.Provider;
-import org.apache.causeway.core.runtime.flushmgmt.FlushMgmt;
-
import org.springframework.aop.support.AopUtils;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
@@ -58,6 +56,7 @@ import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.commons.internal.debug._Probe;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.interaction.session.CausewayInteraction;
+import org.apache.causeway.core.runtime.flushmgmt.FlushMgmt;
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.core.transaction.events.TransactionCompletionStatus;
diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/userreg/EmailNotificationServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/userreg/EmailNotificationServiceDefault.java
index ab52c5dbfd..89fe431378 100644
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/userreg/EmailNotificationServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/userreg/EmailNotificationServiceDefault.java
@@ -25,6 +25,11 @@ import java.util.regex.Pattern;
import static java.util.regex.Pattern.compile;
import static java.util.regex.Pattern.quote;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
@@ -38,11 +43,6 @@ import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.commons.internal.resources._Resources;
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
-import jakarta.annotation.PostConstruct;
-import jakarta.annotation.Priority;
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-
@Service
@Named(CausewayModuleCoreRuntimeServices.NAMESPACE + ".EmailNotificationServiceDefault")
@Priority(PriorityPrecedence.MIDPOINT)
diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/xml/XmlServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/xml/XmlServiceDefault.java
index 713e96a130..02b4be5e06 100644
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/xml/XmlServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/xml/XmlServiceDefault.java
@@ -21,8 +21,6 @@ package org.apache.causeway.core.runtimeservices.xml;
import java.io.StringReader;
import java.io.StringWriter;
-import jakarta.annotation.Priority;
-import jakarta.inject.Named;
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerConfigurationException;
@@ -32,20 +30,24 @@ import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
-import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Service;
+import jakarta.annotation.Priority;
+import jakarta.inject.Named;
+
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Service;
+
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.exceptions.UnrecoverableException;
import org.apache.causeway.applib.services.xml.XmlService;
import org.apache.causeway.commons.internal.codec._DocumentFactories;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
+import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
/**
*
diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java
index fe04843ab9..92a7dd44f2 100644
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java
@@ -28,9 +28,10 @@ import jakarta.annotation.Priority;
import jakarta.inject.Inject;
import jakarta.inject.Named;
+import org.w3c.dom.Element;
+
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
-import org.w3c.dom.Element;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.xml.XmlService;
diff --git a/core/runtimeservices/src/test/java/org/apache/causeway/core/runtimeservices/RuntimeServicesTestAbstract.java b/core/runtimeservices/src/test/java/org/apache/causeway/core/runtimeservices/RuntimeServicesTestAbstract.java
index c81775b009..d97a839dfa 100644
--- a/core/runtimeservices/src/test/java/org/apache/causeway/core/runtimeservices/RuntimeServicesTestAbstract.java
+++ b/core/runtimeservices/src/test/java/org/apache/causeway/core/runtimeservices/RuntimeServicesTestAbstract.java
@@ -23,6 +23,7 @@ import java.util.concurrent.atomic.AtomicReference;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.mockito.Mockito;
+
import org.springframework.core.io.AbstractResource;
import org.apache.causeway.applib.services.jaxb.JaxbService;
diff --git a/core/runtimeservices/src/test/java/org/apache/causeway/core/runtimeservices/menubars/bootstrap/MenuBarsServiceBSTest.java b/core/runtimeservices/src/test/java/org/apache/causeway/core/runtimeservices/menubars/bootstrap/MenuBarsServiceBSTest.java
index c9524deb5a..0733691132 100644
--- a/core/runtimeservices/src/test/java/org/apache/causeway/core/runtimeservices/menubars/bootstrap/MenuBarsServiceBSTest.java
+++ b/core/runtimeservices/src/test/java/org/apache/causeway/core/runtimeservices/menubars/bootstrap/MenuBarsServiceBSTest.java
@@ -24,13 +24,14 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EnumSource;
import org.junit.jupiter.params.provider.EnumSource.Mode;
-import org.springframework.core.io.ByteArrayResource;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.springframework.core.io.ByteArrayResource;
+
import org.apache.causeway.applib.services.layout.LayoutService;
import org.apache.causeway.applib.services.menu.MenuBarsMarshallerService;
import org.apache.causeway.applib.services.menu.MenuBarsService;
diff --git a/core/runtimeservices/src/test/java/org/apache/causeway/core/runtimeservices/recognizer/dae/ExceptionRecognizerForDataAccessExceptionTest.java b/core/runtimeservices/src/test/java/org/apache/causeway/core/runtimeservices/recognizer/dae/ExceptionRecognizerForDataAccessExceptionTest.java
index f5835b0bf7..c0890e4150 100644
--- a/core/runtimeservices/src/test/java/org/apache/causeway/core/runtimeservices/recognizer/dae/ExceptionRecognizerForDataAccessExceptionTest.java
+++ b/core/runtimeservices/src/test/java/org/apache/causeway/core/runtimeservices/recognizer/dae/ExceptionRecognizerForDataAccessExceptionTest.java
@@ -20,6 +20,11 @@ package org.apache.causeway.core.runtimeservices.recognizer.dae;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.springframework.dao.CannotAcquireLockException;
import org.springframework.dao.DataAccessException;
import org.springframework.dao.DuplicateKeyException;
@@ -28,10 +33,6 @@ import org.springframework.dao.NonTransientDataAccessResourceException;
import org.springframework.dao.RecoverableDataAccessException;
import org.springframework.dao.TransientDataAccessResourceException;
-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.applib.services.exceprecog.Category;
import org.apache.causeway.core.config.CausewayConfiguration;
diff --git a/core/security/src/main/java/org/apache/causeway/core/security/authentication/standard/RandomCodeGeneratorDefault.java b/core/security/src/main/java/org/apache/causeway/core/security/authentication/standard/RandomCodeGeneratorDefault.java
index 8c6b04681a..3788082c51 100644
--- a/core/security/src/main/java/org/apache/causeway/core/security/authentication/standard/RandomCodeGeneratorDefault.java
+++ b/core/security/src/main/java/org/apache/causeway/core/security/authentication/standard/RandomCodeGeneratorDefault.java
@@ -23,11 +23,11 @@ import java.security.SecureRandom;
import jakarta.annotation.Priority;
import jakarta.inject.Named;
-import org.apache.causeway.core.security.CausewayModuleCoreSecurity;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.core.security.CausewayModuleCoreSecurity;
@Component
@Named(RandomCodeGeneratorDefault.LOGICAL_TYPE_NAME)
diff --git a/core/security/src/main/java/org/apache/causeway/core/security/authorization/manager/AuthorizationManager.java b/core/security/src/main/java/org/apache/causeway/core/security/authorization/manager/AuthorizationManager.java
index 3c8eae636b..67c0e0be26 100644
--- a/core/security/src/main/java/org/apache/causeway/core/security/authorization/manager/AuthorizationManager.java
+++ b/core/security/src/main/java/org/apache/causeway/core/security/authorization/manager/AuthorizationManager.java
@@ -25,7 +25,6 @@ import jakarta.annotation.Priority;
import jakarta.inject.Inject;
import jakarta.inject.Named;
-import org.apache.causeway.core.security.CausewayModuleCoreSecurity;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.lang.Nullable;
import org.springframework.stereotype.Service;
@@ -38,6 +37,7 @@ import org.apache.causeway.applib.services.sudo.SudoService;
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.security.CausewayModuleCoreSecurity;
import org.apache.causeway.core.security.authorization.Authorizor;
/**
diff --git a/core/transaction/src/main/java/org/apache/causeway/core/transaction/CausewayModuleCoreTransaction.java b/core/transaction/src/main/java/org/apache/causeway/core/transaction/CausewayModuleCoreTransaction.java
index 80667e7cf9..1227071ed2 100644
--- a/core/transaction/src/main/java/org/apache/causeway/core/transaction/CausewayModuleCoreTransaction.java
+++ b/core/transaction/src/main/java/org/apache/causeway/core/transaction/CausewayModuleCoreTransaction.java
@@ -18,13 +18,12 @@
*/
package org.apache.causeway.core.transaction;
-import org.apache.causeway.core.transaction.scope.NoopTransactionSynchronizationService;
-import org.apache.causeway.core.transaction.scope.TransactionScopeBeanFactoryPostProcessor;
-
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.apache.causeway.core.transaction.changetracking.events.TimestampService;
+import org.apache.causeway.core.transaction.scope.NoopTransactionSynchronizationService;
+import org.apache.causeway.core.transaction.scope.TransactionScopeBeanFactoryPostProcessor;
@Configuration
@Import({
diff --git a/core/transaction/src/main/java/org/apache/causeway/core/transaction/changetracking/events/TimestampService.java b/core/transaction/src/main/java/org/apache/causeway/core/transaction/changetracking/events/TimestampService.java
index ca719342fe..30047c2ba0 100644
--- a/core/transaction/src/main/java/org/apache/causeway/core/transaction/changetracking/events/TimestampService.java
+++ b/core/transaction/src/main/java/org/apache/causeway/core/transaction/changetracking/events/TimestampService.java
@@ -22,7 +22,6 @@ import jakarta.annotation.Priority;
import jakarta.inject.Inject;
import jakarta.inject.Named;
-import org.apache.causeway.core.transaction.CausewayModuleCoreTransaction;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Service;
@@ -32,6 +31,7 @@ import org.apache.causeway.applib.mixins.updates.OnUpdatedAt;
import org.apache.causeway.applib.mixins.updates.OnUpdatedBy;
import org.apache.causeway.applib.services.clock.ClockService;
import org.apache.causeway.applib.services.user.UserService;
+import org.apache.causeway.core.transaction.CausewayModuleCoreTransaction;
import lombok.val;
diff --git a/core/transaction/src/main/java/org/apache/causeway/core/transaction/scope/NoopTransactionSynchronizationService.java b/core/transaction/src/main/java/org/apache/causeway/core/transaction/scope/NoopTransactionSynchronizationService.java
index afe9036eef..01769b5f51 100644
--- a/core/transaction/src/main/java/org/apache/causeway/core/transaction/scope/NoopTransactionSynchronizationService.java
+++ b/core/transaction/src/main/java/org/apache/causeway/core/transaction/scope/NoopTransactionSynchronizationService.java
@@ -15,11 +15,11 @@
*/
package org.apache.causeway.core.transaction.scope;
-import org.apache.causeway.applib.annotation.TransactionScope;
-
import org.springframework.stereotype.Service;
import org.springframework.transaction.support.TransactionSynchronization;
+import org.apache.causeway.applib.annotation.TransactionScope;
+
/**
* This service, which does nothing in and of itself, exists in order to ensure that the {@link StackedTransactionScope}
* is always initialized, findinag at least one {@link TransactionScope transaction-scope}d service.
diff --git a/core/webapp/src/main/java/org/apache/causeway/core/webapp/confmenu/ConfigurationViewServiceDefault.java b/core/webapp/src/main/java/org/apache/causeway/core/webapp/confmenu/ConfigurationViewServiceDefault.java
index 2573c9d223..575d5c528d 100644
--- a/core/webapp/src/main/java/org/apache/causeway/core/webapp/confmenu/ConfigurationViewServiceDefault.java
+++ b/core/webapp/src/main/java/org/apache/causeway/core/webapp/confmenu/ConfigurationViewServiceDefault.java
@@ -28,6 +28,7 @@ import java.util.Set;
import java.util.TreeSet;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+
import jakarta.annotation.PostConstruct;
import jakarta.annotation.Priority;
import jakarta.inject.Inject;
diff --git a/core/webapp/src/main/java/org/apache/causeway/core/webapp/keyvaluestore/KeyValueStoreUsingHttpSession.java b/core/webapp/src/main/java/org/apache/causeway/core/webapp/keyvaluestore/KeyValueStoreUsingHttpSession.java
index 2454334288..a29b6a6655 100644
--- a/core/webapp/src/main/java/org/apache/causeway/core/webapp/keyvaluestore/KeyValueStoreUsingHttpSession.java
+++ b/core/webapp/src/main/java/org/apache/causeway/core/webapp/keyvaluestore/KeyValueStoreUsingHttpSession.java
@@ -21,6 +21,9 @@ package org.apache.causeway.core.webapp.keyvaluestore;
import java.io.Serializable;
import java.util.Optional;
+import jakarta.inject.Named;
+import jakarta.servlet.http.HttpSession;
+
import org.springframework.lang.Nullable;
import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestContextHolder;
@@ -29,8 +32,6 @@ import org.springframework.web.context.request.ServletRequestAttributes;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.keyvaluestore.KeyValueSessionStore;
-import jakarta.inject.Named;
-import jakarta.servlet.http.HttpSession;
import lombok.NonNull;
/**