You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/10/25 08:05:14 UTC
[isis] branch master updated: ISIS-3142: batch organize imports: core sources
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new bdf61ecc3a ISIS-3142: batch organize imports: core sources
bdf61ecc3a is described below
commit bdf61ecc3a8f19ac7ef6364ce850318f865c8dff
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Oct 25 10:05:05 2022 +0200
ISIS-3142: batch organize imports: core sources
---
.../causeway/applib/CausewayModuleApplib.java | 5 ++--
.../org/apache/causeway/applib/Identifier.java | 7 +++--
.../client/RepresentationTypeSimplifiedV2.java | 3 ++-
.../causeway/applib/events/EventObjectBase.java | 3 ++-
.../applib/events/domain/AbstractDomainEvent.java | 4 +--
.../applib/events/metamodel/MetamodelListener.java | 2 +-
.../applib/exceptions/RecoverableException.java | 3 +--
.../applib/exceptions/UnrecoverableException.java | 3 +--
.../causeway/applib/graph/tree/TreeNode.java | 6 ++---
.../org/apache/causeway/applib/id/LogicalType.java | 6 ++---
.../applib/layout/grid/bootstrap/BSCol.java | 5 ++--
.../causeway/applib/layout/menubars/MenuBars.java | 3 +--
.../layout/menubars/bootstrap/BSMenuBars.java | 3 +--
.../causeway/applib/query/_NamedQueryDefault.java | 3 ++-
.../services/appfeat/ApplicationFeatureId.java | 18 ++++++-------
.../services/appfeatui/ApplicationFeatureMenu.java | 3 +--
.../appfeatui/ApplicationFeatureViewModel.java | 7 +++--
.../applib/services/bookmark/Bookmark.java | 6 ++---
.../idstringifiers/PredefinedSerializables.java | 3 +--
.../causeway/applib/services/command/Command.java | 3 +--
.../services/command/CommandOutcomeHandler.java | 3 +--
.../services/confview/ConfigurationProperty.java | 3 +--
.../exceprecog/ExceptionRecognizerAbstract.java | 5 ++--
.../causeway/applib/services/grid/GridService.java | 3 +--
.../applib/services/i18n/TranslatableString.java | 3 +--
.../applib/services/i18n/TranslationContext.java | 3 ++-
.../causeway/applib/services/iactn/Execution.java | 3 +--
.../applib/services/iactn/Interaction.java | 3 +--
.../applib/services/iactn/InteractionProvider.java | 3 +--
.../iactnlayer/InteractionLayerTracker.java | 3 +--
.../jaxb/CatalogingSchemaOutputResolver.java | 7 ++---
.../causeway/applib/services/jaxb/JaxbService.java | 3 ++-
.../applib/services/layout/LayoutServiceMenu.java | 3 +--
.../applib/services/menu/MenuBarsService.java | 3 +--
.../applib/services/metamodel/DomainModel.java | 3 ++-
.../services/metamodel/MetaModelServiceMenu.java | 3 +--
.../applib/services/metamodel/_AsciiExport.java | 2 +-
.../applib/services/metamodel/_DiffExport.java | 1 -
.../services/publishing/spi/CommandSubscriber.java | 3 +--
.../publishing/spi/EntityChangesSubscriber.java | 3 +--
.../spi/EntityPropertyChangeSubscriber.java | 3 +--
.../publishing/spi/ExecutionSubscriber.java | 3 +--
.../queryresultscache/QueryResultsCache.java | 6 ++---
.../registry/InstanceByPriorityComparator.java | 2 +-
.../applib/services/registry/ServiceRegistry.java | 3 +--
.../services/sitemap/SitemapServiceMenu.java | 3 +--
.../causeway/applib/services/sudo/SudoService.java | 2 +-
.../causeway/applib/services/user/UserMemento.java | 4 +--
.../causeway/applib/services/user/UserService.java | 2 +-
.../applib/services/wrapper/WrapperFactory.java | 4 ---
.../applib/services/wrapper/WrappingObject.java | 3 +--
.../services/wrapper/callable/AsyncCallable.java | 3 ++-
.../services/wrapper/control/AsyncControl.java | 3 +--
.../services/wrapper/control/ControlAbstract.java | 3 +--
.../services/wrapper/events/InteractionEvent.java | 3 +--
.../services/xactn/TransactionalProcessor.java | 5 ++--
.../applib/spec/AbstractSpecification.java | 3 +--
.../applib/spec/AbstractSpecification2.java | 5 ++--
.../org/apache/causeway/applib/util/Enums.java | 3 ++-
.../applib/util/ObjectContract_Parser.java | 4 +--
.../apache/causeway/applib/util/TitleBuffer.java | 3 +--
.../org/apache/causeway/applib/util/ZipWriter.java | 3 ++-
.../applib/util/schema/ChangesDtoUtils.java | 3 +--
.../applib/util/schema/CommandDtoUtils.java | 5 ++--
.../applib/util/schema/CommonDtoUtils.java | 12 ++++-----
.../applib/util/schema/InteractionDtoUtils.java | 7 +++--
.../applib/util/schema/InteractionsDtoUtils.java | 3 +--
.../util/schema/MemberExecutionDtoUtils.java | 1 -
.../org/apache/causeway/applib/value/Blob.java | 9 +++----
.../org/apache/causeway/applib/value/Clob.java | 3 +--
.../causeway/applib/value/LocalResourcePath.java | 4 +--
.../org/apache/causeway/applib/value/Markup.java | 5 ++--
.../causeway/applib/value/semantics/Parser.java | 3 ++-
.../value/semantics/TemporalValueSemantics.java | 6 +----
.../applib/value/semantics/ValueDecomposition.java | 3 +--
.../value/semantics/ValueSemanticsAbstract.java | 10 +++----
.../ValueSemanticsBasedOnIdStringifier.java | 3 +--
...emanticsBasedOnIdStringifierEntityAgnostic.java | 3 +--
.../value/semantics/ValueSemanticsProvider.java | 2 +-
.../value/semantics/ValueSemanticsResolver.java | 3 +--
.../apache/causeway/applib/IdentifierTests.java | 2 +-
.../commons/internal/reflection/ReflectTest.java | 11 ++++----
.../apache/causeway/applib/id/LogicalTypeTest.java | 2 +-
.../applib/id/LogicalTypeTest_valueSemantics.java | 3 +--
.../applib/services/iactnlayer/TryTest.java | 5 ++--
.../applib/services/jaxb/JaxbServiceTest.java | 2 +-
.../services/wrapper/control/SyncControl_Test.java | 3 ++-
.../ObjectContractsTest_equals_and_hashCode.java | 2 +-
.../apache/causeway/commons/collections/Can.java | 3 ++-
.../causeway/commons/collections/Can_Empty.java | 3 ++-
.../causeway/commons/collections/Can_Multiple.java | 3 ++-
.../commons/collections/Can_Singleton.java | 3 ++-
.../commons/collections/ImmutableCollection.java | 3 ++-
.../apache/causeway/commons/functional/Try.java | 3 ++-
.../commons/internal/assertions/_Assert.java | 3 ++-
.../causeway/commons/internal/base/_Files.java | 3 ++-
.../causeway/commons/internal/base/_NullSafe.java | 3 ++-
.../causeway/commons/internal/base/_Objects.java | 3 ++-
.../causeway/commons/internal/base/_Refs.java | 3 ++-
.../internal/base/_StringInterpolation.java | 3 ++-
.../causeway/commons/internal/base/_Strings.java | 3 ++-
.../internal/base/_Strings_KeyValuePair.java | 4 +--
.../internal/base/_Strings_SplitIterator.java | 3 ++-
.../causeway/commons/internal/base/_Temporals.java | 3 ++-
.../causeway/commons/internal/base/_Text.java | 3 ++-
.../commons/internal/binding/InternalUtil.java | 3 ++-
.../commons/internal/collections/_Arrays.java | 3 ++-
.../commons/internal/collections/_Collections.java | 3 ++-
.../commons/internal/collections/_Lists.java | 3 ++-
.../commons/internal/collections/_Maps.java | 3 ++-
.../commons/internal/collections/_Multimaps.java | 3 ++-
.../commons/internal/collections/_Sets.java | 3 ++-
.../compare/_Comparators_SequenceCompare.java | 3 ++-
.../internal/concurrent/_ConcurrentTaskList.java | 3 ++-
.../causeway/commons/internal/context/_Plugin.java | 5 ++--
.../causeway/commons/internal/debug/_Xray.java | 2 +-
.../commons/internal/debug/xray/XrayModel.java | 3 ++-
.../commons/internal/delegate/_Delegate.java | 3 ++-
.../commons/internal/exceptions/_Exceptions.java | 3 ++-
.../commons/internal/hardening/_Hardening.java | 3 ++-
.../causeway/commons/internal/hash/_Hashes.java | 3 ++-
.../causeway/commons/internal/image/_Images.java | 3 ++-
.../commons/internal/ioc/_IocContainer.java | 3 ++-
.../commons/internal/ioc/_IocContainer_Spring.java | 9 ++++---
.../internal/ioc/_ManagedBeanAdapter_Spring.java | 3 ++-
.../commons/internal/memento/_MementoDefault.java | 3 ++-
.../causeway/commons/internal/os/_OsUtil.java | 3 ++-
.../commons/internal/primitives/_Ints.java | 3 ++-
.../commons/internal/primitives/_Longs.java | 3 ++-
.../proxy/_ProxyFactoryServiceAbstract.java | 1 +
...nthesizedMergedAnnotationInvocationHandler.java | 3 ++-
.../commons/internal/reflection/_ClassCache.java | 5 ++--
.../commons/internal/reflection/_Generics.java | 3 ++-
.../commons/internal/reflection/_Reflect.java | 9 ++++---
.../causeway/commons/internal/resources/_Json.java | 3 ++-
.../commons/internal/resources/_Resources.java | 3 ++-
.../causeway/commons/internal/resources/_Xml.java | 3 ++-
.../causeway/commons/internal/resources/_Yaml.java | 3 ++-
.../commons/resource/ResourceCoordinates.java | 3 ++-
.../commons/collections/CanCompareTest.java | 4 +--
.../causeway/commons/collections/CanTest.java | 6 ++---
.../commons/collections/CanVectorTest.java | 5 ++--
.../commons/functional/ThrowingRunnableTest.java | 4 +--
.../handlers/ChainOfResponsibilityTest.java | 5 ++--
.../causeway/commons/internal/base/BytesTest.java | 5 ++--
.../commons/internal/base/NullSafeTest.java | 2 --
.../commons/internal/base/ReductionTest.java | 4 +--
.../commons/internal/base/StringsTest.java | 5 ++--
.../commons/internal/base/TemporalsTest.java | 1 -
.../causeway/commons/internal/base/TextTest.java | 4 +--
.../internal/base/_Strings_trimmed_Test.java | 1 -
.../commons/internal/base/debug/XrayUiTest.java | 2 +-
.../commons/internal/binding/BindableTest.java | 4 +--
.../commons/internal/collections/_ArraysTest.java | 7 +++--
.../commons/internal/collections/_MapsTest.java | 4 +--
.../commons/internal/collections/_SetsTest.java | 3 ---
.../collections/snapshot/VersionedListTest.java | 1 -
.../commons/internal/compare/ComparatorsTest.java | 4 +--
.../concurrent/ConcurrentTaskListTest.java | 2 --
.../commons/internal/context/ContextTest.java | 1 -
.../internal/debug/xray/CallStackMergerTest.java | 4 +--
.../commons/internal/image/_ImagesTest.java | 1 -
.../commons/internal/primitives/IntsTest.java | 1 -
.../commons/internal/primitives/_IntsTest.java | 1 -
.../internal/reflection/AnnotationsTest.java | 5 ++--
.../internal/reflection/ClassCacheTest.java | 7 +++--
.../commons/internal/reflection/GenericsTest.java | 6 ++---
.../commons/internal/reflection/ReflectTest.java | 1 -
.../internal/resources/JsonYamlReaderTest.java | 2 --
.../commons/internal/resources/ResourcesTest.java | 1 -
.../internal/resources/XmlRoundTripTest.java | 1 -
.../CausewayModuleCoreCodegenByteBuddy.java | 3 ++-
.../services/ProxyFactoryServiceByteBuddy.java | 9 ++++---
.../core/config/CausewayConfiguration.java | 9 +++----
.../core/config/CausewayModuleCoreConfig.java | 9 ++++---
.../CausewayBeanFactoryPostProcessorForSpring.java | 8 +++---
.../config/beans/CausewayBeanTypeClassifier.java | 3 ++-
.../beans/CausewayBeanTypeClassifierDefault.java | 10 +++----
.../beans/CausewayBeanTypeRegistryDefault.java | 8 +++---
.../beans/CausewayComponentScanInterceptor.java | 3 ++-
.../core/config/beans/aoppatch/AopPatch.java | 3 ++-
.../core/config/converters/PatternsConverter.java | 7 ++---
.../DataSourceIntrospectionService.java | 6 ++---
.../environment/CausewayLocaleInitializer.java | 3 ++-
.../environment/CausewaySystemEnvironment.java | 9 ++++---
.../environment/CausewayTimeZoneInitializer.java | 3 ++-
.../facets/CollectionLayoutConfigOptions.java | 3 ++-
.../metamodel/specloader/IntrospectionMode.java | 2 +-
.../progmodel/ProgrammingModelConstants.java | 18 ++++++-------
.../core/config/util/SpringProfileUtil.java | 3 ++-
.../core/config/viewer/web/WebAppContextPath.java | 6 ++---
...ion_getMaxTitleLengthInParentedTables_Test.java | 1 -
...n_getMaxTitleLengthInStandaloneTables_Test.java | 1 -
.../progmodel/ProgrammingModelConstantsTest.java | 3 ++-
.../config/util/ConfigUtil_isProtected_Test.java | 1 -
.../core/config/util/ConfigUtil_mask_Test.java | 1 -
.../WebAppContextPath_setContextPath_Test.java | 3 ++-
.../interaction/CausewayModuleCoreInteraction.java | 5 ++--
...teractionAwareTransactionalBoundaryHandler.java | 10 +++----
.../core/interaction/scope/InteractionScope.java | 6 ++---
.../interaction/session/CausewayInteraction.java | 7 +++--
.../interaction/session/MessageBrokerImpl.java | 1 -
.../interaction/InteractionDefaultTest_next.java | 3 ++-
.../contract/ComparableContractTester.java | 3 ++-
.../jmocking/ImposteriserUsingCodegenPlugin.java | 5 ++--
.../jmocking/JUnitRuleMockery2.java | 6 ++---
.../internaltestsupport/jmocking/MyMockomatic.java | 3 ++-
.../metamodel/CausewayModuleCoreMetamodel.java | 6 ++---
.../_testing/MetaModelContext_forTesting.java | 18 ++++++-------
.../_testing/MethodRemover_forTesting.java | 2 +-
.../_testing/ServiceInjector_forTesting.java | 4 +--
.../_testing/ServiceRegistry_forTesting.java | 5 ++--
.../metamodel/_testing/_ServiceInjectorLegacy.java | 12 ++++-----
.../core/metamodel/commons/CanonicalInvoker.java | 3 ++-
.../core/metamodel/commons/ClassExtensions.java | 3 +--
.../core/metamodel/commons/MethodUtil.java | 1 -
.../core/metamodel/commons/ParameterAdapter.java | 4 +--
.../core/metamodel/commons/StringExtensions.java | 4 +--
.../causeway/core/metamodel/consent/Veto.java | 4 +--
.../metamodel/execution/MemberExecutorService.java | 5 ++--
.../causeway/core/metamodel/facetapi/Facet.java | 3 +--
.../metamodel/facetapi/FacetHolderAbstract.java | 5 ++--
.../metamodel/facetapi/FacetHolderLayered.java | 3 +--
.../core/metamodel/facetapi/FacetRanking.java | 1 -
.../core/metamodel/facetapi/FacetUtil.java | 4 +--
.../core/metamodel/facetapi/FeatureType.java | 3 +--
.../core/metamodel/facetapi/MethodRemover.java | 1 -
.../core/metamodel/facets/ActionSupport.java | 1 -
.../core/metamodel/facets/DomainEventHelper.java | 20 +++++++-------
.../causeway/core/metamodel/facets/Evaluators.java | 3 +--
.../core/metamodel/facets/FacetFactory.java | 6 ++---
.../metamodel/facets/FacetFactoryAbstract.java | 4 +--
.../core/metamodel/facets/FacetedMethod.java | 3 +--
.../core/metamodel/facets/ImperativeAspect.java | 3 +--
.../core/metamodel/facets/ImperativeFacet.java | 3 +--
.../metamodel/facets/ObjectTypeFacetFactory.java | 3 +--
.../core/metamodel/facets/ParameterSupport.java | 1 -
...rCollectionIdentifyingFacetFactoryAbstract.java | 1 -
...nChoicesForCollectionParameterFacetFactory.java | 2 +-
.../actions/action/ActionOverloadingValidator.java | 3 +--
.../ChoicesFromFacetForActionAnnotation.java | 3 +--
.../invocation/ActionDomainEventFacetAbstract.java | 5 ++--
.../action/invocation/ActionInvocationFacet.java | 1 -
...ctionInvocationFacetForDomainEventAbstract.java | 9 +++----
.../actions/action/invocation/IdentifierUtil.java | 4 +--
.../ContributingFacetFromMixinFacetFactory.java | 1 +
.../FileAcceptFacetForActionAnnotation.java | 3 +--
.../annotation/HomePageFacetAnnotationFactory.java | 7 +++--
.../actions/layout/ActionLayoutFacetFactory.java | 2 +-
.../CssClassFaFacetForActionLayoutAnnotation.java | 3 +--
.../layout/CssClassFaFacetForActionLayoutXml.java | 3 +--
.../layout/CssClassFaFacetForMenuBarXml.java | 2 +-
.../CssClassFacetForActionLayoutAnnotation.java | 3 +--
.../layout/CssClassFacetForActionLayoutXml.java | 3 +--
.../actions/layout/CssClassFacetForMenuBarXml.java | 2 +-
...berDescribedFacetForActionLayoutAnnotation.java | 3 +--
.../MemberDescribedFacetForActionLayoutXml.java | 3 +--
.../layout/MemberDescribedFacetForMenuBarXml.java | 2 +-
.../layout/MemberNamedFacetForActionLayoutXml.java | 3 +--
.../layout/MemberNamedFacetForMenuBarXml.java | 2 +-
.../NamedFacetForActionLayoutAnnotation.java | 3 +--
.../PromptStyleFacetForActionLayoutAnnotation.java | 3 +--
.../position/ActionPositionFacetAbstract.java | 1 +
.../actions/validate/ActionValidationFacet.java | 1 -
.../ActionParameterValidationFacetViaMethod.java | 5 ++--
.../method/ActionValidationFacetViaMethod.java | 6 ++---
.../facets/all/described/MemberDescribedFacet.java | 1 -
...erDescribedFacetWithImperativeTextAbstract.java | 1 -
...MemberDescribedFacetWithStaticTextAbstract.java | 2 +-
.../all/i8n/imperative/HasImperativeText.java | 2 +-
.../imperative/HasImperativeTextFacetAbstract.java | 3 +--
.../metamodel/facets/all/i8n/noun/HasNoun.java | 2 +-
.../facets/all/i8n/noun/HasNounFacetAbstract.java | 3 +--
.../metamodel/facets/all/i8n/noun/NounForms.java | 4 +--
.../i8n/staatic/HasStaticTextFacetAbstract.java | 3 +--
.../facets/all/named/MemberNamedFacet.java | 1 -
...MemberNamedFacetWithImperativeTextAbstract.java | 1 -
.../MemberNamedFacetWithStaticTextAbstract.java | 1 -
.../facets/all/named/ObjectNamedFacetAbstract.java | 1 +
.../all/named/ObjectNamedFacetSynthesized.java | 2 +-
.../facets/collections/CollectionFacet.java | 6 ++---
.../CollectionAccessorFacetViaAccessor.java | 4 +--
.../CollectionAccessorFacetViaAccessorFactory.java | 1 -
.../modify/CollectionDomainEventFacetAbstract.java | 3 +--
.../javautilcollection/JavaArrayFacet.java | 6 ++---
.../javautilcollection/JavaCollectionFacet.java | 4 +--
.../layout/CollectionLayoutFacetFactory.java | 1 +
...CssClassFacetForCollectionLayoutAnnotation.java | 3 +--
.../CssClassFacetForCollectionLayoutXml.java | 3 +--
.../layout/DefaultViewFacetAsConfigured.java | 1 -
...aultViewFacetForCollectionLayoutAnnotation.java | 3 +--
.../DefaultViewFacetForCollectionLayoutXml.java | 3 +--
...escribedFacetForCollectionLayoutAnnotation.java | 3 +--
...MemberDescribedFacetForCollectionLayoutXml.java | 3 +--
...berNamedFacetForCollectionLayoutAnnotation.java | 3 +--
.../MemberNamedFacetForCollectionLayoutXml.java | 3 +--
...PagedFacetOverriddenByDataTablesDecoration.java | 4 ---
...SortedByFacetForCollectionLayoutAnnotation.java | 4 +--
.../SortedByFacetForCollectionLayoutXml.java | 4 +--
.../CollectionLayoutTableDecorationFacet.java | 3 +--
...TableDecorationFacetForCollectionLayoutXml.java | 1 -
.../annotation/SortedByFacetAnnotationFactory.java | 1 +
.../facets/fallback/FallbackFacetFactory.java | 3 +++
.../metamodel/facets/fallback/TitleFacetNone.java | 1 +
.../metamodel/facets/jaxb/JaxbFacetFactory.java | 7 +++--
.../facets/members/cssclassfa/CssClassFaFacet.java | 1 -
.../members/cssclassfa/CssClassFaFactory.java | 3 +--
.../CssClassFaImperativeFacetAbstract.java | 1 -
.../cssclassfa/CssClassFaStaticFacetAbstract.java | 3 +--
...CssClassFaFacetOnMemberFromConfiguredRegex.java | 3 +--
.../annotprop/MemberDescribedFacetFromType.java | 1 -
.../members/disabled/DisabledFacetAbstract.java | 2 +-
.../method/DisableForContextFacetViaMethod.java | 6 ++---
.../DisableForContextFacetViaMethodFactory.java | 1 +
.../HiddenFacetFromLayoutPropertiesAbstract.java | 3 +--
.../method/HideForContextFacetViaMethod.java | 3 +--
.../members/layout/group/GroupIdAndName.java | 2 +-
.../group/LayoutGroupFacetForActionAnnotation.java | 1 +
.../NamedFacetForMemberViaMethodFactory.java | 1 +
.../CommandPublishingFacetForActionAnnotation.java | 3 +--
...ommandPublishingFacetForPropertyAnnotation.java | 3 +--
...onPublishingActionFacetForActionAnnotation.java | 3 +--
...blishingPropertyFacetForPropertyAnnotation.java | 3 +--
...mberAndPropertySupportFacetFactoryAbstract.java | 1 -
.../support/MemberSupportFacetFactoryAbstract.java | 1 -
.../object/autocomplete/AutoCompleteFacet.java | 1 -
.../autocomplete/AutoCompleteFacetAbstract.java | 1 -
.../object/callbacks/CallbackFacetAbstract.java | 3 +--
.../object/callbacks/CallbackFacetFactory.java | 1 -
.../callbacks/CreatedCallbackFacetAbstract.java | 1 -
.../callbacks/CreatedCallbackFacetViaMethod.java | 1 -
...fecycleEventFacetForDomainObjectAnnotation.java | 3 +--
.../callbacks/LoadedCallbackFacetAbstract.java | 1 -
.../callbacks/LoadedCallbackFacetViaMethod.java | 1 -
...fecycleEventFacetForDomainObjectAnnotation.java | 3 +--
.../callbacks/PersistedCallbackFacetAbstract.java | 1 -
.../callbacks/PersistedCallbackFacetViaMethod.java | 1 -
...fecycleEventFacetForDomainObjectAnnotation.java | 3 +--
.../callbacks/PersistingCallbackFacetAbstract.java | 1 -
.../PersistingCallbackFacetViaMethod.java | 1 -
...fecycleEventFacetForDomainObjectAnnotation.java | 3 +--
.../callbacks/RemovingCallbackFacetAbstract.java | 1 -
.../callbacks/RemovingCallbackFacetViaMethod.java | 1 -
...fecycleEventFacetForDomainObjectAnnotation.java | 3 +--
.../callbacks/UpdatedCallbackFacetAbstract.java | 1 -
.../callbacks/UpdatedCallbackFacetViaMethod.java | 1 -
...fecycleEventFacetForDomainObjectAnnotation.java | 3 +--
.../callbacks/UpdatingCallbackFacetAbstract.java | 1 -
.../callbacks/UpdatingCallbackFacetViaMethod.java | 1 -
...fecycleEventFacetForDomainObjectAnnotation.java | 3 +--
.../choices/ChoicesFacetFromBoundedAbstract.java | 3 +--
.../object/choices/enums/ChoicesFacetFromEnum.java | 1 -
...ssClassFaFacetForDomainObjectLayoutFactory.java | 3 +--
.../AliasedFacetForDomainObjectAnnotation.java | 3 +--
.../DomainObjectAnnotationFacetFactory.java | 11 ++++----
.../ImmutableFacetForDomainObjectAnnotation.java | 3 +--
.../editing/ImmutableFacetFromConfiguration.java | 1 +
...gePublishingFacetForDomainObjectAnnotation.java | 3 +--
...ectionPolicyFacetForDomainObjectAnnotation.java | 3 +--
...lassFaFacetForDomainObjectLayoutAnnotation.java | 3 +--
.../CssClassFaFacetForDomainObjectLayoutXml.java | 3 +--
...sClassFacetForDomainObjectLayoutAnnotation.java | 3 +--
.../CssClassFacetForDomainObjectLayoutXml.java | 3 +--
...ObjectLayoutAnnotationUsingCssClassUiEvent.java | 3 +--
.../DomainObjectLayoutFacetFactory.java | 3 +--
...mainObjectLayoutAnnotationUsingIconUiEvent.java | 3 +--
...inObjectLayoutAnnotationUsingLayoutUiEvent.java | 4 +--
...cribedFacetForDomainObjectLayoutAnnotation.java | 3 +--
...jectDescribedFacetForDomainObjectLayoutXml.java | 3 +--
...tNamedFacetForDomainObjectLayoutAnnotation.java | 3 +--
.../ObjectNamedFacetForDomainObjectLayoutXml.java | 3 +--
...ainObjectLayoutAnnotationUsingTitleUiEvent.java | 4 +--
.../DomainObjectLayoutTableDecorationFacet.java | 3 +--
...bleDecorationFacetForDomainObjectLayoutXml.java | 5 ----
.../object/domainservice/DomainServiceFacet.java | 2 +-
.../AliasedFacetForDomainServiceAnnotation.java | 3 +--
...NamedFacetForDomainServiceLayoutAnnotation.java | 3 +--
.../facets/object/entity/EntityFacet.java | 6 ++---
.../object/entity/_EntityFacetForTesting.java | 5 ++--
.../facets/object/grid/GridFacetDefault.java | 6 ++---
.../facets/object/grid/GridFacetFactory.java | 3 +--
.../hidden/HiddenTypeFacetFromAuthorization.java | 1 +
.../metamodel/facets/object/icon/ObjectIcon.java | 3 +--
.../RemoveAnnotatedMethodsFacetFactory.java | 1 +
...oveDatanucleusPersistableTypesFacetFactory.java | 1 -
.../RemoveDnPrefixedMethodsFacetFactory.java | 1 +
.../ignore/javalang/RemoveMethodsFacetFactory.java | 4 +--
.../jdo/RemoveJdoEnhancementTypesFacetFactory.java | 1 -
.../jdo/RemoveJdoPrefixedMethodsFacetFactory.java | 1 +
.../object/immutable/ImmutableFacetAbstract.java | 2 +-
.../introspection/IntrospectionPolicyFacet.java | 3 +--
.../IntrospectionPolicyFacetAbstract.java | 1 +
.../facets/object/logicaltype/AliasedFacet.java | 3 +--
.../object/logicaltype/AliasedFacetAbstract.java | 3 +--
.../logicaltype/LogicalTypeMalformedValidator.java | 1 -
.../LogicalTypeFacetFromClassNameFactory.java | 2 ++
.../mixin/MetaModelValidatorForMixinTypes.java | 7 +++--
.../facets/object/mixin/MixinFacetAbstract.java | 1 -
.../NavigableParentAnnotationFacetFactory.java | 3 +--
.../method/NavigableParentFacetViaMethod.java | 1 -
.../metamodel/facets/object/paged/PagedFacet.java | 2 --
.../object/support/ObjectSupportFacetFactory.java | 1 -
.../facets/object/title/TitleRenderRequest.java | 2 +-
.../annotation/TitleAnnotationFacetFactory.java | 3 +--
.../annotation/TitleFacetViaTitleAnnotation.java | 3 +--
.../methods/TitleFacetFromToStringMethod.java | 2 ++
.../facets/object/value/CompositeValueUpdater.java | 3 +--
.../value/CompositeValueUpdaterForParameter.java | 1 -
.../value/CompositeValueUpdaterForProperty.java | 1 -
.../metamodel/facets/object/value/ValueFacet.java | 2 +-
.../facets/object/value/ValueFacetAbstract.java | 10 +++----
.../object/value/ValueSerializerDefault.java | 6 ++---
...ionOrAnyMatchingValueSemanticsFacetFactory.java | 7 +++--
.../vsp/ValueFacetUsingSemanticsProvider.java | 3 +--
.../object/viewmodel/ViewModelFacetAbstract.java | 3 +--
.../ViewModelFacetForDomainObjectAnnotation.java | 7 +++--
.../ViewModelFacetForSerializableInterface.java | 4 +--
.../ViewModelFacetForXmlRootElementAnnotation.java | 5 ++--
.../facets/objectvalue/choices/ChoicesFacet.java | 1 -
.../mandatory/MandatoryFacetAbstract.java | 1 -
.../MustSatisfySpecificationFacetAbstract.java | 3 +--
.../objectvalue/typicallen/TypicalLengthFacet.java | 1 -
.../ActionParameterAutoCompleteFacet.java | 1 -
.../ActionParameterAutoCompleteFacetViaMethod.java | 1 -
...ParameterAutoCompleteFacetViaMethodFactory.java | 1 -
.../param/choices/ActionParameterChoicesFacet.java | 1 -
...ctionParameterChoicesFacetFromChoicesFacet.java | 2 +-
...nParameterChoicesFacetFromChoicesFromFacet.java | 1 -
.../ActionParameterChoicesFacetViaMethod.java | 1 -
.../defaults/ActionParameterDefaultsFacet.java | 1 -
.../ActionParameterDefaultsFacetViaMethod.java | 1 -
.../annotderived/ParamDescribedFacetFromType.java | 2 +-
.../disable/ActionParameterDisabledFacet.java | 1 -
.../ActionParameterDisabledFacetViaMethod.java | 5 ++--
.../param/hide/ActionParameterHiddenFacet.java | 1 -
.../ActionParameterHiddenFacetViaMethod.java | 3 +--
.../CssClassFacetForParameterLayoutAnnotation.java | 3 +--
.../NamedFacetForParameterLayoutAnnotation.java | 3 +--
...DescribedFacetForParameterLayoutAnnotation.java | 3 +--
.../MandatoryFacetOnParametersDefaultFactory.java | 1 +
.../parameter/ParameterAnnotationFacetFactory.java | 5 +---
.../depdef/ParameterDependentDefaultsFacet.java | 3 +--
.../FileAcceptFacetForParameterAnnotation.java | 3 +--
...fySpecificationFacetForParameterAnnotation.java | 3 +--
.../regex/RegExFacetForParameterAnnotation.java | 3 +--
.../RegExFacetForPatternAnnotationOnParameter.java | 1 -
.../validate/ActionParameterValidationFacet.java | 1 -
.../ActionParameterValidationFacetViaMethod.java | 5 ++--
.../accessor/PropertyAccessorFacetViaAccessor.java | 1 -
.../PropertyAccessorFacetViaAccessorFactory.java | 1 -
.../method/PropertyAutoCompleteFacetMethod.java | 3 +--
.../PropertyAutoCompleteFacetMethodFactory.java | 1 +
.../properties/choices/PropertyChoicesFacet.java | 1 -
.../PropertyChoicesFacetFromChoicesFacet.java | 2 +-
.../method/PropertyChoicesFacetViaMethod.java | 1 -
.../defaults/PropertyDefaultFacetNone.java | 1 +
.../method/PropertyDefaultFacetViaMethod.java | 5 ++--
.../DisabledFacetOnPropertyFromImmutable.java | 3 +--
.../property/PropertyAnnotationFacetFactory.java | 3 +--
.../FileAcceptFacetForPropertyAnnotation.java | 3 +--
.../modify/PropertyDomainEventFacetAbstract.java | 3 +--
...tySetterOrClearFacetForDomainEventAbstract.java | 4 +--
...sfySpecificationFacetForPropertyAnnotation.java | 3 +--
.../RegExFacetForPatternAnnotationOnProperty.java | 1 -
.../regex/RegExFacetForPropertyAnnotation.java | 3 +--
.../CssClassFacetForPropertyLayoutAnnotation.java | 3 +--
.../CssClassFacetForPropertyLayoutXml.java | 3 +--
...rDescribedFacetForPropertyLayoutAnnotation.java | 3 +--
.../MemberDescribedFacetForPropertyLayoutXml.java | 3 +--
.../MemberNamedFacetForPropertyLayoutXml.java | 3 +--
.../NamedFacetForPropertyLayoutAnnotation.java | 3 +--
...romptStyleFacetForPropertyLayoutAnnotation.java | 3 +--
.../update/PropertySetterFacetFactory.java | 1 -
.../clear/PropertyClearFacetViaClearMethod.java | 3 +--
.../clear/PropertyClearFacetViaSetterMethod.java | 3 +--
...PropertyInitializationFacetViaSetterMethod.java | 3 +--
.../modify/PropertySetterFacetViaSetterMethod.java | 3 +--
.../validating/PropertyValidateFacetNone.java | 1 +
.../method/PropertyValidateFacetViaMethod.java | 5 ++--
.../ValueSemanticsSelectingFacetForAnnotation.java | 3 +--
.../metamodel/inspect/Object_inspectMetamodel.java | 3 +--
.../metamodel/inspect/model/FacetGroupNode.java | 3 +--
.../core/metamodel/inspect/model/FacetNode.java | 3 +--
.../core/metamodel/inspect/model/MMNode.java | 3 +--
.../metamodel/inspect/model/MMTreeAdapter.java | 3 +--
.../core/metamodel/inspect/model/TypeNode.java | 3 +--
.../interactions/ActionArgUsabilityContext.java | 3 +--
.../interactions/ActionArgValidityContext.java | 3 +--
.../interactions/ActionArgVisibilityContext.java | 3 +--
.../interactions/ActionValidityContext.java | 3 +--
.../metamodel/interactions/InteractionHead.java | 1 -
.../interactions/managed/ActionInteraction.java | 5 ++--
.../managed/ActionInteractionHead.java | 4 +--
.../interactions/managed/ManagedAction.java | 10 +++----
.../interactions/managed/ManagedCollection.java | 3 +--
.../interactions/managed/ManagedFeature.java | 2 +-
.../interactions/managed/ManagedMember.java | 3 +--
.../interactions/managed/ManagedParameter.java | 1 -
.../interactions/managed/ManagedProperty.java | 8 +++---
.../interactions/managed/ManagedValue.java | 5 ++--
.../interactions/managed/MultiselectChoices.java | 1 -
.../managed/ParameterNegotiationModel.java | 8 +++---
.../managed/PropertyNegotiationModel.java | 1 -
.../interactions/managed/_BindingUtil.java | 7 +++--
.../interactions/managed/nonscalar/DataColumn.java | 1 -
.../interactions/managed/nonscalar/DataRow.java | 1 -
.../managed/nonscalar/DataTableModel.java | 8 +++---
.../core/metamodel/layout/DeweyOrderSet.java | 1 -
.../core/metamodel/layout/LayoutFacetUtil.java | 5 ++--
.../memberorderfacet/MemberOrderComparator.java | 1 -
...tionEnforcesMetamodelContributionValidator.java | 3 +--
.../core/metamodel/methods/MethodFinder.java | 10 +++----
.../core/metamodel/methods/MethodFinderPAT.java | 4 +--
.../methods/MethodPrefixBasedFacetFactory.java | 1 -
.../MethodPrefixBasedFacetFactoryAbstract.java | 1 -
.../core/metamodel/object/Bookmarkable.java | 3 +--
.../core/metamodel/object/ManagedObject.java | 6 ++---
.../core/metamodel/object/ManagedObjects.java | 12 ++++-----
.../core/metamodel/object/MmAssertionUtil.java | 4 +--
.../core/metamodel/object/MmDebugUtil.java | 1 -
.../core/metamodel/object/MmEntityUtil.java | 4 +--
.../core/metamodel/object/MmInvokeUtil.java | 4 +--
.../core/metamodel/object/MmUnwrapUtil.java | 3 ++-
.../core/metamodel/object/MmVisibilityUtil.java | 3 +--
.../object/_ManagedObjectEntityBookmarked.java | 8 +++---
.../object/_ManagedObjectEntityHybrid.java | 6 ++---
.../object/_ManagedObjectEntityTransient.java | 3 +--
.../core/metamodel/object/_ManagedObjectMixin.java | 2 +-
.../core/metamodel/object/_ManagedObjectOther.java | 1 -
.../metamodel/object/_ManagedObjectPacked.java | 2 +-
.../metamodel/object/_ManagedObjectService.java | 3 +--
.../metamodel/object/_ManagedObjectSpecified.java | 4 +--
.../object/_ManagedObjectUnspecified.java | 1 -
.../core/metamodel/object/_ManagedObjectValue.java | 3 +--
.../metamodel/object/_ManagedObjectViewmodel.java | 6 ++---
.../metamodel/objectmanager/ObjectBulkLoader.java | 3 +--
.../metamodel/objectmanager/ObjectCreator.java | 1 -
.../core/metamodel/objectmanager/ObjectLoader.java | 1 -
.../metamodel/objectmanager/ObjectManager.java | 6 ++---
.../objectmanager/ObjectManagerDefault.java | 4 +--
.../objectmanager/memento/ObjectMemento.java | 8 +++---
.../memento/ObjectMementoCollection.java | 3 +--
.../memento/ObjectMementoForScalar.java | 2 +-
.../objectmanager/memento/_RecreatableLookup.java | 2 +-
.../i18n/SynthesizeObjectNamingPostProcessor.java | 1 -
.../TweakDomainEventsForMixinPostProcessor.java | 3 +--
...arameterChoicesFacetFromParentedCollection.java | 1 -
...meterDefaultsFacetFromAssociatedCollection.java | 1 -
.../progmodel/ProgrammingModelAbstract.java | 3 ++-
.../progmodel/ProgrammingModelInitFilter.java | 6 ++---
.../appfeat/ApplicationFeatureDefault.java | 3 +--
.../ApplicationFeatureRepositoryDefault.java | 4 +--
.../classsubstitutor/ClassSubstitutorAbstract.java | 1 -
.../classsubstitutor/ClassSubstitutorRegistry.java | 4 +--
.../services/command/CommandDtoFactory.java | 3 +--
.../services/grid/GridLoaderServiceDefault.java | 10 +++----
.../services/grid/GridReaderUsingJaxb.java | 2 +-
.../services/grid/GridServiceDefault.java | 6 ++---
.../services/grid/GridSystemServiceAbstract.java | 3 +--
.../grid/bootstrap/GridSystemServiceBootstrap.java | 16 +++++------
.../services/grid/bootstrap/_GridModel.java | 5 ++--
.../idstringifier/IdStringifierLookupService.java | 6 ++---
.../services/ixn/InteractionDtoFactory.java | 1 -
.../services/layout/LayoutServiceDefault.java | 4 +--
.../services/metamodel/DomainMemberDefault.java | 3 +--
.../services/metamodel/DomainModelDefault.java | 3 +--
.../services/metamodel/MetaModelAnnotator.java | 2 +-
.../services/metamodel/MetaModelExporter.java | 3 +--
.../metamodel/MetaModelServiceDefault.java | 6 ++---
.../ShadowedFactetAttributeAnnotator.java | 1 -
.../core/metamodel/services/metamodel/_Util.java | 5 ++--
.../HasEnlistedEntityPropertyChanges.java | 3 +--
.../objectlifecycle/ObjectLifecyclePublisher.java | 4 +--
.../services/registry/ServiceRegistryDefault.java | 10 +++----
.../services/schema/SchemaValueMarshaller.java | 3 +--
.../schema/SchemaValueMarshallerAbstract.java | 8 +++---
.../TableColumnOrderServiceUsingTxtFile.java | 4 +--
.../title/TitlesAndTranslationsValidator.java | 3 +--
.../causeway/core/metamodel/spec/ActionScope.java | 1 -
.../core/metamodel/spec/ObjectSpecification.java | 10 +++----
.../core/metamodel/spec/TypeOfAnyCardinality.java | 4 +--
.../core/metamodel/spec/feature/ObjectAction.java | 15 +++++------
.../spec/feature/ObjectActionContainer.java | 3 +--
.../spec/feature/ObjectActionParameter.java | 2 +-
.../metamodel/spec/feature/ObjectAssociation.java | 5 ++--
.../spec/feature/ObjectAssociationContainer.java | 3 +--
.../core/metamodel/spec/feature/ObjectFeature.java | 3 +--
.../core/metamodel/spec/feature/ObjectMember.java | 5 ++--
.../spec/feature/OneToManyAssociation.java | 1 -
.../metamodel/spec/feature/OneToManyFeature.java | 1 -
.../specloader/LogicalTypeResolverDefault.java | 3 +--
.../specloader/ProgrammingModelServiceDefault.java | 2 +-
.../metamodel/specloader/SpecificationCache.java | 1 -
.../specloader/SpecificationCacheDefault.java | 4 +--
.../metamodel/specloader/SpecificationLoader.java | 6 ++---
.../specloader/SpecificationLoaderDefault.java | 16 +++++------
.../specloader/facetprocessor/FacetProcessor.java | 5 ++--
.../specloader/postprocessor/PostProcessor.java | 1 -
.../specloader/specimpl/FacetedMethodsBuilder.java | 10 +++----
.../specloader/specimpl/MemberSortingUtils.java | 3 +--
.../specloader/specimpl/ObjectActionDefault.java | 13 +++++----
.../specloader/specimpl/ObjectActionMixedIn.java | 9 +++----
.../specimpl/ObjectActionParameterAbstract.java | 5 ++--
.../specloader/specimpl/ObjectMemberAbstract.java | 5 ++--
.../specloader/specimpl/ObjectMemberContainer.java | 3 +--
.../specimpl/ObjectSpecificationAbstract.java | 3 ++-
.../specimpl/OneToManyActionParameterDefault.java | 1 -
.../specimpl/OneToManyAssociationDefault.java | 7 +++--
.../specimpl/OneToManyAssociationMixedIn.java | 5 ++--
.../specimpl/OneToOneAssociationDefault.java | 9 +++----
.../specimpl/OneToOneAssociationMixedIn.java | 5 ++--
.../specimpl/_MixedInMemberNamingStrategy.java | 1 -
.../specimpl/dflt/ObjectSpecificationDefault.java | 8 +++---
.../specimpl/dflt/_PropertiesAsColumns.java | 8 +++---
...etaModelValidatorForConflictingOptionality.java | 1 -
.../specloader/validator/ValidationFailure.java | 6 ++---
.../specloader/validator/ValidationFailures.java | 3 +--
.../causeway/core/metamodel/util/Facets.java | 8 +++---
.../core/metamodel/util/snapshot/XmlSnapshot.java | 6 ++---
.../ApplicationFeatureIdValueSemantics.java | 4 +--
.../valuesemantics/BigDecimalValueSemantics.java | 2 +-
.../valuesemantics/BigIntegerValueSemantics.java | 2 +-
.../valuesemantics/BlobValueSemantics.java | 2 +-
.../valuesemantics/BookmarkValueSemantics.java | 4 +--
.../valuesemantics/BooleanValueSemantics.java | 4 +--
.../BufferedImageValueSemantics.java | 4 +--
.../valuesemantics/ByteValueSemantics.java | 4 +--
.../valuesemantics/ChangesDtoValueSemantics.java | 2 +-
.../valuesemantics/CharacterValueSemantics.java | 4 +--
.../valuesemantics/ClobValueSemantics.java | 2 +-
.../valuesemantics/CommandDtoValueSemantics.java | 2 +-
.../valuesemantics/DoubleValueSemantics.java | 4 +--
.../valuesemantics/EnumValueSemanticsAbstract.java | 7 +++--
.../valuesemantics/FloatValueSemantics.java | 4 +--
.../IdStringifierForSerializable.java | 4 +--
.../valuesemantics/IntValueSemantics.java | 4 +--
.../InteractionDtoValueSemantics.java | 2 +-
.../LocalResourcePathValueSemantics.java | 4 +--
.../valuesemantics/LocaleValueSemantics.java | 4 +--
.../valuesemantics/LongValueSemantics.java | 4 +--
.../valuesemantics/MarkupValueSemantics.java | 4 +--
.../valuesemantics/OidDtoValueSemantics.java | 2 +-
.../valuesemantics/PasswordValueSemantics.java | 4 +--
.../valuesemantics/ShortValueSemantics.java | 4 +--
.../valuesemantics/StringValueSemantics.java | 4 +--
.../valuesemantics/TreeNodeValueSemantics.java | 10 +++----
.../valuesemantics/URLValueSemantics.java | 6 ++---
.../valuesemantics/UUIDValueSemantics.java | 4 +--
.../temporal/LocalDateTimeValueSemantics.java | 4 +--
.../temporal/LocalDateValueSemantics.java | 6 +++--
.../temporal/LocalTimeValueSemantics.java | 4 +--
.../temporal/OffsetDateTimeValueSemantics.java | 4 +--
.../temporal/OffsetTimeValueSemantics.java | 6 +++--
.../temporal/TemporalValueSemanticsProvider.java | 4 +--
.../temporal/ZonedDateTimeValueSemantics.java | 6 +++--
.../temporal/legacy/JavaSqlDateValueSemantics.java | 2 +-
.../legacy/JavaSqlTimeStampValueSemantics.java | 2 +-
.../temporal/legacy/JavaSqlTimeValueSemantics.java | 2 +-
.../legacy/JavaUtilDateValueSemantics.java | 2 +-
.../valuetypes/ValueSemanticsResolverDefault.java | 8 +++---
.../metamodel/MetaModelContext_configTest.java | 4 +--
.../metamodel/commons/ListUtilsTest_insert.java | 3 ++-
.../AbstractFacetFactoryJupiterTestCase.java | 2 +-
.../metamodel/facets/AbstractFacetFactoryTest.java | 2 +-
.../Annotations_getAnnotations_on_Class_Test.java | 2 +-
.../Annotations_getAnnotations_on_Field_Test.java | 2 +-
.../Annotations_getAnnotations_on_Method_Test.java | 3 ++-
...notations_getAnnotations_on_Parameter_Test.java | 3 ++-
.../metamodel/facets/CollectionFacetUtilsTest.java | 2 +-
.../causeway/core/metamodel/facets/Utils.java | 1 -
...notationFacetFactoryTest_commandPublishing.java | 1 +
...tationFacetFactoryTest_executionPublishing.java | 2 +-
.../collections/JavaCollectionFacetTest.java | 10 +++----
...etForCollectionLayoutAnnotationFactoryTest.java | 3 +--
.../title/TitleFacetViaMethodsFactoryTest.java | 3 +--
.../NavigableParentAnnotationFacetFactoryTest.java | 2 +-
.../memberorder/DeweyOrderComparatorTest.java | 2 +-
.../ordering/memberorder/DeweyOrderSetTest.java | 4 +--
...cetForParameterLayoutAnnotationFactoryTest.java | 2 +-
.../facets/param/name/ParameterNameFacetTest.java | 2 +-
.../ValueSemanticsProviderAbstractTestCase.java | 2 +-
.../ValueSemanticsAnnotationFacetFactoryTest.java | 3 +--
...jectAssociationPredicatesTest_visibleWhere.java | 2 +-
.../interactions/InteractionUtils_isA_Test.java | 2 +-
.../core/metamodel/object/ManagedObjectTest.java | 2 +-
.../objects/OneToManyAssociationDefaultTest.java | 2 +-
.../objects/TypeExtractorMethodReturnTest.java | 4 +--
.../ServiceInjectorDefaultTest_usingFields.java | 6 ++---
...erviceInjectorDefaultTest_validateServices.java | 8 +++---
.../ApplicationFeatureRepositoryDefaultTest.java | 2 +-
.../GridLoaderServiceDefault_resourceNameTest.java | 4 +--
.../services/grid/GridXmlRoundtripTest.java | 12 ++++-----
.../services/menubars/BSMenuBarsTest.java | 2 +-
.../metamodel/MetaModelServiceDefaultTest.java | 4 +--
.../metamodel/spec/TypeOfAnyCardinalityTest.java | 2 +-
.../SpecificationLoaderTest_nonScalar.java | 2 +-
.../ClassSubstitutorTest_getClass.java | 2 +-
.../specimpl/MixedInMemberNamingStrategyTest.java | 3 ++-
.../specimpl/ObjectAssociationAbstractTest.java | 4 +--
...ObjectAssociationAbstractTest_alwaysHidden.java | 2 +-
.../specimpl/OneToOneAssociationAbstractTest.java | 4 +--
.../IdStringifierForSerializable_Test.java | 4 +--
.../core/runtime/CausewayModuleCoreRuntime.java | 5 ++--
.../apache/causeway/core/runtime/events/_Xray.java | 7 +++--
.../CausewayModuleCoreRuntimeServices.java | 11 ++++----
.../bookmarks/BookmarkServiceDefault.java | 4 +--
.../command/CommandDtoFactoryDefault.java | 4 +--
.../command/CommandExecutorServiceDefault.java | 10 +++----
.../command/SchemaValueMarshallerDefault.java | 4 +--
.../runtimeservices/email/EmailServiceDefault.java | 2 +-
.../eventbus/EventBusServiceSpring.java | 13 ++++-----
.../executor/MemberExecutorServiceDefault.java | 10 +++----
.../core/runtimeservices/executor/_Xray.java | 4 +--
.../factory/FactoryServiceDefault.java | 4 +--
.../homepage/HomePageResolverServiceDefault.java | 2 +-
.../core/runtimeservices/i18n/po/PoReader.java | 9 +++----
.../core/runtimeservices/i18n/po/PoWriter.java | 5 ++--
.../i18n/po/TranslationServicePo.java | 4 +--
.../i18n/po/TranslationServicePoMenu.java | 3 +--
.../icons/ObjectIconServiceDefault.java | 12 ++++-----
.../interaction/InteractionDtoFactoryDefault.java | 4 +--
.../runtimeservices/jaxb/JaxbServiceDefault.java | 4 +--
.../locale/LocaleChoiceProviderDefault.java | 4 +--
.../menubars/MenuBarsLoaderServiceDefault.java | 2 +-
.../menubars/bootstrap/MenuBarsServiceBS.java | 12 ++++-----
.../PlaceholderRenderServiceDefault.java | 4 +--
.../publish/CommandPublisherDefault.java | 6 ++---
.../publish/EntityChangesPublisherDefault.java | 26 +++++++++---------
.../EntityPropertyChangePublisherDefault.java | 31 +++++++++++-----------
.../publish/ExecutionPublisherDefault.java | 4 +--
.../publish/LifecycleCallbackNotifier.java | 6 ++---
.../publish/ObjectLifecyclePublisherDefault.java | 4 +--
.../core/runtimeservices/publish/_Xray.java | 6 ++---
.../ExceptionRecognizerServiceDefault.java | 8 +++---
.../ExceptionRecognizerForDataAccessException.java | 2 +-
.../repository/RepositoryServiceDefault.java | 4 +--
.../scratchpad/ScratchpadDefault.java | 4 +--
.../serializing/SerializingAdapterDefault.java | 8 +++---
.../session/InteractionServiceDefault.java | 15 ++++++-----
.../core/runtimeservices/session/_Xray.java | 5 ++--
.../sitemap/SitemapServiceDefault.java | 4 +--
.../runtimeservices/spring/BeanDescriptor.java | 3 ++-
.../transaction/TransactionServiceSpring.java | 14 +++++-----
.../UrlEncodingServiceWithCompression.java | 6 ++---
.../userreg/EmailNotificationServiceDefault.java | 4 +--
.../wrapper/WrapperFactoryDefault.java | 14 +++++-----
.../InteractionEventDispatcherTypeSafe.java | 3 +--
.../handlers/CollectionInvocationHandler.java | 1 -
.../DelegatingInvocationHandlerDefault.java | 5 ++--
.../handlers/DomainObjectInvocationHandler.java | 15 +++++------
.../wrapper/handlers/MapInvocationHandler.java | 1 -
.../NonScalarInvocationHandlerAbstract.java | 3 +--
.../wrapper/proxy/ProxyCreator.java | 2 +-
.../runtimeservices/xml/XmlServiceDefault.java | 4 +--
.../xmlsnapshot/XmlSnapshotBuilder.java | 2 +-
.../RuntimeServicesTestAbstract.java | 2 +-
.../email/EmailServiceDefaultTest_actually.java | 4 +--
.../email/EmailServiceDefaultTest_notEmpty.java | 1 -
.../core/runtimeservices/i18n/po/PoReaderTest.java | 6 ++---
.../i18n/po/PoWriterTest_escape.java | 1 -
.../menubars/bootstrap/MenuBarsServiceBSTest.java | 1 -
...eptionRecognizerForDataAccessExceptionTest.java | 1 -
.../runtimeservices/urlencoding/MementosTest.java | 9 +++----
.../urlencoding/UrlEncodingServiceTest.java | 1 -
.../wrapper/WrapperFactoryDefaultTest.java | 15 +++++------
.../proxy/ProxyCreatorTestUsingCodegenPlugin.java | 6 ++---
.../XmlSnapshotServiceDefault_Test.java | 8 +++---
.../core/security/CausewayModuleCoreSecurity.java | 5 ++--
.../_testing/InteractionService_forTesting.java | 3 +--
.../AuthenticationRequestAbstract.java | 3 ++-
.../AuthenticationRequestLogonFixture.java | 1 -
.../security/authentication/logout/LogoutMenu.java | 3 +--
.../manager/AuthenticationManager.java | 6 ++---
.../manager/AuthorizationManager.java | 4 +--
.../causeway/core/security/util/XrayUtil.java | 3 +--
.../security/EncodabilityContractTest.java | 7 ++---
.../AuthenticationManager_authenticators_Test.java | 13 ++++-----
.../SimpleSessionEncodabilityTestAbstract.java | 6 ++---
...rdAuthenticationManager_AuthenticationTest.java | 11 ++++----
.../transaction/CausewayModuleCoreTransaction.java | 3 ++-
.../changetracking/EntityChangeTracker.java | 2 +-
.../core/webapp/CausewayModuleCoreWebapp.java | 2 +-
.../confmenu/ConfigurationViewServiceDefault.java | 10 +++----
.../causeway/core/webapp/modules/WebModule.java | 4 +--
.../core/webapp/modules/WebModuleAbstract.java | 3 +--
.../core/webapp/modules/WebModuleContext.java | 3 +--
.../logonlog/WebModuleLogOnExceptionLogger.java | 4 +--
.../templresources/TemplateResourceServlet.java | 10 +++----
.../templresources/WebModuleTemplateResources.java | 4 +--
.../CausewayWebAppContextInitializer.java | 5 ++--
.../bypass/CausewayModuleSecurityBypass.java | 5 ++--
.../keycloak/CausewayModuleSecurityKeycloak.java | 15 ++++++-----
.../keycloak/handler/LogoutHandlerForKeycloak.java | 2 +-
.../services/KeycloakOauth2UserService.java | 2 --
.../shiro/CausewayModuleSecurityShiro.java | 5 ++--
.../shiro/authentication/AuthenticatorShiro.java | 2 +-
.../shiro/authorization/CausewayPermission.java | 5 ++--
.../security/shiro/webmodule/WebModuleShiro.java | 12 ++++-----
.../shiro/CausewayPermissionTest_setParts.java | 3 ++-
.../shiro/CausewayPermissionTest_typicalUsage.java | 3 ++-
.../CausewayPermissionTest_equals.java | 1 -
.../PermissionToRoleMapperFromIniTest.java | 3 ++-
.../PermissionToRoleMapperFromStringTest.java | 4 +--
.../shiro/permrolemapper/UtilTest_parse.java | 1 -
.../authconverters/AuthenticationConverter.java | 2 +-
.../spring/webmodule/WebModuleSpringSecurity.java | 4 +--
806 files changed, 1390 insertions(+), 1658 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/CausewayModuleApplib.java b/api/applib/src/main/java/org/apache/causeway/applib/CausewayModuleApplib.java
index bbaac7a440..ce1ec3f5e3 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/CausewayModuleApplib.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/CausewayModuleApplib.java
@@ -18,6 +18,9 @@
*/
package org.apache.causeway.applib;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
import org.apache.causeway.applib.domain.DomainObjectList;
import org.apache.causeway.applib.mixins.dto.Dto_downloadXml;
import org.apache.causeway.applib.mixins.dto.Dto_downloadXsd;
@@ -53,8 +56,6 @@ import org.apache.causeway.applib.services.user.UserMemento;
import org.apache.causeway.applib.services.user.UserService;
import org.apache.causeway.applib.services.userui.UserMenu;
import org.apache.causeway.schema.CausewayModuleSchema;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
/**
* @since 2.0 {@index}
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/Identifier.java b/api/applib/src/main/java/org/apache/causeway/applib/Identifier.java
index 1a4fa00117..1e12d565a5 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/Identifier.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/Identifier.java
@@ -23,15 +23,14 @@ import java.lang.reflect.Method;
import java.util.Objects;
import java.util.stream.Collectors;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.reflection._Reflect;
-
import org.apache.causeway.applib.id.HasLogicalType;
import org.apache.causeway.applib.id.LogicalType;
import org.apache.causeway.applib.services.i18n.HasTranslationContext;
import org.apache.causeway.applib.services.i18n.TranslationContext;
import org.apache.causeway.applib.services.i18n.TranslationService;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.reflection._Reflect;
import lombok.Getter;
import lombok.NonNull;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/client/RepresentationTypeSimplifiedV2.java b/api/applib/src/main/java/org/apache/causeway/applib/client/RepresentationTypeSimplifiedV2.java
index 395952a25b..8b15fd2b6b 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/client/RepresentationTypeSimplifiedV2.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/client/RepresentationTypeSimplifiedV2.java
@@ -22,9 +22,10 @@ import java.util.Objects;
import java.util.Optional;
import java.util.stream.Stream;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.base._Strings.KeyValuePair;
-import org.springframework.lang.Nullable;
import lombok.Getter;
import lombok.NonNull;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/events/EventObjectBase.java b/api/applib/src/main/java/org/apache/causeway/applib/events/EventObjectBase.java
index 667340a305..3afd67bdbb 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/events/EventObjectBase.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/events/EventObjectBase.java
@@ -18,9 +18,10 @@
*/
package org.apache.causeway.applib.events;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
+
import lombok.NonNull;
/**
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/events/domain/AbstractDomainEvent.java b/api/applib/src/main/java/org/apache/causeway/applib/events/domain/AbstractDomainEvent.java
index 87138340f4..ba20e5388f 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/events/domain/AbstractDomainEvent.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/events/domain/AbstractDomainEvent.java
@@ -24,8 +24,6 @@ import java.util.Optional;
import java.util.function.BooleanSupplier;
import java.util.function.Supplier;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.Identifier;
@@ -33,6 +31,8 @@ import org.apache.causeway.applib.events.EventObjectBase;
import org.apache.causeway.applib.services.i18n.TranslatableString;
import org.apache.causeway.applib.util.ObjectContracts;
import org.apache.causeway.applib.util.ToString;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import lombok.Getter;
import lombok.NonNull;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/events/metamodel/MetamodelListener.java b/api/applib/src/main/java/org/apache/causeway/applib/events/metamodel/MetamodelListener.java
index df341d2e52..a50965d972 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/events/metamodel/MetamodelListener.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/events/metamodel/MetamodelListener.java
@@ -18,11 +18,11 @@
*/
package org.apache.causeway.applib.events.metamodel;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.springframework.context.event.EventListener;
import org.springframework.core.annotation.Order;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
/**
* Convenience interface to listen on {@link MetamodelEvent}s.
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/exceptions/RecoverableException.java b/api/applib/src/main/java/org/apache/causeway/applib/exceptions/RecoverableException.java
index 43a82c4aa7..be04b63bcb 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/exceptions/RecoverableException.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/exceptions/RecoverableException.java
@@ -18,11 +18,10 @@
*/
package org.apache.causeway.applib.exceptions;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.services.i18n.TranslatableString;
import org.apache.causeway.applib.services.i18n.TranslationContext;
import org.apache.causeway.applib.services.message.MessageService;
+import org.apache.causeway.commons.internal.base._Strings;
import lombok.Getter;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/exceptions/UnrecoverableException.java b/api/applib/src/main/java/org/apache/causeway/applib/exceptions/UnrecoverableException.java
index b2d89f44b0..9dbb5a925b 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/exceptions/UnrecoverableException.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/exceptions/UnrecoverableException.java
@@ -18,10 +18,9 @@
*/
package org.apache.causeway.applib.exceptions;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.services.i18n.TranslatableString;
import org.apache.causeway.applib.services.i18n.TranslationContext;
+import org.apache.causeway.commons.internal.base._Strings;
import lombok.Getter;
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 e669c16411..60037fde2c 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
@@ -29,9 +29,6 @@ import java.util.stream.StreamSupport;
import javax.inject.Named;
-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 org.springframework.lang.Nullable;
import org.apache.causeway.applib.CausewayModuleApplib;
@@ -40,6 +37,9 @@ import org.apache.causeway.applib.annotation.Value;
import org.apache.causeway.applib.graph.Edge;
import org.apache.causeway.applib.graph.SimpleEdge;
import org.apache.causeway.applib.graph.Vertex;
+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 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 d27a07aaff..bdb5d66c9d 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
@@ -29,14 +29,14 @@ import java.util.function.Supplier;
import javax.inject.Named;
import javax.persistence.Table;
-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 org.springframework.lang.Nullable;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.DomainService;
import org.apache.causeway.applib.annotation.Value;
+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 lombok.Getter;
import lombok.NonNull;
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 41673a874e..0de70c675d 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
@@ -27,9 +27,6 @@ import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.causeway.commons.internal.primitives._Ints;
-import org.apache.causeway.commons.internal.primitives._Ints.Bound;
-
import org.apache.causeway.applib.layout.component.ActionLayoutData;
import org.apache.causeway.applib.layout.component.ActionLayoutDataOwner;
import org.apache.causeway.applib.layout.component.CollectionLayoutData;
@@ -38,6 +35,8 @@ import org.apache.causeway.applib.layout.component.DomainObjectLayoutData;
import org.apache.causeway.applib.layout.component.DomainObjectLayoutDataOwner;
import org.apache.causeway.applib.layout.component.FieldSet;
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;
/**
* 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/menubars/MenuBars.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/MenuBars.java
index 54a5552dde..f2058505ed 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/MenuBars.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/MenuBars.java
@@ -22,10 +22,9 @@ import java.util.Map;
import java.util.function.Consumer;
import java.util.stream.Stream;
-import org.apache.causeway.commons.internal.collections._Lists;
-
import org.apache.causeway.applib.annotation.DomainServiceLayout;
import org.apache.causeway.applib.layout.component.ServiceActionLayoutData;
+import org.apache.causeway.commons.internal.collections._Lists;
import lombok.val;
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 243fcd471d..58bdd4826f 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
@@ -25,10 +25,9 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
-
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/query/_NamedQueryDefault.java b/api/applib/src/main/java/org/apache/causeway/applib/query/_NamedQueryDefault.java
index 29c97d3398..e1ef60f4b8 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/query/_NamedQueryDefault.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/query/_NamedQueryDefault.java
@@ -22,9 +22,10 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
+
import lombok.Getter;
import lombok.NonNull;
import lombok.val;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeat/ApplicationFeatureId.java b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeat/ApplicationFeatureId.java
index 8c96ff086c..b1432099c0 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeat/ApplicationFeatureId.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeat/ApplicationFeatureId.java
@@ -22,11 +22,10 @@ import java.io.Serializable;
import java.util.Comparator;
import java.util.function.Consumer;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.assertions._Assert;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
+import static java.util.Comparator.comparing;
+import static java.util.Comparator.naturalOrder;
+import static java.util.Comparator.nullsFirst;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.Identifier;
@@ -39,10 +38,11 @@ import org.apache.causeway.applib.util.Hashing;
import org.apache.causeway.applib.util.ObjectContracts;
import org.apache.causeway.applib.util.TitleBuffer;
import org.apache.causeway.applib.util.ToString;
-
-import static java.util.Comparator.comparing;
-import static java.util.Comparator.naturalOrder;
-import static java.util.Comparator.nullsFirst;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.assertions._Assert;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.collections._Lists;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import lombok.Getter;
import lombok.NonNull;
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 15cb875d0a..ac94307bef 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
@@ -24,8 +24,6 @@ import java.util.List;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.causeway.commons.internal.collections._Lists;
-
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
@@ -40,6 +38,7 @@ import org.apache.causeway.applib.services.appfeat.ApplicationFeature;
import org.apache.causeway.applib.services.appfeat.ApplicationFeatureRepository;
import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.services.repository.RepositoryService;
+import org.apache.causeway.commons.internal.collections._Lists;
/**
* @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 6cc4437718..ed37d3dd7e 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
@@ -29,10 +29,6 @@ import java.util.function.Function;
import javax.inject.Inject;
import javax.inject.Named;
-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 org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.ViewModel;
import org.apache.causeway.applib.annotation.DomainObject;
@@ -55,6 +51,9 @@ import org.apache.causeway.applib.util.Equality;
import org.apache.causeway.applib.util.Hashing;
import org.apache.causeway.applib.util.ObjectContracts;
import org.apache.causeway.applib.util.ToString;
+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 lombok.Getter;
import lombok.NonNull;
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 0b7ef2704f..88fcd4805f 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
@@ -24,13 +24,13 @@ import java.util.StringTokenizer;
import javax.inject.Named;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.codec._UrlDecoderUtil;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.id.LogicalType;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.codec._UrlDecoderUtil;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.schema.common.v2.OidDto;
import lombok.AccessLevel;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/idstringifiers/PredefinedSerializables.java b/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/idstringifiers/PredefinedSerializables.java
index e72444ac87..5b7d7773e8 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/idstringifiers/PredefinedSerializables.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/idstringifiers/PredefinedSerializables.java
@@ -22,10 +22,9 @@ import java.io.Serializable;
import java.util.List;
import java.util.Set;
-import org.apache.causeway.commons.internal.collections._Sets;
-
import org.apache.causeway.applib.graph.tree.TreeState;
import org.apache.causeway.applib.services.bookmark.Bookmark;
+import org.apache.causeway.commons.internal.collections._Sets;
import lombok.experimental.UtilityClass;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/command/Command.java b/api/applib/src/main/java/org/apache/causeway/applib/services/command/Command.java
index cdfac517ad..d986909601 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/command/Command.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/command/Command.java
@@ -21,8 +21,6 @@ package org.apache.causeway.applib.services.command;
import java.sql.Timestamp;
import java.util.UUID;
-import org.apache.causeway.commons.functional.Try;
-
import org.apache.causeway.applib.events.domain.ActionDomainEvent;
import org.apache.causeway.applib.jaxb.JavaSqlXMLGregorianCalendarMarshalling;
import org.apache.causeway.applib.mixins.security.HasUsername;
@@ -34,6 +32,7 @@ import org.apache.causeway.applib.services.iactn.Interaction;
import org.apache.causeway.applib.services.publishing.spi.CommandSubscriber;
import org.apache.causeway.applib.services.wrapper.WrapperFactory;
import org.apache.causeway.applib.services.wrapper.control.AsyncControl;
+import org.apache.causeway.commons.functional.Try;
import org.apache.causeway.schema.cmd.v2.CommandDto;
import lombok.Getter;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/command/CommandOutcomeHandler.java b/api/applib/src/main/java/org/apache/causeway/applib/services/command/CommandOutcomeHandler.java
index aa093e9cf2..9e3a175c2d 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/command/CommandOutcomeHandler.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/command/CommandOutcomeHandler.java
@@ -20,9 +20,8 @@ package org.apache.causeway.applib.services.command;
import java.sql.Timestamp;
-import org.apache.causeway.commons.functional.Try;
-
import org.apache.causeway.applib.services.bookmark.Bookmark;
+import org.apache.causeway.commons.functional.Try;
/**
* Used by {@link CommandExecutorService}, to update a {@link Command} after it has been executed.
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 ec912ab9bc..f1a66666dc 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
@@ -25,13 +25,12 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.causeway.commons.internal.base._Objects;
-
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.annotation.Editing;
import org.apache.causeway.applib.annotation.Title;
+import org.apache.causeway.commons.internal.base._Objects;
import lombok.Getter;
import lombok.NoArgsConstructor;
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 ad521be96f..e45e1ec089 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
@@ -25,11 +25,10 @@ import java.util.function.Predicate;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
-
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 lombok.Getter;
import lombok.Setter;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/grid/GridService.java b/api/applib/src/main/java/org/apache/causeway/applib/services/grid/GridService.java
index 3a1c4489e5..62745e0839 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/grid/GridService.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/grid/GridService.java
@@ -18,14 +18,13 @@
*/
package org.apache.causeway.applib.services.grid;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
-
import org.apache.causeway.applib.annotation.ActionLayout;
import org.apache.causeway.applib.annotation.CollectionLayout;
import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.layout.grid.Grid;
import org.apache.causeway.applib.services.layout.LayoutExportStyle;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
/**
* Provides the ability to load the XML layout (grid) for a domain class.
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/i18n/TranslatableString.java b/api/applib/src/main/java/org/apache/causeway/applib/services/i18n/TranslatableString.java
index 7010072bf9..008a0bc39e 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/i18n/TranslatableString.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/i18n/TranslatableString.java
@@ -24,9 +24,8 @@ import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.causeway.commons.internal.collections._Lists;
-
import org.apache.causeway.applib.annotation.Domain;
+import org.apache.causeway.commons.internal.collections._Lists;
/**
* @since 1.x {@index}
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/i18n/TranslationContext.java b/api/applib/src/main/java/org/apache/causeway/applib/services/i18n/TranslationContext.java
index 5ba2248a30..46d0ee1a8d 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/i18n/TranslationContext.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/i18n/TranslationContext.java
@@ -21,9 +21,10 @@ package org.apache.causeway.applib.services.i18n;
import java.io.Serializable;
import java.lang.reflect.Method;
-import org.apache.causeway.commons.internal.base._Strings;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.internal.base._Strings;
+
import lombok.Getter;
import lombok.Value;
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 7f537fc992..2799df1ceb 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,8 +22,6 @@ import java.sql.Timestamp;
import java.util.Collections;
import java.util.List;
-import org.apache.causeway.commons.internal.collections._Lists;
-
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.events.domain.AbstractDomainEvent;
import org.apache.causeway.applib.jaxb.JavaSqlXMLGregorianCalendarMarshalling;
@@ -32,6 +30,7 @@ import org.apache.causeway.applib.services.eventbus.EventBusService;
import org.apache.causeway.applib.services.metrics.MetricsService;
import org.apache.causeway.applib.services.wrapper.WrapperFactory;
import org.apache.causeway.applib.util.schema.MemberExecutionDtoUtils;
+import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.schema.common.v2.DifferenceDto;
import org.apache.causeway.schema.common.v2.InteractionType;
import org.apache.causeway.schema.common.v2.PeriodDto;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/iactn/Interaction.java b/api/applib/src/main/java/org/apache/causeway/applib/services/iactn/Interaction.java
index d697cd8ef0..79e0875b2b 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/iactn/Interaction.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/iactn/Interaction.java
@@ -20,10 +20,9 @@ package org.apache.causeway.applib.services.iactn;
import java.util.UUID;
-import org.apache.causeway.commons.having.HasTypeSpecificAttributes;
-
import org.apache.causeway.applib.mixins.system.HasInteractionId;
import org.apache.causeway.applib.services.command.Command;
+import org.apache.causeway.commons.having.HasTypeSpecificAttributes;
/**
* Represents an action invocation or property modification, resulting in some
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/iactn/InteractionProvider.java b/api/applib/src/main/java/org/apache/causeway/applib/services/iactn/InteractionProvider.java
index 4319fb5ea7..c380f17c53 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/iactn/InteractionProvider.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/iactn/InteractionProvider.java
@@ -21,11 +21,10 @@ package org.apache.causeway.applib.services.iactn;
import java.util.Optional;
import java.util.UUID;
+import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
import org.apache.causeway.commons.internal.debug._Probe;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
-
/**
* Provides the current thread's {@link Interaction}.
*
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/iactnlayer/InteractionLayerTracker.java b/api/applib/src/main/java/org/apache/causeway/applib/services/iactnlayer/InteractionLayerTracker.java
index 34e5865994..96e05ed9a8 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/iactnlayer/InteractionLayerTracker.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/iactnlayer/InteractionLayerTracker.java
@@ -20,10 +20,9 @@ package org.apache.causeway.applib.services.iactnlayer;
import java.util.Optional;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
-
import org.apache.causeway.applib.services.iactn.Interaction;
import org.apache.causeway.applib.services.iactn.InteractionProvider;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
/**
* Provides access to the current {@link InteractionLayer}.
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 fb97e8f242..873502f3a0 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
@@ -32,9 +32,6 @@ import javax.xml.transform.Transformer;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-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 org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -42,6 +39,10 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
+import org.apache.causeway.commons.internal.codec._DocumentFactories;
+import org.apache.causeway.commons.internal.collections._Lists;
+import org.apache.causeway.commons.internal.collections._Maps;
+
/**
* 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/JaxbService.java b/api/applib/src/main/java/org/apache/causeway/applib/services/jaxb/JaxbService.java
index 98fb915ab1..8f5999be24 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/jaxb/JaxbService.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/jaxb/JaxbService.java
@@ -27,10 +27,11 @@ import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.internal.resources._Xml;
-import org.springframework.lang.Nullable;
import lombok.NonNull;
import lombok.SneakyThrows;
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 03955a5619..1b8c8fa129 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,8 +22,6 @@ import javax.activation.MimeType;
import javax.activation.MimeTypeParseException;
import javax.inject.Named;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
@@ -37,6 +35,7 @@ import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.services.menu.MenuBarsService;
import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.applib.value.Clob;
+import org.apache.causeway.commons.internal.base._Strings;
/**
* 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/menu/MenuBarsService.java b/api/applib/src/main/java/org/apache/causeway/applib/services/menu/MenuBarsService.java
index 15fc29b38a..654359f435 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/menu/MenuBarsService.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/menu/MenuBarsService.java
@@ -20,11 +20,10 @@ package org.apache.causeway.applib.services.menu;
import javax.inject.Named;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
-
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.Value;
import org.apache.causeway.applib.layout.menubars.MenuBars;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
/**
* Responsible for returning a {@link MenuBarsService} instance, a data
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/DomainModel.java b/api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/DomainModel.java
index a7c8779a64..8869c5957e 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/DomainModel.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/DomainModel.java
@@ -21,9 +21,10 @@ package org.apache.causeway.applib.services.metamodel;
import java.util.List;
import java.util.function.BiConsumer;
-import org.apache.causeway.commons.internal.collections._Multimaps;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.internal.collections._Multimaps;
+
import lombok.val;
/**
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/MetaModelServiceMenu.java b/api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/MetaModelServiceMenu.java
index 6844976968..4cc0d804e3 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/MetaModelServiceMenu.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/MetaModelServiceMenu.java
@@ -28,8 +28,6 @@ import static java.nio.charset.StandardCharsets.UTF_8;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.causeway.commons.internal.collections._Sets;
-
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
@@ -47,6 +45,7 @@ import org.apache.causeway.applib.services.jaxb.JaxbService;
import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.applib.value.Clob;
import org.apache.causeway.applib.value.NamedWithMimeType.CommonMimeType;
+import org.apache.causeway.commons.internal.collections._Sets;
import org.apache.causeway.schema.metamodel.v2.MetamodelDto;
import lombok.val;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/_AsciiExport.java b/api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/_AsciiExport.java
index 7c1f7b2003..4ae71a113e 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/_AsciiExport.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/_AsciiExport.java
@@ -20,9 +20,9 @@ package org.apache.causeway.applib.services.metamodel;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.schema.metamodel.v2.Collection;
import org.apache.causeway.schema.metamodel.v2.DomainClassDto;
import org.apache.causeway.schema.metamodel.v2.FacetAttr;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/_DiffExport.java b/api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/_DiffExport.java
index 912801ffde..866233e767 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/_DiffExport.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/_DiffExport.java
@@ -31,7 +31,6 @@ import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.causeway.commons.internal.collections._Sets;
import org.apache.causeway.commons.internal.collections._Streams;
-
import org.apache.causeway.schema.metamodel.v2.DomainClassDto;
import org.apache.causeway.schema.metamodel.v2.Facet;
import org.apache.causeway.schema.metamodel.v2.FacetAttr;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/spi/CommandSubscriber.java b/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/spi/CommandSubscriber.java
index ff86fd18c8..b412dbcc38 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/spi/CommandSubscriber.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/spi/CommandSubscriber.java
@@ -18,9 +18,8 @@
*/
package org.apache.causeway.applib.services.publishing.spi;
-import org.apache.causeway.commons.having.HasEnabling;
-
import org.apache.causeway.applib.services.command.Command;
+import org.apache.causeway.commons.having.HasEnabling;
/**
* Part of the <i>Publishing SPI</i>. A component to receive {@link Command}s
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/spi/EntityChangesSubscriber.java b/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/spi/EntityChangesSubscriber.java
index 4afe2b190c..298354da9d 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/spi/EntityChangesSubscriber.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/spi/EntityChangesSubscriber.java
@@ -18,9 +18,8 @@
*/
package org.apache.causeway.applib.services.publishing.spi;
-import org.apache.causeway.commons.having.HasEnabling;
-
import org.apache.causeway.applib.annotation.DomainObject;
+import org.apache.causeway.commons.having.HasEnabling;
/**
* SPI to receive a summary of the number of entities that have changed as the
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/spi/EntityPropertyChangeSubscriber.java b/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/spi/EntityPropertyChangeSubscriber.java
index acd81b6544..d2a0d0d1e6 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/spi/EntityPropertyChangeSubscriber.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/spi/EntityPropertyChangeSubscriber.java
@@ -18,9 +18,8 @@
*/
package org.apache.causeway.applib.services.publishing.spi;
-import org.apache.causeway.commons.having.HasEnabling;
-
import org.apache.causeway.applib.annotation.DomainObject;
+import org.apache.causeway.commons.having.HasEnabling;
/**
* SPI called for each pre-post change to a property of a domain entity during
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/spi/ExecutionSubscriber.java b/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/spi/ExecutionSubscriber.java
index b032515384..bb40d4e4ee 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/spi/ExecutionSubscriber.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/spi/ExecutionSubscriber.java
@@ -18,12 +18,11 @@
*/
package org.apache.causeway.applib.services.publishing.spi;
-import org.apache.causeway.commons.having.HasEnabling;
-
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.services.iactn.Execution;
import org.apache.causeway.applib.util.schema.InteractionDtoUtils;
+import org.apache.causeway.commons.having.HasEnabling;
/**
* SPI that allows the execution of individual interactions (action invocations
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 91ac80018e..5c4425744b 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
@@ -26,9 +26,6 @@ import java.util.concurrent.Callable;
import javax.annotation.Priority;
import javax.inject.Named;
-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 org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -37,6 +34,9 @@ import org.springframework.stereotype.Component;
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.InteractionScope;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
+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 lombok.Data;
import lombok.EqualsAndHashCode;
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 e8047077d8..922038d4dc 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
@@ -22,10 +22,10 @@ import java.util.Comparator;
import javax.annotation.Priority;
-import org.apache.causeway.commons.internal.reflection._Reflect;
import org.springframework.context.annotation.Primary;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.commons.internal.reflection._Reflect;
import lombok.val;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/registry/ServiceRegistry.java b/api/applib/src/main/java/org/apache/causeway/applib/services/registry/ServiceRegistry.java
index 2b7d43486a..e20bda5add 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/registry/ServiceRegistry.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/registry/ServiceRegistry.java
@@ -26,14 +26,13 @@ import java.util.stream.Stream;
import javax.annotation.Priority;
+import org.apache.causeway.applib.id.LogicalType;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal._Constants;
import org.apache.causeway.commons.internal.base._Reduction;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.commons.internal.ioc._ManagedBeanAdapter;
-import org.apache.causeway.applib.id.LogicalType;
-
import lombok.val;
/**
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 f8d241e9ce..61bd0e675d 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
@@ -20,8 +20,6 @@ package org.apache.causeway.applib.services.sitemap;
import javax.inject.Named;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
@@ -34,6 +32,7 @@ import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.annotation.RestrictTo;
import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.value.Clob;
+import org.apache.causeway.commons.internal.base._Strings;
/**
* 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 f5bea6fbc9..c2dc751fe7 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
@@ -26,7 +26,6 @@ import javax.annotation.Priority;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.causeway.commons.functional.ThrowingRunnable;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
@@ -37,6 +36,7 @@ import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.user.RoleMemento;
import org.apache.causeway.applib.services.user.UserService;
+import org.apache.causeway.commons.functional.ThrowingRunnable;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserMemento.java b/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserMemento.java
index dfdfae1724..caa631138d 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserMemento.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserMemento.java
@@ -29,8 +29,6 @@ import java.util.stream.Stream;
import javax.inject.Named;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.base._Strings;
import org.springframework.context.event.EventListener;
import org.springframework.core.annotation.Order;
import org.springframework.lang.Nullable;
@@ -49,6 +47,8 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.locale.UserLocale;
import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.base._Strings;
import lombok.Builder;
import lombok.Getter;
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 3525a3e0b4..ff01139c70 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
@@ -26,7 +26,6 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Provider;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.lang.Nullable;
import org.springframework.stereotype.Service;
@@ -36,6 +35,7 @@ import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker;
import org.apache.causeway.applib.services.sudo.SudoService;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/WrapperFactory.java b/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/WrapperFactory.java
index 039fb287fc..59d3eff970 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/WrapperFactory.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/WrapperFactory.java
@@ -22,16 +22,12 @@ import java.util.List;
import java.util.concurrent.ExecutorService;
import org.apache.causeway.applib.exceptions.recoverable.InteractionException;
-import org.apache.causeway.applib.services.command.Command;
import org.apache.causeway.applib.services.factory.FactoryService;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
import org.apache.causeway.applib.services.wrapper.callable.AsyncCallable;
import org.apache.causeway.applib.services.wrapper.control.AsyncControl;
import org.apache.causeway.applib.services.wrapper.control.SyncControl;
import org.apache.causeway.applib.services.wrapper.events.InteractionEvent;
import org.apache.causeway.applib.services.wrapper.listeners.InteractionListener;
-import org.apache.causeway.schema.cmd.v2.CommandDto;
-import org.springframework.transaction.annotation.Propagation;
/**
*
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/WrappingObject.java b/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/WrappingObject.java
index 00da4b88d0..333d4e4550 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/WrappingObject.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/WrappingObject.java
@@ -18,10 +18,9 @@
*/
package org.apache.causeway.applib.services.wrapper;
-import org.apache.causeway.commons.collections.ImmutableEnumSet;
-
import org.apache.causeway.applib.services.wrapper.control.ExecutionMode;
import org.apache.causeway.applib.services.wrapper.control.SyncControl;
+import org.apache.causeway.commons.collections.ImmutableEnumSet;
/**
* Implemented by all objects that have been viewed as per
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/callable/AsyncCallable.java b/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/callable/AsyncCallable.java
index 02beac4be7..86cdeb4719 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/callable/AsyncCallable.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/callable/AsyncCallable.java
@@ -22,11 +22,12 @@ import java.io.Serializable;
import java.util.UUID;
import java.util.concurrent.ExecutorService;
+import org.springframework.transaction.annotation.Propagation;
+
import org.apache.causeway.applib.services.command.Command;
import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
import org.apache.causeway.applib.services.wrapper.control.AsyncControl;
import org.apache.causeway.schema.cmd.v2.CommandDto;
-import org.springframework.transaction.annotation.Propagation;
/**
* Provides access to the details of the asynchronous callable (representing a child command to be executed
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/control/AsyncControl.java b/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/control/AsyncControl.java
index fcfccfab55..fc4e3917c3 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/control/AsyncControl.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/control/AsyncControl.java
@@ -28,10 +28,9 @@ import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-import org.apache.causeway.commons.internal.assertions._Assert;
-
import org.apache.causeway.applib.clock.VirtualClock;
import org.apache.causeway.applib.services.user.UserMemento;
+import org.apache.causeway.commons.internal.assertions._Assert;
import lombok.Getter;
import lombok.NonNull;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/control/ControlAbstract.java b/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/control/ControlAbstract.java
index 5dcf183e06..69552e8716 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/control/ControlAbstract.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/control/ControlAbstract.java
@@ -22,11 +22,10 @@ import java.lang.reflect.Method;
import java.util.EnumSet;
import java.util.Optional;
+import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.commons.collections.ImmutableEnumSet;
import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.applib.services.bookmark.Bookmark;
-
import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/events/InteractionEvent.java b/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/events/InteractionEvent.java
index 31c7ddc828..d972651849 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/events/InteractionEvent.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/events/InteractionEvent.java
@@ -18,11 +18,10 @@
*/
package org.apache.causeway.applib.services.wrapper.events;
-import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.events.EventObjectBase;
import org.apache.causeway.applib.services.wrapper.WrapperFactory;
+import org.apache.causeway.commons.collections.Can;
/**
* Supported only by {@link WrapperFactory},
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/xactn/TransactionalProcessor.java b/api/applib/src/main/java/org/apache/causeway/applib/services/xactn/TransactionalProcessor.java
index afc92c9e55..ebd70f2d79 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/xactn/TransactionalProcessor.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/xactn/TransactionalProcessor.java
@@ -20,12 +20,13 @@ package org.apache.causeway.applib.services.xactn;
import java.util.concurrent.Callable;
-import org.apache.causeway.commons.functional.ThrowingRunnable;
-import org.apache.causeway.commons.functional.Try;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.support.DefaultTransactionDefinition;
+import org.apache.causeway.commons.functional.ThrowingRunnable;
+import org.apache.causeway.commons.functional.Try;
+
import lombok.val;
/**
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/spec/AbstractSpecification.java b/api/applib/src/main/java/org/apache/causeway/applib/spec/AbstractSpecification.java
index 562442c187..2b7369c315 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/spec/AbstractSpecification.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/spec/AbstractSpecification.java
@@ -20,9 +20,8 @@ package org.apache.causeway.applib.spec;
import java.lang.reflect.Method;
-import org.apache.causeway.commons.internal.reflection._ClassCache;
-
import org.apache.causeway.applib.annotation.Programmatic;
+import org.apache.causeway.commons.internal.reflection._ClassCache;
import lombok.val;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/spec/AbstractSpecification2.java b/api/applib/src/main/java/org/apache/causeway/applib/spec/AbstractSpecification2.java
index acc1ede3f6..abaf64f9fb 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/spec/AbstractSpecification2.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/spec/AbstractSpecification2.java
@@ -20,11 +20,10 @@ package org.apache.causeway.applib.spec;
import java.lang.reflect.Method;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.reflection._ClassCache;
-
import org.apache.causeway.applib.annotation.Programmatic;
import org.apache.causeway.applib.services.i18n.TranslatableString;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.commons.internal.reflection._ClassCache;
import lombok.val;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/util/Enums.java b/api/applib/src/main/java/org/apache/causeway/applib/util/Enums.java
index 257dbddf6c..0915986aed 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/util/Enums.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/util/Enums.java
@@ -21,9 +21,10 @@ package org.apache.causeway.applib.util;
import java.util.Optional;
import java.util.stream.Collectors;
-import org.apache.causeway.commons.internal.base._Strings;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.internal.base._Strings;
+
import lombok.val;
import lombok.experimental.UtilityClass;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/util/ObjectContract_Parser.java b/api/applib/src/main/java/org/apache/causeway/applib/util/ObjectContract_Parser.java
index 3c30184ea1..9f5a41897c 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/util/ObjectContract_Parser.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/util/ObjectContract_Parser.java
@@ -28,11 +28,11 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
-import org.apache.causeway.commons.internal._Constants;
-import org.apache.causeway.commons.internal.base._Strings;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.util.ObjectContracts.ObjectContract;
+import org.apache.causeway.commons.internal._Constants;
+import org.apache.causeway.commons.internal.base._Strings;
/**
* Package private parser for ObjectContract.<br/><br/>
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/util/TitleBuffer.java b/api/applib/src/main/java/org/apache/causeway/applib/util/TitleBuffer.java
index 8a1ac974e8..b6d5998500 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/util/TitleBuffer.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/util/TitleBuffer.java
@@ -21,9 +21,8 @@ package org.apache.causeway.applib.util;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import org.apache.causeway.commons.internal._Constants;
-
import org.apache.causeway.applib.services.title.TitleService;
+import org.apache.causeway.commons.internal._Constants;
/**
* Title buffer is a utility class to help produce titles for objects without
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/util/ZipWriter.java b/api/applib/src/main/java/org/apache/causeway/applib/util/ZipWriter.java
index 30bd38c56e..6cdfa34aad 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/util/ZipWriter.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/util/ZipWriter.java
@@ -26,10 +26,11 @@ import java.nio.charset.StandardCharsets;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
-import org.springframework.lang.Nullable;
import lombok.AccessLevel;
import lombok.NonNull;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/util/schema/ChangesDtoUtils.java b/api/applib/src/main/java/org/apache/causeway/applib/util/schema/ChangesDtoUtils.java
index ebaa0cf367..db89e68ac3 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/util/schema/ChangesDtoUtils.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/util/schema/ChangesDtoUtils.java
@@ -31,9 +31,8 @@ import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
-import org.apache.causeway.commons.internal.resources._Resources;
-
import org.apache.causeway.applib.util.JaxbUtil;
+import org.apache.causeway.commons.internal.resources._Resources;
import org.apache.causeway.schema.chg.v2.ChangesDto;
/**
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/util/schema/CommandDtoUtils.java b/api/applib/src/main/java/org/apache/causeway/applib/util/schema/CommandDtoUtils.java
index b4db9bda47..9771d7d42c 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/util/schema/CommandDtoUtils.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/util/schema/CommandDtoUtils.java
@@ -30,11 +30,10 @@ import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.resources._Resources;
-
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.util.JaxbUtil;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.resources._Resources;
import org.apache.causeway.schema.cmd.v2.ActionDto;
import org.apache.causeway.schema.cmd.v2.CommandDto;
import org.apache.causeway.schema.cmd.v2.MapDto;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/util/schema/CommonDtoUtils.java b/api/applib/src/main/java/org/apache/causeway/applib/util/schema/CommonDtoUtils.java
index b872a3b21a..d3d98d6c6c 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/util/schema/CommonDtoUtils.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/util/schema/CommonDtoUtils.java
@@ -32,6 +32,12 @@ import java.util.Objects;
import java.util.Optional;
import java.util.function.Function;
+import org.springframework.lang.Nullable;
+
+import org.apache.causeway.applib.jaxb.JavaTimeXMLGregorianCalendarMarshalling;
+import org.apache.causeway.applib.value.Blob;
+import org.apache.causeway.applib.value.Clob;
+import org.apache.causeway.applib.value.semantics.ValueDecomposition;
import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.commons.internal.base._NullSafe;
@@ -39,12 +45,6 @@ import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.context._Context;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.commons.internal.resources._Json;
-import org.springframework.lang.Nullable;
-
-import org.apache.causeway.applib.jaxb.JavaTimeXMLGregorianCalendarMarshalling;
-import org.apache.causeway.applib.value.Blob;
-import org.apache.causeway.applib.value.Clob;
-import org.apache.causeway.applib.value.semantics.ValueDecomposition;
import org.apache.causeway.schema.cmd.v2.MapDto;
import org.apache.causeway.schema.cmd.v2.ParamDto;
import org.apache.causeway.schema.common.v2.BlobDto;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/util/schema/InteractionDtoUtils.java b/api/applib/src/main/java/org/apache/causeway/applib/util/schema/InteractionDtoUtils.java
index 871f5853f7..7334ef9e69 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/util/schema/InteractionDtoUtils.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/util/schema/InteractionDtoUtils.java
@@ -34,14 +34,13 @@ import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.commons.internal.resources._Resources;
-
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.iactn.Execution;
import org.apache.causeway.applib.services.iactn.Interaction;
import org.apache.causeway.applib.util.JaxbUtil;
+import org.apache.causeway.commons.internal.base._NullSafe;
+import org.apache.causeway.commons.internal.collections._Lists;
+import org.apache.causeway.commons.internal.resources._Resources;
import org.apache.causeway.schema.cmd.v2.ParamDto;
import org.apache.causeway.schema.cmd.v2.ParamsDto;
import org.apache.causeway.schema.common.v2.InteractionType;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/util/schema/InteractionsDtoUtils.java b/api/applib/src/main/java/org/apache/causeway/applib/util/schema/InteractionsDtoUtils.java
index 3cd6702d5d..67ed848308 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/util/schema/InteractionsDtoUtils.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/util/schema/InteractionsDtoUtils.java
@@ -32,10 +32,9 @@ import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
+import org.apache.causeway.applib.util.JaxbUtil;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.resources._Resources;
-
-import org.apache.causeway.applib.util.JaxbUtil;
import org.apache.causeway.schema.ixn.v2.InteractionDto;
import org.apache.causeway.schema.ixn.v2.InteractionsDto;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/util/schema/MemberExecutionDtoUtils.java b/api/applib/src/main/java/org/apache/causeway/applib/util/schema/MemberExecutionDtoUtils.java
index 9b676f9697..52b6c4fb95 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/util/schema/MemberExecutionDtoUtils.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/util/schema/MemberExecutionDtoUtils.java
@@ -24,7 +24,6 @@ import javax.xml.bind.JAXBException;
import org.apache.causeway.commons.internal.resources._Xml;
import org.apache.causeway.commons.internal.resources._Xml.WriteOptions;
-
import org.apache.causeway.schema.common.v2.DifferenceDto;
import org.apache.causeway.schema.common.v2.PeriodDto;
import org.apache.causeway.schema.ixn.v2.MemberExecutionDto;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/value/Blob.java b/api/applib/src/main/java/org/apache/causeway/applib/value/Blob.java
index 81ac01d32c..2acada6c29 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/value/Blob.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/value/Blob.java
@@ -36,16 +36,15 @@ import javax.inject.Named;
import javax.xml.bind.annotation.adapters.XmlAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.causeway.commons.internal.base._Bytes;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
-import org.apache.causeway.commons.internal.image._Images;
-
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.Value;
import org.apache.causeway.applib.jaxb.PrimitiveJaxbAdapters;
import org.apache.causeway.applib.util.ZipReader;
import org.apache.causeway.applib.util.ZipWriter;
+import org.apache.causeway.commons.internal.base._Bytes;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
+import org.apache.causeway.commons.internal.image._Images;
import lombok.NonNull;
import lombok.SneakyThrows;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/value/Clob.java b/api/applib/src/main/java/org/apache/causeway/applib/value/Clob.java
index e45f7edd01..80a047ab76 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/value/Clob.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/value/Clob.java
@@ -31,11 +31,10 @@ import javax.inject.Named;
import javax.xml.bind.annotation.adapters.XmlAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.Value;
import org.apache.causeway.applib.jaxb.PrimitiveJaxbAdapters;
+import org.apache.causeway.commons.internal.base._Strings;
import lombok.NonNull;
import lombok.SneakyThrows;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/value/LocalResourcePath.java b/api/applib/src/main/java/org/apache/causeway/applib/value/LocalResourcePath.java
index 0a9dbfe4a3..a460c5204a 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/value/LocalResourcePath.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/value/LocalResourcePath.java
@@ -25,12 +25,12 @@ import javax.inject.Named;
import javax.xml.bind.annotation.adapters.XmlAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.causeway.commons.internal.base._Blackhole;
-import org.apache.causeway.commons.internal.hardening._Hardening;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.Value;
+import org.apache.causeway.commons.internal.base._Blackhole;
+import org.apache.causeway.commons.internal.hardening._Hardening;
import lombok.Getter;
import lombok.NonNull;
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 0df1610ce3..abfd94979d 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
@@ -27,11 +27,10 @@ import javax.inject.Named;
import javax.xml.bind.annotation.adapters.XmlAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.base._Text;
-
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 lombok.EqualsAndHashCode;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/Parser.java b/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/Parser.java
index bc06e41663..2c614f2aa0 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/Parser.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/Parser.java
@@ -18,9 +18,10 @@
*/
package org.apache.causeway.applib.value.semantics;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
+
/**
* Provides a mechanism for parsing and rendering string representations of
* objects.
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/TemporalValueSemantics.java b/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/TemporalValueSemantics.java
index 0c47482346..63b147a411 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/TemporalValueSemantics.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/TemporalValueSemantics.java
@@ -21,12 +21,8 @@ package org.apache.causeway.applib.value.semantics;
import java.time.Duration;
import java.time.temporal.Temporal;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
-
import org.apache.causeway.applib.annotation.TimePrecision;
-import org.apache.causeway.applib.value.semantics.TemporalValueSemantics.EditingFormatDirection;
-import org.apache.causeway.applib.value.semantics.TemporalValueSemantics.OffsetCharacteristic;
-import org.apache.causeway.applib.value.semantics.TemporalValueSemantics.TemporalCharacteristic;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import lombok.Data;
import lombok.NonNull;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueDecomposition.java b/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueDecomposition.java
index 0841e4cbda..7f314ff46c 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueDecomposition.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueDecomposition.java
@@ -20,10 +20,9 @@ package org.apache.causeway.applib.value.semantics;
import java.io.Serializable;
+import org.apache.causeway.applib.util.schema.CommonDtoUtils;
import org.apache.causeway.commons.functional.Either;
import org.apache.causeway.commons.functional.Either.HasEither;
-
-import org.apache.causeway.applib.util.schema.CommonDtoUtils;
import org.apache.causeway.schema.common.v2.TypedTupleDto;
import org.apache.causeway.schema.common.v2.ValueType;
import org.apache.causeway.schema.common.v2.ValueWithTypeDto;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsAbstract.java b/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsAbstract.java
index ef5eb57c8c..b540d1a0c2 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsAbstract.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsAbstract.java
@@ -32,11 +32,6 @@ import java.util.Optional;
import java.util.function.Function;
import java.util.function.Supplier;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.assertions._Assert;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.base._Temporals;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.lang.Nullable;
@@ -52,6 +47,11 @@ import org.apache.causeway.applib.services.placeholder.PlaceholderRenderService.
import org.apache.causeway.applib.util.schema.CommonDtoUtils;
import org.apache.causeway.applib.value.semantics.TemporalValueSemantics.EditingFormatDirection;
import org.apache.causeway.applib.value.semantics.TemporalValueSemantics.TemporalEditingPattern;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.assertions._Assert;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.base._Temporals;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.schema.common.v2.ValueType;
import org.apache.causeway.schema.common.v2.ValueWithTypeDto;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsBasedOnIdStringifier.java b/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsBasedOnIdStringifier.java
index 7185eec0e7..1b676cfa50 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsBasedOnIdStringifier.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsBasedOnIdStringifier.java
@@ -18,9 +18,8 @@
*/
package org.apache.causeway.applib.value.semantics;
-import org.apache.causeway.commons.internal.assertions._Assert;
-
import org.apache.causeway.applib.services.bookmark.IdStringifier;
+import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.causeway.schema.common.v2.ValueType;
import lombok.Getter;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsBasedOnIdStringifierEntityAgnostic.java b/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsBasedOnIdStringifierEntityAgnostic.java
index 43e32ebb0b..cf3cc7e2d7 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsBasedOnIdStringifierEntityAgnostic.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsBasedOnIdStringifierEntityAgnostic.java
@@ -18,9 +18,8 @@
*/
package org.apache.causeway.applib.value.semantics;
-import org.apache.causeway.commons.internal.assertions._Assert;
-
import org.apache.causeway.applib.services.bookmark.IdStringifier;
+import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.causeway.schema.common.v2.ValueType;
import lombok.Getter;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsProvider.java b/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsProvider.java
index 9c5b6e1a93..eac7e41dbe 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsProvider.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsProvider.java
@@ -19,13 +19,13 @@
package org.apache.causeway.applib.value.semantics;
-import org.apache.causeway.commons.internal.base._Casts;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.annotation.Value;
import org.apache.causeway.applib.services.bookmark.IdStringifier;
import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.schema.chg.v2.ChangesDto;
import org.apache.causeway.schema.cmd.v2.CommandDto;
import org.apache.causeway.schema.common.v2.TypedTupleDto;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsResolver.java b/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsResolver.java
index f5e0a277b4..38183d9bcd 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsResolver.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsResolver.java
@@ -20,9 +20,8 @@ package org.apache.causeway.applib.value.semantics;
import java.util.stream.Stream;
-import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.applib.Identifier;
+import org.apache.causeway.commons.collections.Can;
import lombok.NonNull;
diff --git a/api/applib/src/test/java/org/apache/causeway/applib/IdentifierTests.java b/api/applib/src/test/java/org/apache/causeway/applib/IdentifierTests.java
index f0af9cc2db..c550c2ec74 100644
--- a/api/applib/src/test/java/org/apache/causeway/applib/IdentifierTests.java
+++ b/api/applib/src/test/java/org/apache/causeway/applib/IdentifierTests.java
@@ -20,7 +20,6 @@ package org.apache.causeway.applib;
import java.math.BigDecimal;
-import org.apache.causeway.commons.collections.Can;
import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
@@ -29,6 +28,7 @@ import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import org.apache.causeway.applib.id.LogicalType;
+import org.apache.causeway.commons.collections.Can;
import lombok.val;
diff --git a/api/applib/src/test/java/org/apache/causeway/applib/commons/internal/reflection/ReflectTest.java b/api/applib/src/test/java/org/apache/causeway/applib/commons/internal/reflection/ReflectTest.java
index 058d6bbfb7..4db9292919 100644
--- a/api/applib/src/test/java/org/apache/causeway/applib/commons/internal/reflection/ReflectTest.java
+++ b/api/applib/src/test/java/org/apache/causeway/applib/commons/internal/reflection/ReflectTest.java
@@ -24,18 +24,19 @@ import java.util.Set;
import java.util.TreeSet;
import java.util.stream.Collectors;
-import org.apache.causeway.commons.internal.collections._Sets;
-import org.apache.causeway.commons.internal.reflection._Reflect.InterfacePolicy;
import org.junit.jupiter.api.Test;
-import static org.apache.causeway.commons.internal.reflection._Reflect.getAnnotation;
-import static org.apache.causeway.commons.internal.reflection._Reflect.streamAllMethods;
-import static org.apache.causeway.commons.internal.reflection._Reflect.streamTypeHierarchy;
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.annotation.Programmatic;
+import org.apache.causeway.commons.internal.collections._Sets;
+import org.apache.causeway.commons.internal.reflection._Reflect.InterfacePolicy;
+
+import static org.apache.causeway.commons.internal.reflection._Reflect.getAnnotation;
+import static org.apache.causeway.commons.internal.reflection._Reflect.streamAllMethods;
+import static org.apache.causeway.commons.internal.reflection._Reflect.streamTypeHierarchy;
import lombok.val;
diff --git a/api/applib/src/test/java/org/apache/causeway/applib/id/LogicalTypeTest.java b/api/applib/src/test/java/org/apache/causeway/applib/id/LogicalTypeTest.java
index 8187cb47bc..775d412b3d 100644
--- a/api/applib/src/test/java/org/apache/causeway/applib/id/LogicalTypeTest.java
+++ b/api/applib/src/test/java/org/apache/causeway/applib/id/LogicalTypeTest.java
@@ -18,13 +18,13 @@
*/
package org.apache.causeway.applib.id;
-import org.apache.causeway.commons.internal.testing._SerializationTester;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.causeway.applib.SomeDomainClass;
+import org.apache.causeway.commons.internal.testing._SerializationTester;
import lombok.val;
diff --git a/api/applib/src/test/java/org/apache/causeway/applib/id/LogicalTypeTest_valueSemantics.java b/api/applib/src/test/java/org/apache/causeway/applib/id/LogicalTypeTest_valueSemantics.java
index 4a283f445f..3417080ef6 100644
--- a/api/applib/src/test/java/org/apache/causeway/applib/id/LogicalTypeTest_valueSemantics.java
+++ b/api/applib/src/test/java/org/apache/causeway/applib/id/LogicalTypeTest_valueSemantics.java
@@ -20,9 +20,8 @@ package org.apache.causeway.applib.id;
import java.util.List;
-import org.apache.causeway.commons.internal.collections._Lists;
-
import org.apache.causeway.applib.SomeDomainClass;
+import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.core.internaltestsupport.contract.ValueTypeContractTestAbstract;
public class LogicalTypeTest_valueSemantics
diff --git a/api/applib/src/test/java/org/apache/causeway/applib/services/iactnlayer/TryTest.java b/api/applib/src/test/java/org/apache/causeway/applib/services/iactnlayer/TryTest.java
index a176368d12..9b05473165 100644
--- a/api/applib/src/test/java/org/apache/causeway/applib/services/iactnlayer/TryTest.java
+++ b/api/applib/src/test/java/org/apache/causeway/applib/services/iactnlayer/TryTest.java
@@ -21,8 +21,6 @@ package org.apache.causeway.applib.services.iactnlayer;
import java.util.NoSuchElementException;
import java.util.Optional;
-import org.apache.causeway.commons.functional.ThrowingRunnable;
-import org.apache.causeway.commons.functional.Try;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -31,6 +29,9 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
+import org.apache.causeway.commons.functional.ThrowingRunnable;
+import org.apache.causeway.commons.functional.Try;
+
import lombok.val;
class TryTest {
diff --git a/api/applib/src/test/java/org/apache/causeway/applib/services/jaxb/JaxbServiceTest.java b/api/applib/src/test/java/org/apache/causeway/applib/services/jaxb/JaxbServiceTest.java
index 30e5261a63..335f968779 100644
--- a/api/applib/src/test/java/org/apache/causeway/applib/services/jaxb/JaxbServiceTest.java
+++ b/api/applib/src/test/java/org/apache/causeway/applib/services/jaxb/JaxbServiceTest.java
@@ -20,7 +20,6 @@ package org.apache.causeway.applib.services.jaxb;
import javax.xml.bind.JAXBContext;
-import org.apache.causeway.commons.internal.resources._Xml;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
@@ -29,6 +28,7 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import org.apache.causeway.commons.internal.resources._Xml;
import org.apache.causeway.schema.ixn.v2.ActionInvocationDto;
import lombok.SneakyThrows;
diff --git a/api/applib/src/test/java/org/apache/causeway/applib/services/wrapper/control/SyncControl_Test.java b/api/applib/src/test/java/org/apache/causeway/applib/services/wrapper/control/SyncControl_Test.java
index eec7d8e77e..80b1313e88 100644
--- a/api/applib/src/test/java/org/apache/causeway/applib/services/wrapper/control/SyncControl_Test.java
+++ b/api/applib/src/test/java/org/apache/causeway/applib/services/wrapper/control/SyncControl_Test.java
@@ -18,11 +18,12 @@
*/
package org.apache.causeway.applib.services.wrapper.control;
-import org.apache.causeway.commons.internal.base._NullSafe;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.apache.causeway.commons.internal.base._NullSafe;
+
import lombok.val;
class SyncControl_Test {
diff --git a/api/applib/src/test/java/org/apache/causeway/applib/util/ObjectContractsTest_equals_and_hashCode.java b/api/applib/src/test/java/org/apache/causeway/applib/util/ObjectContractsTest_equals_and_hashCode.java
index 1ebce214e4..ce0275fd61 100644
--- a/api/applib/src/test/java/org/apache/causeway/applib/util/ObjectContractsTest_equals_and_hashCode.java
+++ b/api/applib/src/test/java/org/apache/causeway/applib/util/ObjectContractsTest_equals_and_hashCode.java
@@ -20,9 +20,9 @@ package org.apache.causeway.applib.util;
import java.util.List;
-import org.apache.causeway.commons.internal.collections._Lists;
import org.junit.jupiter.api.BeforeEach;
+import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.core.internaltestsupport.contract.ValueTypeContractTestAbstract;
class ObjectContractsTest_equals_and_hashCode extends ValueTypeContractTestAbstract<InvoiceItem3> {
diff --git a/commons/src/main/java/org/apache/causeway/commons/collections/Can.java b/commons/src/main/java/org/apache/causeway/commons/collections/Can.java
index a16e00ac1a..42e1b62b48 100644
--- a/commons/src/main/java/org/apache/causeway/commons/collections/Can.java
+++ b/commons/src/main/java/org/apache/causeway/commons/collections/Can.java
@@ -39,9 +39,10 @@ import java.util.stream.Collector;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
-import org.springframework.lang.Nullable;
import lombok.NonNull;
import lombok.val;
diff --git a/commons/src/main/java/org/apache/causeway/commons/collections/Can_Empty.java b/commons/src/main/java/org/apache/causeway/commons/collections/Can_Empty.java
index 6724072ad1..a95715293b 100644
--- a/commons/src/main/java/org/apache/causeway/commons/collections/Can_Empty.java
+++ b/commons/src/main/java/org/apache/causeway/commons/collections/Can_Empty.java
@@ -34,10 +34,11 @@ import java.util.function.Predicate;
import java.util.function.Supplier;
import java.util.stream.Stream;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
-import org.springframework.lang.Nullable;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/commons/src/main/java/org/apache/causeway/commons/collections/Can_Multiple.java b/commons/src/main/java/org/apache/causeway/commons/collections/Can_Multiple.java
index 58eecccb15..f43f462466 100644
--- a/commons/src/main/java/org/apache/causeway/commons/collections/Can_Multiple.java
+++ b/commons/src/main/java/org/apache/causeway/commons/collections/Can_Multiple.java
@@ -37,12 +37,13 @@ import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.commons.internal.base._Objects;
import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.commons.internal.collections._Sets;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
-import org.springframework.lang.Nullable;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
diff --git a/commons/src/main/java/org/apache/causeway/commons/collections/Can_Singleton.java b/commons/src/main/java/org/apache/causeway/commons/collections/Can_Singleton.java
index 804e324cfd..eb5c3766a0 100644
--- a/commons/src/main/java/org/apache/causeway/commons/collections/Can_Singleton.java
+++ b/commons/src/main/java/org/apache/causeway/commons/collections/Can_Singleton.java
@@ -36,11 +36,12 @@ import java.util.function.Predicate;
import java.util.function.Supplier;
import java.util.stream.Stream;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.commons.internal.base._Objects;
import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
-import org.springframework.lang.Nullable;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
diff --git a/commons/src/main/java/org/apache/causeway/commons/collections/ImmutableCollection.java b/commons/src/main/java/org/apache/causeway/commons/collections/ImmutableCollection.java
index 175d15b798..0416724757 100644
--- a/commons/src/main/java/org/apache/causeway/commons/collections/ImmutableCollection.java
+++ b/commons/src/main/java/org/apache/causeway/commons/collections/ImmutableCollection.java
@@ -25,9 +25,10 @@ import java.util.Optional;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
+
/**
* Provides a subset of the functionality that the Java {@link Collection}
* interface has, focusing on immutability.
diff --git a/commons/src/main/java/org/apache/causeway/commons/functional/Try.java b/commons/src/main/java/org/apache/causeway/commons/functional/Try.java
index 9e8706a322..0d9f9b0c43 100644
--- a/commons/src/main/java/org/apache/causeway/commons/functional/Try.java
+++ b/commons/src/main/java/org/apache/causeway/commons/functional/Try.java
@@ -26,9 +26,10 @@ import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.UnaryOperator;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
+
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/assertions/_Assert.java b/commons/src/main/java/org/apache/causeway/commons/internal/assertions/_Assert.java
index 90627a0cb3..1c71a419e3 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/assertions/_Assert.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/assertions/_Assert.java
@@ -21,11 +21,12 @@ package org.apache.causeway.commons.internal.assertions;
import java.util.Objects;
import java.util.function.Supplier;
+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.primitives._Ints;
import org.apache.causeway.commons.internal.primitives._Longs;
-import org.springframework.lang.Nullable;
import lombok.val;
import lombok.experimental.UtilityClass;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/base/_Files.java b/commons/src/main/java/org/apache/causeway/commons/internal/base/_Files.java
index 69525d9ad5..f5a77782f5 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/base/_Files.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/base/_Files.java
@@ -31,9 +31,10 @@ import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Predicate;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
+
import lombok.NonNull;
import lombok.SneakyThrows;
import lombok.val;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/base/_NullSafe.java b/commons/src/main/java/org/apache/causeway/commons/internal/base/_NullSafe.java
index 7e14411299..615c5d60bf 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/base/_NullSafe.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/base/_NullSafe.java
@@ -33,10 +33,11 @@ import java.util.stream.IntStream;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.collections.ImmutableCollection;
import org.apache.causeway.commons.collections.ImmutableEnumSet;
-import org.springframework.lang.Nullable;
/**
* <h1>- internal use only -</h1>
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/base/_Objects.java b/commons/src/main/java/org/apache/causeway/commons/internal/base/_Objects.java
index 08fefffb74..7276c06343 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/base/_Objects.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/base/_Objects.java
@@ -21,9 +21,10 @@ package org.apache.causeway.commons.internal.base;
import java.util.Comparator;
import java.util.Objects;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
+
/**
* <h1>- internal use only -</h1>
* <p>
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/base/_Refs.java b/commons/src/main/java/org/apache/causeway/commons/internal/base/_Refs.java
index e7b0f98210..06a8289f15 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/base/_Refs.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/base/_Refs.java
@@ -28,9 +28,10 @@ import java.util.function.LongUnaryOperator;
import java.util.function.Supplier;
import java.util.function.UnaryOperator;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
+
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/base/_StringInterpolation.java b/commons/src/main/java/org/apache/causeway/commons/internal/base/_StringInterpolation.java
index f9b99c1be0..58f25a5711 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/base/_StringInterpolation.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/base/_StringInterpolation.java
@@ -22,9 +22,10 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._Strings.KeyValuePair;
-import org.springframework.lang.Nullable;
import static org.apache.causeway.commons.internal.base._NullSafe.stream;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/base/_Strings.java b/commons/src/main/java/org/apache/causeway/commons/internal/base/_Strings.java
index 39df6f12ca..b307d65291 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/base/_Strings.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/base/_Strings.java
@@ -42,10 +42,11 @@ import java.util.stream.Collector;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.internal._Constants;
import org.apache.causeway.commons.internal.base._Bytes.BytesOperator;
import org.apache.causeway.commons.internal.functions._Predicates;
-import org.springframework.lang.Nullable;
import static org.apache.causeway.commons.internal.base._NullSafe.size;
import static org.apache.causeway.commons.internal.base._Strings_SplitIterator.splitIterator;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/base/_Strings_KeyValuePair.java b/commons/src/main/java/org/apache/causeway/commons/internal/base/_Strings_KeyValuePair.java
index cc23a6d9ea..a4eca2377b 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/base/_Strings_KeyValuePair.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/base/_Strings_KeyValuePair.java
@@ -20,7 +20,7 @@ package org.apache.causeway.commons.internal.base;
import java.util.Optional;
-import static org.apache.causeway.commons.internal.exceptions._Exceptions.notImplemented;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import lombok.Value;
@@ -38,7 +38,7 @@ final class _Strings_KeyValuePair implements _Strings.KeyValuePair {
@Override
public String setValue(final String value) {
- throw notImplemented();
+ throw _Exceptions.notImplemented();
}
@Override
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/base/_Strings_SplitIterator.java b/commons/src/main/java/org/apache/causeway/commons/internal/base/_Strings_SplitIterator.java
index d298e2cbea..01d3816de6 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/base/_Strings_SplitIterator.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/base/_Strings_SplitIterator.java
@@ -21,9 +21,10 @@ package org.apache.causeway.commons.internal.base;
import java.util.Collections;
import java.util.Iterator;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
+
/**
*
* package private mixin for utility class {@link _Strings}
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/base/_Temporals.java b/commons/src/main/java/org/apache/causeway/commons/internal/base/_Temporals.java
index 31a14f9e29..f913b8c103 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/base/_Temporals.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/base/_Temporals.java
@@ -37,9 +37,10 @@ import java.util.Locale;
import java.util.Optional;
import java.util.regex.Pattern;
-import org.apache.causeway.commons.collections.Can;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.collections.Can;
+
import lombok.NonNull;
import lombok.val;
import lombok.experimental.UtilityClass;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/base/_Text.java b/commons/src/main/java/org/apache/causeway/commons/internal/base/_Text.java
index 64ac21f442..a6556a578b 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/base/_Text.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/base/_Text.java
@@ -34,10 +34,11 @@ import java.util.stream.Collectors;
import java.util.stream.IntStream;
import java.util.stream.Stream;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.causeway.commons.internal.collections._Lists;
-import org.springframework.lang.Nullable;
import lombok.Getter;
import lombok.NonNull;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/binding/InternalUtil.java b/commons/src/main/java/org/apache/causeway/commons/internal/binding/InternalUtil.java
index 5837f853a9..a03201f69e 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/binding/InternalUtil.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/binding/InternalUtil.java
@@ -22,10 +22,11 @@ import java.lang.ref.WeakReference;
import java.util.Arrays;
import java.util.function.Predicate;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.binding.ChangeListener;
import org.apache.causeway.commons.binding.InvalidationListener;
import org.apache.causeway.commons.binding.Observable;
-import org.springframework.lang.Nullable;
import lombok.NonNull;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/collections/_Arrays.java b/commons/src/main/java/org/apache/causeway/commons/internal/collections/_Arrays.java
index d1ca327145..10a9dc0344 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/collections/_Arrays.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/collections/_Arrays.java
@@ -26,10 +26,11 @@ import java.util.function.BiPredicate;
import java.util.function.Function;
import java.util.stream.Collector;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.internal._Constants;
import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.commons.internal.base._NullSafe;
-import org.springframework.lang.Nullable;
import lombok.NonNull;
import lombok.val;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/collections/_Collections.java b/commons/src/main/java/org/apache/causeway/commons/internal/collections/_Collections.java
index 78ff77036b..26837b9708 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/collections/_Collections.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/collections/_Collections.java
@@ -37,10 +37,11 @@ import java.util.function.Supplier;
import java.util.stream.Collector;
import java.util.stream.Collectors;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.collections.ImmutableCollection;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.internal.reflection._Generics;
-import org.springframework.lang.Nullable;
import lombok.NonNull;
import lombok.val;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/collections/_Lists.java b/commons/src/main/java/org/apache/causeway/commons/internal/collections/_Lists.java
index 7a3ff89135..d9100d003b 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/collections/_Lists.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/collections/_Lists.java
@@ -32,9 +32,10 @@ import java.util.function.Supplier;
import java.util.stream.Collector;
import java.util.stream.Collectors;
-import org.apache.causeway.commons.internal.base._NullSafe;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.internal.base._NullSafe;
+
import lombok.NonNull;
import lombok.val;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/collections/_Maps.java b/commons/src/main/java/org/apache/causeway/commons/internal/collections/_Maps.java
index b054d9ae89..5a4e69001a 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/collections/_Maps.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/collections/_Maps.java
@@ -34,11 +34,12 @@ import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.internal.collections._Multimaps.ListMultimap;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
-import org.springframework.lang.Nullable;
import lombok.NonNull;
import lombok.Value;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/collections/_Multimaps.java b/commons/src/main/java/org/apache/causeway/commons/internal/collections/_Multimaps.java
index ec1c27582f..8382d979f2 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/collections/_Multimaps.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/collections/_Multimaps.java
@@ -39,9 +39,10 @@ import java.util.concurrent.CopyOnWriteArrayList;
import java.util.function.Supplier;
import java.util.stream.Stream;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
-import org.springframework.lang.Nullable;
import lombok.NonNull;
import lombok.val;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/collections/_Sets.java b/commons/src/main/java/org/apache/causeway/commons/internal/collections/_Sets.java
index accad5eb22..af76e5f57a 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/collections/_Sets.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/collections/_Sets.java
@@ -35,9 +35,10 @@ import java.util.stream.Collector;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import org.apache.causeway.commons.internal.base._NullSafe;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.internal.base._NullSafe;
+
import static org.apache.causeway.commons.internal.functions._Predicates.not;
import lombok.NonNull;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/compare/_Comparators_SequenceCompare.java b/commons/src/main/java/org/apache/causeway/commons/internal/compare/_Comparators_SequenceCompare.java
index e7db068009..a61903dec8 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/compare/_Comparators_SequenceCompare.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/compare/_Comparators_SequenceCompare.java
@@ -20,9 +20,10 @@ package org.apache.causeway.commons.internal.compare;
import java.util.StringTokenizer;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.primitives._Ints;
-import org.springframework.lang.Nullable;
import lombok.val;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/concurrent/_ConcurrentTaskList.java b/commons/src/main/java/org/apache/causeway/commons/internal/concurrent/_ConcurrentTaskList.java
index 9ca82687a6..6d77a49c73 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/concurrent/_ConcurrentTaskList.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/concurrent/_ConcurrentTaskList.java
@@ -30,9 +30,10 @@ import java.util.concurrent.Future;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.LongAdder;
+import org.apache.logging.log4j.Level;
+
import org.apache.causeway.commons.concurrent.AwaitableLatch;
import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.logging.log4j.Level;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/context/_Plugin.java b/commons/src/main/java/org/apache/causeway/commons/internal/context/_Plugin.java
index f1d5976c4e..9bda6dc992 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/context/_Plugin.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/context/_Plugin.java
@@ -27,11 +27,12 @@ import java.util.function.Function;
import java.util.function.Supplier;
import java.util.stream.Collectors;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.internal.collections._Sets;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
import lombok.NonNull;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/debug/_Xray.java b/commons/src/main/java/org/apache/causeway/commons/internal/debug/_Xray.java
index 327b29b0e9..7f9ff1558b 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/debug/_Xray.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/debug/_Xray.java
@@ -23,9 +23,9 @@ import java.time.LocalDateTime;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.debug.xray.XrayDataModel;
-import org.apache.causeway.commons.internal.debug.xray.XrayUi;
import org.apache.causeway.commons.internal.debug.xray.XrayModel.Stickiness;
import org.apache.causeway.commons.internal.debug.xray.XrayModel.ThreadMemento;
+import org.apache.causeway.commons.internal.debug.xray.XrayUi;
import lombok.val;
import lombok.experimental.UtilityClass;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/debug/xray/XrayModel.java b/commons/src/main/java/org/apache/causeway/commons/internal/debug/xray/XrayModel.java
index 40cb9b0da6..7da5fe0fe1 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/debug/xray/XrayModel.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/debug/xray/XrayModel.java
@@ -25,9 +25,10 @@ import java.util.UUID;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.MutableTreeNode;
-import org.apache.causeway.commons.internal.base._Strings;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.internal.base._Strings;
+
import lombok.Value;
import lombok.val;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/delegate/_Delegate.java b/commons/src/main/java/org/apache/causeway/commons/internal/delegate/_Delegate.java
index 8dacfd7c70..22b8aedc45 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/delegate/_Delegate.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/delegate/_Delegate.java
@@ -25,9 +25,10 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
-import org.apache.causeway.commons.internal.reflection._ClassCache;
import org.springframework.util.ClassUtils;
+import org.apache.causeway.commons.internal.reflection._ClassCache;
+
import lombok.RequiredArgsConstructor;
import lombok.val;
import lombok.experimental.UtilityClass;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/exceptions/_Exceptions.java b/commons/src/main/java/org/apache/causeway/commons/internal/exceptions/_Exceptions.java
index 931f0dbf1a..ea73143f0a 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/exceptions/_Exceptions.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/exceptions/_Exceptions.java
@@ -29,12 +29,13 @@ import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.internal.base._Refs;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.collections._Lists;
-import org.springframework.lang.Nullable;
import lombok.NonNull;
import lombok.val;
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 e5ffbad7cd..23ad2c5e01 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
@@ -22,11 +22,12 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
import org.jsoup.Jsoup;
import org.jsoup.safety.Safelist;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.internal.base._Strings;
+
/**
* Various hardening utilities.
* <p>
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/hash/_Hashes.java b/commons/src/main/java/org/apache/causeway/commons/internal/hash/_Hashes.java
index b7812c425a..dcd8bb9f14 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/hash/_Hashes.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/hash/_Hashes.java
@@ -25,9 +25,10 @@ import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._NullSafe;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.internal.base._NullSafe;
+
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/image/_Images.java b/commons/src/main/java/org/apache/causeway/commons/internal/image/_Images.java
index fd9f459de9..a6944f6bed 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/image/_Images.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/image/_Images.java
@@ -30,10 +30,11 @@ import java.nio.charset.StandardCharsets;
import javax.imageio.ImageIO;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.internal.base._Bytes;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.internal.primitives._Ints;
-import org.springframework.lang.Nullable;
import lombok.NonNull;
import lombok.SneakyThrows;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/ioc/_IocContainer.java b/commons/src/main/java/org/apache/causeway/commons/internal/ioc/_IocContainer.java
index abfb2a2dca..2ce17efac5 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/ioc/_IocContainer.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/ioc/_IocContainer.java
@@ -23,10 +23,11 @@ import java.util.NoSuchElementException;
import java.util.Optional;
import java.util.stream.Stream;
+import org.springframework.context.ApplicationContext;
+
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.collections.Cardinality;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
-import org.springframework.context.ApplicationContext;
import lombok.NonNull;
import lombok.val;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/ioc/_IocContainer_Spring.java b/commons/src/main/java/org/apache/causeway/commons/internal/ioc/_IocContainer_Spring.java
index 9154f08ca5..1694d61fee 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/ioc/_IocContainer_Spring.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/ioc/_IocContainer_Spring.java
@@ -25,16 +25,17 @@ import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.collections._Sets;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Primary;
import org.springframework.core.ResolvableType;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.base._NullSafe;
+import org.apache.causeway.commons.internal.collections._Sets;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
+
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/ioc/_ManagedBeanAdapter_Spring.java b/commons/src/main/java/org/apache/causeway/commons/internal/ioc/_ManagedBeanAdapter_Spring.java
index 458c9cf14e..9038a485d3 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/ioc/_ManagedBeanAdapter_Spring.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/ioc/_ManagedBeanAdapter_Spring.java
@@ -18,9 +18,10 @@
*/
package org.apache.causeway.commons.internal.ioc;
-import org.apache.causeway.commons.collections.Can;
import org.springframework.beans.factory.ObjectProvider;
+import org.apache.causeway.commons.collections.Can;
+
import lombok.Value;
import lombok.val;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/memento/_MementoDefault.java b/commons/src/main/java/org/apache/causeway/commons/internal/memento/_MementoDefault.java
index 88423f1e58..64c5b23abc 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/memento/_MementoDefault.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/memento/_MementoDefault.java
@@ -28,6 +28,8 @@ import java.io.Serializable;
import java.util.HashMap;
import java.util.Set;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.internal.base._Strings;
@@ -38,7 +40,6 @@ import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.commons.internal.memento._Mementos.EncoderDecoder;
import org.apache.causeway.commons.internal.memento._Mementos.Memento;
import org.apache.causeway.commons.internal.memento._Mementos.SerializingAdapter;
-import org.springframework.lang.Nullable;
import lombok.NonNull;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/os/_OsUtil.java b/commons/src/main/java/org/apache/causeway/commons/internal/os/_OsUtil.java
index de388dc9a4..055f067991 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/os/_OsUtil.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/os/_OsUtil.java
@@ -25,11 +25,12 @@ import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.OptionalLong;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.base._Text;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
-import org.springframework.lang.Nullable;
import lombok.SneakyThrows;
import lombok.val;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/primitives/_Ints.java b/commons/src/main/java/org/apache/causeway/commons/internal/primitives/_Ints.java
index afe67c0699..cc706a49ce 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/primitives/_Ints.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/primitives/_Ints.java
@@ -25,10 +25,11 @@ import java.util.function.Consumer;
import java.util.function.IntFunction;
import java.util.stream.IntStream;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
-import org.springframework.lang.Nullable;
import lombok.AccessLevel;
import lombok.NonNull;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/primitives/_Longs.java b/commons/src/main/java/org/apache/causeway/commons/internal/primitives/_Longs.java
index cf03320ffb..b37707d2f8 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/primitives/_Longs.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/primitives/_Longs.java
@@ -21,9 +21,10 @@ package org.apache.causeway.commons.internal.primitives;
import java.util.OptionalLong;
import java.util.function.Consumer;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
+
import lombok.NonNull;
import lombok.Value;
import lombok.val;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/proxy/_ProxyFactoryServiceAbstract.java b/commons/src/main/java/org/apache/causeway/commons/internal/proxy/_ProxyFactoryServiceAbstract.java
index 158d8dd1fc..9fd850822f 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/proxy/_ProxyFactoryServiceAbstract.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/proxy/_ProxyFactoryServiceAbstract.java
@@ -24,6 +24,7 @@ import java.util.WeakHashMap;
import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.commons.internal.collections._Arrays;
+import org.apache.causeway.commons.internal.proxy._ProxyFactoryService.ProxyEnhanced;
import lombok.NonNull;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/reflection/_Annotations_SynthesizedMergedAnnotationInvocationHandler.java b/commons/src/main/java/org/apache/causeway/commons/internal/reflection/_Annotations_SynthesizedMergedAnnotationInvocationHandler.java
index 1e58f9ce35..6b4de058b0 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/reflection/_Annotations_SynthesizedMergedAnnotationInvocationHandler.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/reflection/_Annotations_SynthesizedMergedAnnotationInvocationHandler.java
@@ -28,7 +28,6 @@ import java.util.Objects;
import java.util.Optional;
import java.util.stream.Stream;
-import org.apache.causeway.commons.internal.base._NullSafe;
import org.springframework.core.annotation.AnnotationConfigurationException;
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.core.annotation.MergedAnnotation;
@@ -40,6 +39,8 @@ import org.springframework.util.ClassUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.util.ReflectionUtils;
+import org.apache.causeway.commons.internal.base._NullSafe;
+
import lombok.NonNull;
import lombok.val;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/reflection/_ClassCache.java b/commons/src/main/java/org/apache/causeway/commons/internal/reflection/_ClassCache.java
index 9b816b4db7..ee826c9297 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/reflection/_ClassCache.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/reflection/_ClassCache.java
@@ -27,13 +27,14 @@ import java.util.Optional;
import java.util.function.Predicate;
import java.util.stream.Stream;
+import org.springframework.lang.Nullable;
+import org.springframework.util.ReflectionUtils;
+
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal._Constants;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.collections._Arrays;
import org.apache.causeway.commons.internal.context._Context;
-import org.springframework.lang.Nullable;
-import org.springframework.util.ReflectionUtils;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/reflection/_Generics.java b/commons/src/main/java/org/apache/causeway/commons/internal/reflection/_Generics.java
index 387324b8ad..e4bd790eab 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/reflection/_Generics.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/reflection/_Generics.java
@@ -27,9 +27,10 @@ import java.lang.reflect.TypeVariable;
import java.lang.reflect.WildcardType;
import java.util.stream.Stream;
-import org.apache.causeway.commons.internal.base._NullSafe;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.internal.base._NullSafe;
+
import lombok.NonNull;
import lombok.val;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/reflection/_Reflect.java b/commons/src/main/java/org/apache/causeway/commons/internal/reflection/_Reflect.java
index 9c97a19efd..670d1aaf31 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/reflection/_Reflect.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/reflection/_Reflect.java
@@ -38,6 +38,11 @@ import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import org.springframework.core.ResolvableType;
+import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.lang.Nullable;
+import org.springframework.util.ClassUtils;
+
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.functional.Try;
import org.apache.causeway.commons.internal.base._NullSafe;
@@ -45,10 +50,6 @@ import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.collections._Arrays;
import org.apache.causeway.commons.internal.context._Context;
import org.apache.causeway.commons.internal.functions._Predicates;
-import org.springframework.core.ResolvableType;
-import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.lang.Nullable;
-import org.springframework.util.ClassUtils;
import lombok.NonNull;
import lombok.SneakyThrows;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/resources/_Json.java b/commons/src/main/java/org/apache/causeway/commons/internal/resources/_Json.java
index b801e052c1..d858c8748a 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/resources/_Json.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/resources/_Json.java
@@ -31,9 +31,10 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule;
-import org.apache.causeway.commons.functional.Try;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.functional.Try;
+
import lombok.SneakyThrows;
import lombok.val;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/resources/_Resources.java b/commons/src/main/java/org/apache/causeway/commons/internal/resources/_Resources.java
index b327c1ceff..eca0a573a7 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/resources/_Resources.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/resources/_Resources.java
@@ -26,10 +26,11 @@ import java.nio.charset.StandardCharsets;
import java.util.function.Predicate;
import java.util.regex.Pattern;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.internal.base._Bytes;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.context._Context;
-import org.springframework.lang.Nullable;
import lombok.NonNull;
import lombok.SneakyThrows;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/resources/_Xml.java b/commons/src/main/java/org/apache/causeway/commons/internal/resources/_Xml.java
index 0ad0145a99..6dd223ab2a 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/resources/_Xml.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/resources/_Xml.java
@@ -34,6 +34,8 @@ import javax.xml.bind.Marshaller;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.namespace.QName;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.functional.Try;
import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.commons.internal.base._NullSafe;
@@ -41,7 +43,6 @@ import org.apache.causeway.commons.internal.codec._DocumentFactories;
import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.commons.internal.reflection._Annotations;
-import org.springframework.lang.Nullable;
import lombok.Builder;
import lombok.NonNull;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/resources/_Yaml.java b/commons/src/main/java/org/apache/causeway/commons/internal/resources/_Yaml.java
index 57c816c2b3..d2560a13c4 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/resources/_Yaml.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/resources/_Yaml.java
@@ -26,12 +26,13 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.StringWriter;
-import org.apache.causeway.commons.functional.Try;
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.DumperOptions.LineBreak;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.Constructor;
+import org.apache.causeway.commons.functional.Try;
+
import lombok.SneakyThrows;
import lombok.val;
diff --git a/commons/src/main/java/org/apache/causeway/commons/resource/ResourceCoordinates.java b/commons/src/main/java/org/apache/causeway/commons/resource/ResourceCoordinates.java
index 145878a942..73729f2477 100644
--- a/commons/src/main/java/org/apache/causeway/commons/resource/ResourceCoordinates.java
+++ b/commons/src/main/java/org/apache/causeway/commons/resource/ResourceCoordinates.java
@@ -21,11 +21,12 @@ package org.apache.causeway.commons.resource;
import java.io.File;
import java.util.Comparator;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._Refs;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.collections._Lists;
-import org.springframework.lang.Nullable;
import lombok.Builder;
import lombok.NonNull;
diff --git a/commons/src/test/java/org/apache/causeway/commons/collections/CanCompareTest.java b/commons/src/test/java/org/apache/causeway/commons/collections/CanCompareTest.java
index 9711ec37ce..0057405408 100644
--- a/commons/src/test/java/org/apache/causeway/commons/collections/CanCompareTest.java
+++ b/commons/src/test/java/org/apache/causeway/commons/collections/CanCompareTest.java
@@ -20,12 +20,12 @@ package org.apache.causeway.commons.collections;
import java.util.List;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.collections._Lists;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.apache.causeway.commons.internal.collections._Lists;
+
class CanCompareTest {
// in natural order
diff --git a/commons/src/test/java/org/apache/causeway/commons/collections/CanTest.java b/commons/src/test/java/org/apache/causeway/commons/collections/CanTest.java
index c9c07e6128..f069019b53 100644
--- a/commons/src/test/java/org/apache/causeway/commons/collections/CanTest.java
+++ b/commons/src/test/java/org/apache/causeway/commons/collections/CanTest.java
@@ -23,15 +23,15 @@ import java.util.Set;
import java.util.function.BiPredicate;
import java.util.stream.Stream;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.collections._Sets;
-import org.apache.causeway.commons.internal.testing._SerializationTester;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.apache.causeway.commons.internal.collections._Sets;
+import org.apache.causeway.commons.internal.testing._SerializationTester;
+
import lombok.val;
class CanTest {
diff --git a/commons/src/test/java/org/apache/causeway/commons/collections/CanVectorTest.java b/commons/src/test/java/org/apache/causeway/commons/collections/CanVectorTest.java
index 43bb66bd4c..43de32d6f6 100644
--- a/commons/src/test/java/org/apache/causeway/commons/collections/CanVectorTest.java
+++ b/commons/src/test/java/org/apache/causeway/commons/collections/CanVectorTest.java
@@ -18,13 +18,12 @@
*/
package org.apache.causeway.commons.collections;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.collections.CanVector;
-import org.apache.causeway.commons.internal.testing._SerializationTester;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.apache.causeway.commons.internal.testing._SerializationTester;
+
import lombok.val;
class CanVectorTest {
diff --git a/commons/src/test/java/org/apache/causeway/commons/functional/ThrowingRunnableTest.java b/commons/src/test/java/org/apache/causeway/commons/functional/ThrowingRunnableTest.java
index 919c415063..067925b3d3 100644
--- a/commons/src/test/java/org/apache/causeway/commons/functional/ThrowingRunnableTest.java
+++ b/commons/src/test/java/org/apache/causeway/commons/functional/ThrowingRunnableTest.java
@@ -20,13 +20,13 @@ package org.apache.causeway.commons.functional;
import java.util.concurrent.atomic.LongAdder;
-import org.apache.causeway.commons.functional.ThrowingRunnable;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
+
import lombok.val;
class ThrowingRunnableTest {
diff --git a/commons/src/test/java/org/apache/causeway/commons/handlers/ChainOfResponsibilityTest.java b/commons/src/test/java/org/apache/causeway/commons/handlers/ChainOfResponsibilityTest.java
index 3ab3a3d76a..85ae6b32d9 100644
--- a/commons/src/test/java/org/apache/causeway/commons/handlers/ChainOfResponsibilityTest.java
+++ b/commons/src/test/java/org/apache/causeway/commons/handlers/ChainOfResponsibilityTest.java
@@ -21,13 +21,14 @@ package org.apache.causeway.commons.handlers;
import java.util.Arrays;
import java.util.NoSuchElementException;
-import org.apache.causeway.commons.handler.ChainOfResponsibility;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.apache.causeway.commons.handler.ChainOfResponsibility;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
+
import lombok.val;
class ChainOfResponsibilityTest {
diff --git a/commons/src/test/java/org/apache/causeway/commons/internal/base/BytesTest.java b/commons/src/test/java/org/apache/causeway/commons/internal/base/BytesTest.java
index 1ebbf549e8..b8b9a7c07a 100644
--- a/commons/src/test/java/org/apache/causeway/commons/internal/base/BytesTest.java
+++ b/commons/src/test/java/org/apache/causeway/commons/internal/base/BytesTest.java
@@ -21,9 +21,6 @@ package org.apache.causeway.commons.internal.base;
import java.nio.charset.StandardCharsets;
import java.util.Base64;
-import org.apache.causeway.commons.internal._Constants;
-import org.apache.causeway.commons.internal.base._Bytes;
-import org.apache.causeway.commons.internal.base._Strings;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
@@ -35,6 +32,8 @@ import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
+import org.apache.causeway.commons.internal._Constants;
+
import lombok.val;
class BytesTest {
diff --git a/commons/src/test/java/org/apache/causeway/commons/internal/base/NullSafeTest.java b/commons/src/test/java/org/apache/causeway/commons/internal/base/NullSafeTest.java
index 6d3a456325..cf29e48514 100644
--- a/commons/src/test/java/org/apache/causeway/commons/internal/base/NullSafeTest.java
+++ b/commons/src/test/java/org/apache/causeway/commons/internal/base/NullSafeTest.java
@@ -25,8 +25,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.base._Strings;
import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
diff --git a/commons/src/test/java/org/apache/causeway/commons/internal/base/ReductionTest.java b/commons/src/test/java/org/apache/causeway/commons/internal/base/ReductionTest.java
index 1b83772eb8..69bd5e1074 100644
--- a/commons/src/test/java/org/apache/causeway/commons/internal/base/ReductionTest.java
+++ b/commons/src/test/java/org/apache/causeway/commons/internal/base/ReductionTest.java
@@ -20,13 +20,13 @@ package org.apache.causeway.commons.internal.base;
import java.util.List;
-import org.apache.causeway.commons.internal.base._Reduction;
-import org.apache.causeway.commons.internal.collections._Lists;
import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.apache.causeway.commons.internal.collections._Lists;
+
class ReductionTest {
@Test
diff --git a/commons/src/test/java/org/apache/causeway/commons/internal/base/StringsTest.java b/commons/src/test/java/org/apache/causeway/commons/internal/base/StringsTest.java
index 1cc04ec903..f1cb5c92f9 100644
--- a/commons/src/test/java/org/apache/causeway/commons/internal/base/StringsTest.java
+++ b/commons/src/test/java/org/apache/causeway/commons/internal/base/StringsTest.java
@@ -21,9 +21,6 @@ package org.apache.causeway.commons.internal.base;
import java.nio.charset.StandardCharsets;
import java.util.stream.Collectors;
-import org.apache.causeway.commons.internal._Constants;
-import org.apache.causeway.commons.internal.base._Bytes;
-import org.apache.causeway.commons.internal.base._Strings;
import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
@@ -31,6 +28,8 @@ import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import org.apache.causeway.commons.internal._Constants;
+
class StringsTest {
@Test
diff --git a/commons/src/test/java/org/apache/causeway/commons/internal/base/TemporalsTest.java b/commons/src/test/java/org/apache/causeway/commons/internal/base/TemporalsTest.java
index 29e6ce8625..ae3f9c71d3 100644
--- a/commons/src/test/java/org/apache/causeway/commons/internal/base/TemporalsTest.java
+++ b/commons/src/test/java/org/apache/causeway/commons/internal/base/TemporalsTest.java
@@ -26,7 +26,6 @@ import java.time.ZoneId;
import java.time.ZoneOffset;
import java.time.ZonedDateTime;
-import org.apache.causeway.commons.internal.base._Temporals;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/commons/src/test/java/org/apache/causeway/commons/internal/base/TextTest.java b/commons/src/test/java/org/apache/causeway/commons/internal/base/TextTest.java
index aa10a40709..c15d70aed1 100644
--- a/commons/src/test/java/org/apache/causeway/commons/internal/base/TextTest.java
+++ b/commons/src/test/java/org/apache/causeway/commons/internal/base/TextTest.java
@@ -18,12 +18,12 @@
*/
package org.apache.causeway.commons.internal.base;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.base._Text;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.apache.causeway.commons.collections.Can;
+
class TextTest {
@Test
diff --git a/commons/src/test/java/org/apache/causeway/commons/internal/base/_Strings_trimmed_Test.java b/commons/src/test/java/org/apache/causeway/commons/internal/base/_Strings_trimmed_Test.java
index 3672cf6a06..0c6215dd8d 100644
--- a/commons/src/test/java/org/apache/causeway/commons/internal/base/_Strings_trimmed_Test.java
+++ b/commons/src/test/java/org/apache/causeway/commons/internal/base/_Strings_trimmed_Test.java
@@ -18,7 +18,6 @@
*/
package org.apache.causeway.commons.internal.base;
-import org.apache.causeway.commons.internal.base._Strings;
import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
diff --git a/commons/src/test/java/org/apache/causeway/commons/internal/base/debug/XrayUiTest.java b/commons/src/test/java/org/apache/causeway/commons/internal/base/debug/XrayUiTest.java
index c7e6725997..208b3fe6e5 100644
--- a/commons/src/test/java/org/apache/causeway/commons/internal/base/debug/XrayUiTest.java
+++ b/commons/src/test/java/org/apache/causeway/commons/internal/base/debug/XrayUiTest.java
@@ -28,8 +28,8 @@ import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.debug._Debug;
import org.apache.causeway.commons.internal.debug.xray.XrayDataModel;
import org.apache.causeway.commons.internal.debug.xray.XrayModel;
-import org.apache.causeway.commons.internal.debug.xray.XrayUi;
import org.apache.causeway.commons.internal.debug.xray.XrayModel.Stickiness;
+import org.apache.causeway.commons.internal.debug.xray.XrayUi;
import lombok.val;
diff --git a/commons/src/test/java/org/apache/causeway/commons/internal/binding/BindableTest.java b/commons/src/test/java/org/apache/causeway/commons/internal/binding/BindableTest.java
index 457a6d76dc..8758f4727a 100644
--- a/commons/src/test/java/org/apache/causeway/commons/internal/binding/BindableTest.java
+++ b/commons/src/test/java/org/apache/causeway/commons/internal/binding/BindableTest.java
@@ -20,8 +20,6 @@ package org.apache.causeway.commons.internal.binding;
import java.util.concurrent.atomic.LongAdder;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.binding._Bindables;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -29,6 +27,8 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.apache.causeway.commons.collections.Can;
+
import lombok.val;
class BindableTest {
diff --git a/commons/src/test/java/org/apache/causeway/commons/internal/collections/_ArraysTest.java b/commons/src/test/java/org/apache/causeway/commons/internal/collections/_ArraysTest.java
index e6c3dc9fb8..bb7c70e4ea 100644
--- a/commons/src/test/java/org/apache/causeway/commons/internal/collections/_ArraysTest.java
+++ b/commons/src/test/java/org/apache/causeway/commons/internal/collections/_ArraysTest.java
@@ -27,10 +27,6 @@ import java.util.Set;
import java.util.stream.IntStream;
import java.util.stream.Stream;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.collections._Arrays;
-import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.commons.internal.collections.Samples.FiniteSpace2;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -41,6 +37,9 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.apache.causeway.commons.internal.base._NullSafe;
+import org.apache.causeway.commons.internal.collections.Samples.FiniteSpace2;
+
import lombok.val;
/**
diff --git a/commons/src/test/java/org/apache/causeway/commons/internal/collections/_MapsTest.java b/commons/src/test/java/org/apache/causeway/commons/internal/collections/_MapsTest.java
index bcd95fc5e9..c318bf601c 100644
--- a/commons/src/test/java/org/apache/causeway/commons/internal/collections/_MapsTest.java
+++ b/commons/src/test/java/org/apache/causeway/commons/internal/collections/_MapsTest.java
@@ -20,8 +20,6 @@ package org.apache.causeway.commons.internal.collections;
import java.util.HashMap;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -30,6 +28,8 @@ import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.apache.causeway.commons.collections.Can;
+
import lombok.val;
class _MapsTest {
diff --git a/commons/src/test/java/org/apache/causeway/commons/internal/collections/_SetsTest.java b/commons/src/test/java/org/apache/causeway/commons/internal/collections/_SetsTest.java
index 2f54af3254..6015121487 100644
--- a/commons/src/test/java/org/apache/causeway/commons/internal/collections/_SetsTest.java
+++ b/commons/src/test/java/org/apache/causeway/commons/internal/collections/_SetsTest.java
@@ -26,9 +26,6 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.stream.Stream;
-import org.apache.causeway.commons.internal.collections._Arrays;
-import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.commons.internal.collections._Sets;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/commons/src/test/java/org/apache/causeway/commons/internal/collections/snapshot/VersionedListTest.java b/commons/src/test/java/org/apache/causeway/commons/internal/collections/snapshot/VersionedListTest.java
index 1110e72264..116195620a 100644
--- a/commons/src/test/java/org/apache/causeway/commons/internal/collections/snapshot/VersionedListTest.java
+++ b/commons/src/test/java/org/apache/causeway/commons/internal/collections/snapshot/VersionedListTest.java
@@ -20,7 +20,6 @@ package org.apache.causeway.commons.internal.collections.snapshot;
import java.util.stream.Collectors;
-import org.apache.causeway.commons.internal.collections.snapshot._VersionedList;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/commons/src/test/java/org/apache/causeway/commons/internal/compare/ComparatorsTest.java b/commons/src/test/java/org/apache/causeway/commons/internal/compare/ComparatorsTest.java
index fc397090aa..8a52f3fb50 100644
--- a/commons/src/test/java/org/apache/causeway/commons/internal/compare/ComparatorsTest.java
+++ b/commons/src/test/java/org/apache/causeway/commons/internal/compare/ComparatorsTest.java
@@ -24,12 +24,12 @@ import java.util.List;
import java.util.SortedSet;
import java.util.TreeSet;
-import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.commons.internal.compare._Comparators;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.apache.causeway.commons.internal.collections._Lists;
+
class ComparatorsTest {
diff --git a/commons/src/test/java/org/apache/causeway/commons/internal/concurrent/ConcurrentTaskListTest.java b/commons/src/test/java/org/apache/causeway/commons/internal/concurrent/ConcurrentTaskListTest.java
index d8021366a7..34ac6328b8 100644
--- a/commons/src/test/java/org/apache/causeway/commons/internal/concurrent/ConcurrentTaskListTest.java
+++ b/commons/src/test/java/org/apache/causeway/commons/internal/concurrent/ConcurrentTaskListTest.java
@@ -20,8 +20,6 @@ package org.apache.causeway.commons.internal.concurrent;
import java.util.concurrent.atomic.LongAdder;
-import org.apache.causeway.commons.internal.concurrent._ConcurrentContext;
-import org.apache.causeway.commons.internal.concurrent._ConcurrentTaskList;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/commons/src/test/java/org/apache/causeway/commons/internal/context/ContextTest.java b/commons/src/test/java/org/apache/causeway/commons/internal/context/ContextTest.java
index 6c37822b21..fcdd6462cb 100644
--- a/commons/src/test/java/org/apache/causeway/commons/internal/context/ContextTest.java
+++ b/commons/src/test/java/org/apache/causeway/commons/internal/context/ContextTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.causeway.commons.internal.context;
-import org.apache.causeway.commons.internal.context._Context;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
diff --git a/commons/src/test/java/org/apache/causeway/commons/internal/debug/xray/CallStackMergerTest.java b/commons/src/test/java/org/apache/causeway/commons/internal/debug/xray/CallStackMergerTest.java
index bdfda173a7..258e2d30df 100644
--- a/commons/src/test/java/org/apache/causeway/commons/internal/debug/xray/CallStackMergerTest.java
+++ b/commons/src/test/java/org/apache/causeway/commons/internal/debug/xray/CallStackMergerTest.java
@@ -20,13 +20,13 @@ package org.apache.causeway.commons.internal.debug.xray;
import java.util.List;
-import org.apache.causeway.commons.internal.debug.xray._CallStackMerger;
-import org.apache.causeway.commons.internal.debug.xray._CallStackMerger.IntTreeVisitor;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.apache.causeway.commons.internal.debug.xray._CallStackMerger.IntTreeVisitor;
+
import lombok.val;
class CallStackMergerTest {
diff --git a/commons/src/test/java/org/apache/causeway/commons/internal/image/_ImagesTest.java b/commons/src/test/java/org/apache/causeway/commons/internal/image/_ImagesTest.java
index 9755c68236..4f66b608c2 100644
--- a/commons/src/test/java/org/apache/causeway/commons/internal/image/_ImagesTest.java
+++ b/commons/src/test/java/org/apache/causeway/commons/internal/image/_ImagesTest.java
@@ -20,7 +20,6 @@ package org.apache.causeway.commons.internal.image;
import java.awt.image.BufferedImage;
-import org.apache.causeway.commons.internal.image._Images;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
diff --git a/commons/src/test/java/org/apache/causeway/commons/internal/primitives/IntsTest.java b/commons/src/test/java/org/apache/causeway/commons/internal/primitives/IntsTest.java
index fae4559dba..b40e4ac047 100644
--- a/commons/src/test/java/org/apache/causeway/commons/internal/primitives/IntsTest.java
+++ b/commons/src/test/java/org/apache/causeway/commons/internal/primitives/IntsTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.causeway.commons.internal.primitives;
-import org.apache.causeway.commons.internal.primitives._Ints;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/commons/src/test/java/org/apache/causeway/commons/internal/primitives/_IntsTest.java b/commons/src/test/java/org/apache/causeway/commons/internal/primitives/_IntsTest.java
index cf7440ce12..f403f65a49 100644
--- a/commons/src/test/java/org/apache/causeway/commons/internal/primitives/_IntsTest.java
+++ b/commons/src/test/java/org/apache/causeway/commons/internal/primitives/_IntsTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.causeway.commons.internal.primitives;
-import org.apache.causeway.commons.internal.primitives._Ints;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
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 4d4ea2dc5c..1f281f7e0a 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
@@ -18,9 +18,6 @@
*/
package org.apache.causeway.commons.internal.reflection;
-import org.apache.causeway.commons.internal._Constants;
-import org.apache.causeway.commons.internal.reflection._Annotations;
-import org.apache.causeway.commons.internal.reflection._Reflect;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
@@ -30,6 +27,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.apache.causeway.commons.internal._Constants;
+
import lombok.Getter;
import lombok.Setter;
import lombok.val;
diff --git a/commons/src/test/java/org/apache/causeway/commons/internal/reflection/ClassCacheTest.java b/commons/src/test/java/org/apache/causeway/commons/internal/reflection/ClassCacheTest.java
index 4a929281a3..001048f111 100644
--- a/commons/src/test/java/org/apache/causeway/commons/internal/reflection/ClassCacheTest.java
+++ b/commons/src/test/java/org/apache/causeway/commons/internal/reflection/ClassCacheTest.java
@@ -20,16 +20,15 @@ package org.apache.causeway.commons.internal.reflection;
import java.lang.reflect.Method;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.reflection._ClassCache;
-import org.apache.causeway.commons.internal.reflection._Reflect;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.base._NullSafe;
+
import lombok.val;
class ClassCacheTest {
diff --git a/commons/src/test/java/org/apache/causeway/commons/internal/reflection/GenericsTest.java b/commons/src/test/java/org/apache/causeway/commons/internal/reflection/GenericsTest.java
index 61877d6001..fc69387fb5 100644
--- a/commons/src/test/java/org/apache/causeway/commons/internal/reflection/GenericsTest.java
+++ b/commons/src/test/java/org/apache/causeway/commons/internal/reflection/GenericsTest.java
@@ -20,14 +20,14 @@ package org.apache.causeway.commons.internal.reflection;
import java.util.ArrayList;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal._Constants;
-import org.apache.causeway.commons.internal.reflection._Generics;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal._Constants;
+
import lombok.val;
class GenericsTest {
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 183e6f9983..e7a9884e55 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
@@ -22,7 +22,6 @@ import java.lang.reflect.Method;
import java.util.Collection;
import java.util.List;
-import org.apache.causeway.commons.internal.reflection._Reflect;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.util.ReflectionUtils;
diff --git a/commons/src/test/java/org/apache/causeway/commons/internal/resources/JsonYamlReaderTest.java b/commons/src/test/java/org/apache/causeway/commons/internal/resources/JsonYamlReaderTest.java
index 4594129999..86903ee9da 100644
--- a/commons/src/test/java/org/apache/causeway/commons/internal/resources/JsonYamlReaderTest.java
+++ b/commons/src/test/java/org/apache/causeway/commons/internal/resources/JsonYamlReaderTest.java
@@ -23,8 +23,6 @@ import java.io.IOException;
import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.databind.JsonMappingException;
-import org.apache.causeway.commons.internal.resources._Json;
-import org.apache.causeway.commons.internal.resources._Yaml;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/commons/src/test/java/org/apache/causeway/commons/internal/resources/ResourcesTest.java b/commons/src/test/java/org/apache/causeway/commons/internal/resources/ResourcesTest.java
index 55af9d8548..c85286b603 100644
--- a/commons/src/test/java/org/apache/causeway/commons/internal/resources/ResourcesTest.java
+++ b/commons/src/test/java/org/apache/causeway/commons/internal/resources/ResourcesTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.causeway.commons.internal.resources;
-import org.apache.causeway.commons.internal.resources._Resources;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/commons/src/test/java/org/apache/causeway/commons/internal/resources/XmlRoundTripTest.java b/commons/src/test/java/org/apache/causeway/commons/internal/resources/XmlRoundTripTest.java
index 9236fd0de1..c4e889ba36 100644
--- a/commons/src/test/java/org/apache/causeway/commons/internal/resources/XmlRoundTripTest.java
+++ b/commons/src/test/java/org/apache/causeway/commons/internal/resources/XmlRoundTripTest.java
@@ -24,7 +24,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.causeway.commons.internal.resources._Xml;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/core/codegen-bytebuddy/src/main/java/org/apache/causeway/core/codegen/bytebuddy/CausewayModuleCoreCodegenByteBuddy.java b/core/codegen-bytebuddy/src/main/java/org/apache/causeway/core/codegen/bytebuddy/CausewayModuleCoreCodegenByteBuddy.java
index afe76c1508..d99ec0ca66 100644
--- a/core/codegen-bytebuddy/src/main/java/org/apache/causeway/core/codegen/bytebuddy/CausewayModuleCoreCodegenByteBuddy.java
+++ b/core/codegen-bytebuddy/src/main/java/org/apache/causeway/core/codegen/bytebuddy/CausewayModuleCoreCodegenByteBuddy.java
@@ -18,10 +18,11 @@
*/
package org.apache.causeway.core.codegen.bytebuddy;
-import org.apache.causeway.core.codegen.bytebuddy.services.ProxyFactoryServiceByteBuddy;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.core.codegen.bytebuddy.services.ProxyFactoryServiceByteBuddy;
+
@Configuration
@Import({
// services
diff --git a/core/codegen-bytebuddy/src/main/java/org/apache/causeway/core/codegen/bytebuddy/services/ProxyFactoryServiceByteBuddy.java b/core/codegen-bytebuddy/src/main/java/org/apache/causeway/core/codegen/bytebuddy/services/ProxyFactoryServiceByteBuddy.java
index 12a4995d65..72dc698c99 100644
--- a/core/codegen-bytebuddy/src/main/java/org/apache/causeway/core/codegen/bytebuddy/services/ProxyFactoryServiceByteBuddy.java
+++ b/core/codegen-bytebuddy/src/main/java/org/apache/causeway/core/codegen/bytebuddy/services/ProxyFactoryServiceByteBuddy.java
@@ -22,16 +22,17 @@ import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
import java.util.function.Function;
+import org.objenesis.Objenesis;
+import org.objenesis.ObjenesisStd;
+import org.springframework.lang.Nullable;
+import org.springframework.stereotype.Service;
+
import org.apache.causeway.commons.internal._Constants;
import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.internal.context._Context;
import org.apache.causeway.commons.internal.proxy._ProxyFactory;
import org.apache.causeway.commons.internal.proxy._ProxyFactoryServiceAbstract;
-import org.objenesis.Objenesis;
-import org.objenesis.ObjenesisStd;
-import org.springframework.lang.Nullable;
-import org.springframework.stereotype.Service;
import net.bytebuddy.ByteBuddy;
import net.bytebuddy.NamingStrategy;
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 f4691a8a69..2cd98dc160 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
@@ -49,6 +49,10 @@ import javax.validation.Payload;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.validation.annotation.Validated;
+
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.ActionLayout;
import org.apache.causeway.applib.annotation.CollectionLayout;
@@ -66,8 +70,6 @@ import org.apache.causeway.applib.services.userui.UserMenu;
import org.apache.causeway.applib.value.semantics.TemporalValueSemantics.TemporalEditingPattern;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.internal.context._Context;
-import org.apache.causeway.core.config.CausewayConfiguration.Core;
-import org.apache.causeway.core.config.CausewayConfiguration.Viewer;
import org.apache.causeway.core.config.metamodel.facets.ActionConfigOptions;
import org.apache.causeway.core.config.metamodel.facets.CollectionLayoutConfigOptions;
import org.apache.causeway.core.config.metamodel.facets.DomainObjectConfigOptions;
@@ -77,9 +79,6 @@ import org.apache.causeway.core.config.metamodel.facets.PropertyConfigOptions;
import org.apache.causeway.core.config.metamodel.services.ApplicationFeaturesInitConfiguration;
import org.apache.causeway.core.config.metamodel.specloader.IntrospectionMode;
import org.apache.causeway.core.config.viewer.web.DialogMode;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.validation.annotation.Validated;
import lombok.Data;
import lombok.Getter;
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/CausewayModuleCoreConfig.java b/core/config/src/main/java/org/apache/causeway/core/config/CausewayModuleCoreConfig.java
index f1ada2bd65..919ff94450 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/CausewayModuleCoreConfig.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/CausewayModuleCoreConfig.java
@@ -21,6 +21,11 @@ package org.apache.causeway.core.config;
import java.util.Collections;
import java.util.Map;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
import org.apache.causeway.core.config.applib.RestfulPathProvider;
import org.apache.causeway.core.config.beans.CausewayBeanFactoryPostProcessorForSpring;
import org.apache.causeway.core.config.beans.CausewayBeanTypeRegistryDefault;
@@ -31,10 +36,6 @@ import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.config.environment.CausewayTimeZoneInitializer;
import org.apache.causeway.core.config.validators.PatternOptionalStringConstraintValidator;
import org.apache.causeway.core.config.viewer.web.WebAppContextPath;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
import lombok.Data;
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanFactoryPostProcessorForSpring.java b/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanFactoryPostProcessorForSpring.java
index c0b19212b8..d2c2df8816 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanFactoryPostProcessorForSpring.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanFactoryPostProcessorForSpring.java
@@ -22,10 +22,6 @@ import java.util.Objects;
import javax.inject.Named;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.core.config.CausewayModuleCoreConfig;
-import org.apache.causeway.core.config.beans.aoppatch.AopPatch;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
@@ -38,6 +34,10 @@ import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.DomainService;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.core.config.CausewayModuleCoreConfig;
+import org.apache.causeway.core.config.beans.aoppatch.AopPatch;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanTypeClassifier.java b/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanTypeClassifier.java
index 38bc783a24..e4d8f1a673 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanTypeClassifier.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanTypeClassifier.java
@@ -21,9 +21,10 @@ package org.apache.causeway.core.config.beans;
import java.util.ServiceLoader;
import java.util.ServiceLoader.Provider;
+import org.springframework.context.ApplicationContext;
+
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.context._Context;
-import org.springframework.context.ApplicationContext;
import lombok.NonNull;
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanTypeClassifierDefault.java b/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanTypeClassifierDefault.java
index 147c3a540f..8a35310702 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanTypeClassifierDefault.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanTypeClassifierDefault.java
@@ -23,11 +23,6 @@ import java.lang.reflect.Modifier;
import javax.persistence.Entity;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.reflection._Annotations;
-import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants;
-import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants.TypeExcludeMarker;
import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Component;
import org.springframework.util.ClassUtils;
@@ -36,6 +31,11 @@ import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.DomainService;
import org.apache.causeway.applib.id.LogicalType;
import org.apache.causeway.applib.services.metamodel.BeanSort;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.reflection._Annotations;
+import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants;
+import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants.TypeExcludeMarker;
import lombok.AccessLevel;
import lombok.NonNull;
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanTypeRegistryDefault.java b/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanTypeRegistryDefault.java
index 889c97d7f3..c7bdc27763 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanTypeRegistryDefault.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanTypeRegistryDefault.java
@@ -27,14 +27,14 @@ import javax.annotation.Priority;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.collections._Maps;
-import org.apache.causeway.core.config.CausewayModuleCoreConfig;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.base._NullSafe;
+import org.apache.causeway.commons.internal.collections._Maps;
+import org.apache.causeway.core.config.CausewayModuleCoreConfig;
import lombok.Getter;
import lombok.NonNull;
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayComponentScanInterceptor.java b/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayComponentScanInterceptor.java
index 95577c72dd..ab77ff285e 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayComponentScanInterceptor.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayComponentScanInterceptor.java
@@ -18,9 +18,10 @@
*/
package org.apache.causeway.core.config.beans;
-import org.apache.causeway.commons.collections.Can;
import org.springframework.stereotype.Component;
+import org.apache.causeway.commons.collections.Can;
+
import lombok.NonNull;
/**
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/beans/aoppatch/AopPatch.java b/core/config/src/main/java/org/apache/causeway/core/config/beans/aoppatch/AopPatch.java
index dd9f6813e7..7f1defa404 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/beans/aoppatch/AopPatch.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/beans/aoppatch/AopPatch.java
@@ -20,7 +20,6 @@ package org.apache.causeway.core.config.beans.aoppatch;
import javax.inject.Named;
-import org.apache.causeway.core.config.CausewayModuleCoreConfig;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.ApplicationContext;
@@ -34,6 +33,8 @@ import org.springframework.transaction.interceptor.BeanFactoryTransactionAttribu
import org.springframework.transaction.interceptor.TransactionAttributeSource;
import org.springframework.transaction.interceptor.TransactionInterceptor;
+import org.apache.causeway.core.config.CausewayModuleCoreConfig;
+
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/converters/PatternsConverter.java b/core/config/src/main/java/org/apache/causeway/core/config/converters/PatternsConverter.java
index ffe449e9ae..3e46f6e905 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/converters/PatternsConverter.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/converters/PatternsConverter.java
@@ -25,13 +25,14 @@ import java.util.regex.Pattern;
import javax.inject.Named;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.collections._Maps;
-import org.apache.causeway.core.config.CausewayModuleCoreConfig;
import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
import org.springframework.core.convert.converter.Converter;
import org.springframework.stereotype.Component;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.collections._Maps;
+import org.apache.causeway.core.config.CausewayModuleCoreConfig;
+
@Component
@Named(CausewayModuleCoreConfig.NAMESPACE + "..PatternsConverter")
@ConfigurationPropertiesBinding
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 4c9aca2ea6..fa1ab17ef1 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
@@ -28,14 +28,14 @@ import javax.annotation.Priority;
import javax.inject.Named;
import javax.sql.DataSource;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.base._Lazy;
-import org.apache.causeway.core.config.CausewayModuleCoreConfig;
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.commons.collections.Can;
+import org.apache.causeway.commons.internal.base._Lazy;
+import org.apache.causeway.core.config.CausewayModuleCoreConfig;
import lombok.NonNull;
import lombok.SneakyThrows;
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/environment/CausewayLocaleInitializer.java b/core/config/src/main/java/org/apache/causeway/core/config/environment/CausewayLocaleInitializer.java
index 498c50996d..4959e5656f 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/environment/CausewayLocaleInitializer.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/environment/CausewayLocaleInitializer.java
@@ -24,9 +24,10 @@ import java.util.Optional;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
-import org.apache.causeway.core.config.CausewayConfiguration;
import org.springframework.stereotype.Component;
+import org.apache.causeway.core.config.CausewayConfiguration;
+
import lombok.extern.log4j.Log4j2;
@Component
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/environment/CausewaySystemEnvironment.java b/core/config/src/main/java/org/apache/causeway/core/config/environment/CausewaySystemEnvironment.java
index 74cfbb1e9f..0cbb89de7d 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/environment/CausewaySystemEnvironment.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/environment/CausewaySystemEnvironment.java
@@ -25,10 +25,6 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.context._Context;
-import org.apache.causeway.commons.internal.ioc._IocContainer;
-import org.apache.causeway.core.config.CausewayModuleCoreConfig;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.context.event.ApplicationFailedEvent;
import org.springframework.context.ApplicationContext;
@@ -37,6 +33,11 @@ import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Service;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.context._Context;
+import org.apache.causeway.commons.internal.ioc._IocContainer;
+import org.apache.causeway.core.config.CausewayModuleCoreConfig;
+
import lombok.Getter;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/environment/CausewayTimeZoneInitializer.java b/core/config/src/main/java/org/apache/causeway/core/config/environment/CausewayTimeZoneInitializer.java
index 3a61162ede..d6e2725090 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/environment/CausewayTimeZoneInitializer.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/environment/CausewayTimeZoneInitializer.java
@@ -23,9 +23,10 @@ import java.util.TimeZone;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
-import org.apache.causeway.core.config.CausewayConfiguration;
import org.springframework.stereotype.Component;
+import org.apache.causeway.core.config.CausewayConfiguration;
+
import lombok.extern.log4j.Log4j2;
@Component
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/metamodel/facets/CollectionLayoutConfigOptions.java b/core/config/src/main/java/org/apache/causeway/core/config/metamodel/facets/CollectionLayoutConfigOptions.java
index b376f15f3b..c085a2e020 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/metamodel/facets/CollectionLayoutConfigOptions.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/metamodel/facets/CollectionLayoutConfigOptions.java
@@ -18,9 +18,10 @@
*/
package org.apache.causeway.core.config.metamodel.facets;
-import org.apache.causeway.core.config.CausewayConfiguration;
import org.springframework.lang.Nullable;
+import org.apache.causeway.core.config.CausewayConfiguration;
+
import lombok.Getter;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/metamodel/specloader/IntrospectionMode.java b/core/config/src/main/java/org/apache/causeway/core/config/metamodel/specloader/IntrospectionMode.java
index 9e14e2c73f..ed54818fa9 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/metamodel/specloader/IntrospectionMode.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/metamodel/specloader/IntrospectionMode.java
@@ -19,8 +19,8 @@
package org.apache.causeway.core.config.metamodel.specloader;
import org.apache.causeway.core.config.CausewayConfiguration;
-import org.apache.causeway.core.config.environment.DeploymentType;
import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
+import org.apache.causeway.core.config.environment.DeploymentType;
import lombok.val;
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/progmodel/ProgrammingModelConstants.java b/core/config/src/main/java/org/apache/causeway/core/config/progmodel/ProgrammingModelConstants.java
index b2103609a9..dc7c1b9a52 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/progmodel/ProgrammingModelConstants.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/progmodel/ProgrammingModelConstants.java
@@ -42,6 +42,15 @@ import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import org.springframework.lang.Nullable;
+import org.springframework.util.ClassUtils;
+
+import org.apache.causeway.applib.Identifier;
+import org.apache.causeway.applib.annotation.Domain;
+import org.apache.causeway.applib.annotation.MemberSupport;
+import org.apache.causeway.applib.annotation.ObjectLifecycle;
+import org.apache.causeway.applib.annotation.ObjectSupport;
+import org.apache.causeway.applib.services.i18n.TranslatableString;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.collections.ImmutableCollection;
import org.apache.causeway.commons.collections.ImmutableEnumSet;
@@ -56,19 +65,10 @@ import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.commons.internal.reflection._Annotations;
import org.apache.causeway.commons.internal.reflection._Reflect;
-import org.springframework.lang.Nullable;
-import org.springframework.util.ClassUtils;
import static org.apache.causeway.commons.internal.reflection._Reflect.Filter.paramAssignableFrom;
import static org.apache.causeway.commons.internal.reflection._Reflect.Filter.paramCount;
-import org.apache.causeway.applib.Identifier;
-import org.apache.causeway.applib.annotation.Domain;
-import org.apache.causeway.applib.annotation.MemberSupport;
-import org.apache.causeway.applib.annotation.ObjectLifecycle;
-import org.apache.causeway.applib.annotation.ObjectSupport;
-import org.apache.causeway.applib.services.i18n.TranslatableString;
-
import lombok.Getter;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/util/SpringProfileUtil.java b/core/config/src/main/java/org/apache/causeway/core/config/util/SpringProfileUtil.java
index aff8231ee6..7d6963846d 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/util/SpringProfileUtil.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/util/SpringProfileUtil.java
@@ -20,9 +20,10 @@ package org.apache.causeway.core.config.util;
import java.util.stream.Collectors;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._Strings;
-import org.springframework.lang.Nullable;
import lombok.val;
import lombok.experimental.UtilityClass;
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/viewer/web/WebAppContextPath.java b/core/config/src/main/java/org/apache/causeway/core/config/viewer/web/WebAppContextPath.java
index ee1a86b128..adf583b52f 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/viewer/web/WebAppContextPath.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/viewer/web/WebAppContextPath.java
@@ -26,14 +26,14 @@ import javax.annotation.Priority;
import javax.inject.Named;
import javax.inject.Singleton;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.resources._Resources;
-import org.apache.causeway.core.config.CausewayModuleCoreConfig;
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.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.resources._Resources;
+import org.apache.causeway.core.config.CausewayModuleCoreConfig;
import lombok.Getter;
import lombok.val;
diff --git a/core/config/src/test/java/org/apache/causeway/core/config/CausewayConfiguration_getMaxTitleLengthInParentedTables_Test.java b/core/config/src/test/java/org/apache/causeway/core/config/CausewayConfiguration_getMaxTitleLengthInParentedTables_Test.java
index a241f1e207..5f678cddb9 100644
--- a/core/config/src/test/java/org/apache/causeway/core/config/CausewayConfiguration_getMaxTitleLengthInParentedTables_Test.java
+++ b/core/config/src/test/java/org/apache/causeway/core/config/CausewayConfiguration_getMaxTitleLengthInParentedTables_Test.java
@@ -18,7 +18,6 @@
*/
package org.apache.causeway.core.config;
-import org.apache.causeway.core.config.CausewayConfiguration;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/core/config/src/test/java/org/apache/causeway/core/config/CausewayConfiguration_getMaxTitleLengthInStandaloneTables_Test.java b/core/config/src/test/java/org/apache/causeway/core/config/CausewayConfiguration_getMaxTitleLengthInStandaloneTables_Test.java
index 595e12baae..ab9e5a7b7b 100644
--- a/core/config/src/test/java/org/apache/causeway/core/config/CausewayConfiguration_getMaxTitleLengthInStandaloneTables_Test.java
+++ b/core/config/src/test/java/org/apache/causeway/core/config/CausewayConfiguration_getMaxTitleLengthInStandaloneTables_Test.java
@@ -18,7 +18,6 @@
*/
package org.apache.causeway.core.config;
-import org.apache.causeway.core.config.CausewayConfiguration;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/core/config/src/test/java/org/apache/causeway/core/config/progmodel/ProgrammingModelConstantsTest.java b/core/config/src/test/java/org/apache/causeway/core/config/progmodel/ProgrammingModelConstantsTest.java
index b8a6b06098..2b15d9c886 100644
--- a/core/config/src/test/java/org/apache/causeway/core/config/progmodel/ProgrammingModelConstantsTest.java
+++ b/core/config/src/test/java/org/apache/causeway/core/config/progmodel/ProgrammingModelConstantsTest.java
@@ -22,13 +22,14 @@ import java.time.OffsetDateTime;
import java.time.ZoneOffset;
import java.util.stream.Stream;
-import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants.DateTimeFormat;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants.DateTimeFormat;
+
class ProgrammingModelConstantsTest {
@ParameterizedTest(name = "{index} {0}")
diff --git a/core/config/src/test/java/org/apache/causeway/core/config/util/ConfigUtil_isProtected_Test.java b/core/config/src/test/java/org/apache/causeway/core/config/util/ConfigUtil_isProtected_Test.java
index 559d073bda..4d6f8b9e7a 100644
--- a/core/config/src/test/java/org/apache/causeway/core/config/util/ConfigUtil_isProtected_Test.java
+++ b/core/config/src/test/java/org/apache/causeway/core/config/util/ConfigUtil_isProtected_Test.java
@@ -18,7 +18,6 @@
*/
package org.apache.causeway.core.config.util;
-import org.apache.causeway.core.config.util.ValueMaskingUtil;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/core/config/src/test/java/org/apache/causeway/core/config/util/ConfigUtil_mask_Test.java b/core/config/src/test/java/org/apache/causeway/core/config/util/ConfigUtil_mask_Test.java
index ec07526ffb..c7c315e85d 100644
--- a/core/config/src/test/java/org/apache/causeway/core/config/util/ConfigUtil_mask_Test.java
+++ b/core/config/src/test/java/org/apache/causeway/core/config/util/ConfigUtil_mask_Test.java
@@ -18,7 +18,6 @@
*/
package org.apache.causeway.core.config.util;
-import org.apache.causeway.core.config.util.ValueMaskingUtil;
import org.junit.jupiter.api.Test;
import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/core/config/src/test/java/org/apache/causeway/core/config/viewer/wicket/WebAppContextPath_setContextPath_Test.java b/core/config/src/test/java/org/apache/causeway/core/config/viewer/wicket/WebAppContextPath_setContextPath_Test.java
index 41c28bd6a7..a02bfc0b6c 100644
--- a/core/config/src/test/java/org/apache/causeway/core/config/viewer/wicket/WebAppContextPath_setContextPath_Test.java
+++ b/core/config/src/test/java/org/apache/causeway/core/config/viewer/wicket/WebAppContextPath_setContextPath_Test.java
@@ -18,11 +18,12 @@
*/
package org.apache.causeway.core.config.viewer.wicket;
-import org.apache.causeway.core.config.viewer.web.WebAppContextPath;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.apache.causeway.core.config.viewer.web.WebAppContextPath;
+
class WebAppContextPath_setContextPath_Test {
private WebAppContextPath webAppContextPath;
diff --git a/core/interaction/src/main/java/org/apache/causeway/core/interaction/CausewayModuleCoreInteraction.java b/core/interaction/src/main/java/org/apache/causeway/core/interaction/CausewayModuleCoreInteraction.java
index fc1c8d2dcb..59aa11d27b 100644
--- a/core/interaction/src/main/java/org/apache/causeway/core/interaction/CausewayModuleCoreInteraction.java
+++ b/core/interaction/src/main/java/org/apache/causeway/core/interaction/CausewayModuleCoreInteraction.java
@@ -18,11 +18,12 @@
*/
package org.apache.causeway.core.interaction;
-import org.apache.causeway.core.interaction.integration.InteractionAwareTransactionalBoundaryHandler;
-import org.apache.causeway.core.interaction.scope.InteractionScopeBeanFactoryPostProcessor;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.core.interaction.integration.InteractionAwareTransactionalBoundaryHandler;
+import org.apache.causeway.core.interaction.scope.InteractionScopeBeanFactoryPostProcessor;
+
@Configuration
@Import({
diff --git a/core/interaction/src/main/java/org/apache/causeway/core/interaction/integration/InteractionAwareTransactionalBoundaryHandler.java b/core/interaction/src/main/java/org/apache/causeway/core/interaction/integration/InteractionAwareTransactionalBoundaryHandler.java
index 6597fc2f46..29bdd3c6f9 100644
--- a/core/interaction/src/main/java/org/apache/causeway/core/interaction/integration/InteractionAwareTransactionalBoundaryHandler.java
+++ b/core/interaction/src/main/java/org/apache/causeway/core/interaction/integration/InteractionAwareTransactionalBoundaryHandler.java
@@ -26,11 +26,6 @@ import javax.annotation.Priority;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.functional.ThrowingRunnable;
-import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.commons.internal.debug._Probe;
-import org.apache.causeway.core.interaction.session.CausewayInteraction;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
import org.springframework.transaction.PlatformTransactionManager;
@@ -39,6 +34,11 @@ import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.TransactionTemplate;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.functional.ThrowingRunnable;
+import org.apache.causeway.commons.internal.collections._Lists;
+import org.apache.causeway.commons.internal.debug._Probe;
+import org.apache.causeway.core.interaction.session.CausewayInteraction;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
diff --git a/core/interaction/src/main/java/org/apache/causeway/core/interaction/scope/InteractionScope.java b/core/interaction/src/main/java/org/apache/causeway/core/interaction/scope/InteractionScope.java
index ed76e025f5..0bcb41bd87 100644
--- a/core/interaction/src/main/java/org/apache/causeway/core/interaction/scope/InteractionScope.java
+++ b/core/interaction/src/main/java/org/apache/causeway/core/interaction/scope/InteractionScope.java
@@ -21,9 +21,6 @@ package org.apache.causeway.core.interaction.scope;
import java.util.Map;
import java.util.UUID;
-import org.apache.causeway.commons.internal.collections._Maps;
-import org.apache.causeway.commons.internal.debug._Probe;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
@@ -32,6 +29,9 @@ import org.springframework.beans.factory.ObjectFactory;
import org.springframework.beans.factory.config.Scope;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.commons.internal.collections._Maps;
+import org.apache.causeway.commons.internal.debug._Probe;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import lombok.Data;
import lombok.val;
diff --git a/core/interaction/src/main/java/org/apache/causeway/core/interaction/session/CausewayInteraction.java b/core/interaction/src/main/java/org/apache/causeway/core/interaction/session/CausewayInteraction.java
index 2105a67f25..9d3b12aa28 100644
--- a/core/interaction/src/main/java/org/apache/causeway/core/interaction/session/CausewayInteraction.java
+++ b/core/interaction/src/main/java/org/apache/causeway/core/interaction/session/CausewayInteraction.java
@@ -26,16 +26,15 @@ import java.util.UUID;
import java.util.concurrent.atomic.LongAdder;
import java.util.function.Function;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
-
import org.apache.causeway.applib.services.clock.ClockService;
import org.apache.causeway.applib.services.command.Command;
import org.apache.causeway.applib.services.iactn.ActionInvocation;
import org.apache.causeway.applib.services.iactn.Execution;
import org.apache.causeway.applib.services.iactn.PropertyEdit;
import org.apache.causeway.applib.services.metrics.MetricsService;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.commons.internal.collections._Lists;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.metamodel.execution.InteractionInternal;
import lombok.Getter;
diff --git a/core/interaction/src/main/java/org/apache/causeway/core/interaction/session/MessageBrokerImpl.java b/core/interaction/src/main/java/org/apache/causeway/core/interaction/session/MessageBrokerImpl.java
index 571599fc28..6c1aaee7cb 100644
--- a/core/interaction/src/main/java/org/apache/causeway/core/interaction/session/MessageBrokerImpl.java
+++ b/core/interaction/src/main/java/org/apache/causeway/core/interaction/session/MessageBrokerImpl.java
@@ -24,7 +24,6 @@ import java.util.Optional;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.collections._Lists;
-
import org.apache.causeway.core.metamodel.services.message.MessageBroker;
import lombok.NoArgsConstructor;
diff --git a/core/interaction/src/test/java/org/apache/causeway/core/interaction/InteractionDefaultTest_next.java b/core/interaction/src/test/java/org/apache/causeway/core/interaction/InteractionDefaultTest_next.java
index bee1d359aa..28c3e145ad 100644
--- a/core/interaction/src/test/java/org/apache/causeway/core/interaction/InteractionDefaultTest_next.java
+++ b/core/interaction/src/test/java/org/apache/causeway/core/interaction/InteractionDefaultTest_next.java
@@ -20,12 +20,13 @@ package org.apache.causeway.core.interaction;
import java.util.UUID;
-import org.apache.causeway.core.interaction.session.CausewayInteraction;
import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.apache.causeway.core.interaction.session.CausewayInteraction;
+
import lombok.val;
class InteractionDefaultTest_next {
diff --git a/core/internaltestsupport/src/main/java/org/apache/causeway/core/internaltestsupport/contract/ComparableContractTester.java b/core/internaltestsupport/src/main/java/org/apache/causeway/core/internaltestsupport/contract/ComparableContractTester.java
index b19f6a8d53..1b3a0cbc51 100644
--- a/core/internaltestsupport/src/main/java/org/apache/causeway/core/internaltestsupport/contract/ComparableContractTester.java
+++ b/core/internaltestsupport/src/main/java/org/apache/causeway/core/internaltestsupport/contract/ComparableContractTester.java
@@ -20,12 +20,13 @@ package org.apache.causeway.core.internaltestsupport.contract;
import java.util.List;
-import org.apache.causeway.commons.internal.collections._Lists;
import org.hamcrest.Matchers;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.apache.causeway.commons.internal.collections._Lists;
+
public class ComparableContractTester<T extends Comparable<T>> {
diff --git a/core/internaltestvintage/src/main/java/org/apache/causeway/core/internaltestsupport/jmocking/ImposteriserUsingCodegenPlugin.java b/core/internaltestvintage/src/main/java/org/apache/causeway/core/internaltestsupport/jmocking/ImposteriserUsingCodegenPlugin.java
index 34ad853ad2..6201c154a8 100644
--- a/core/internaltestvintage/src/main/java/org/apache/causeway/core/internaltestsupport/jmocking/ImposteriserUsingCodegenPlugin.java
+++ b/core/internaltestvintage/src/main/java/org/apache/causeway/core/internaltestsupport/jmocking/ImposteriserUsingCodegenPlugin.java
@@ -21,13 +21,14 @@ package org.apache.causeway.core.internaltestsupport.jmocking;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-import org.apache.causeway.commons.internal.proxy._ProxyFactory;
-import org.apache.causeway.core.codegen.bytebuddy.services.ProxyFactoryServiceByteBuddy;
import org.jmock.api.Imposteriser;
import org.jmock.api.Invocation;
import org.jmock.api.Invokable;
import org.jmock.lib.JavaReflectionImposteriser;
+import org.apache.causeway.commons.internal.proxy._ProxyFactory;
+import org.apache.causeway.core.codegen.bytebuddy.services.ProxyFactoryServiceByteBuddy;
+
class ImposteriserUsingCodegenPlugin implements Imposteriser {
public static final Imposteriser INSTANCE = new ImposteriserUsingCodegenPlugin();
diff --git a/core/internaltestvintage/src/main/java/org/apache/causeway/core/internaltestsupport/jmocking/JUnitRuleMockery2.java b/core/internaltestvintage/src/main/java/org/apache/causeway/core/internaltestsupport/jmocking/JUnitRuleMockery2.java
index 0b590a044e..fea1952d31 100644
--- a/core/internaltestvintage/src/main/java/org/apache/causeway/core/internaltestsupport/jmocking/JUnitRuleMockery2.java
+++ b/core/internaltestvintage/src/main/java/org/apache/causeway/core/internaltestsupport/jmocking/JUnitRuleMockery2.java
@@ -28,8 +28,6 @@ import java.util.function.Consumer;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.reflection._Reflect;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.jmock.integration.junit4.JUnit4Mockery;
@@ -43,9 +41,11 @@ import org.picocontainer.PicoBuilder;
import static org.junit.Assert.fail;
-import lombok.RequiredArgsConstructor;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.commons.internal.reflection._Reflect;
import junit.framework.AssertionFailedError;
+import lombok.RequiredArgsConstructor;
/**
diff --git a/core/internaltestvintage/src/main/java/org/apache/causeway/core/internaltestsupport/jmocking/MyMockomatic.java b/core/internaltestvintage/src/main/java/org/apache/causeway/core/internaltestsupport/jmocking/MyMockomatic.java
index 5906818d0a..01e113abbe 100644
--- a/core/internaltestvintage/src/main/java/org/apache/causeway/core/internaltestsupport/jmocking/MyMockomatic.java
+++ b/core/internaltestvintage/src/main/java/org/apache/causeway/core/internaltestsupport/jmocking/MyMockomatic.java
@@ -22,12 +22,13 @@ import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
-import org.apache.causeway.commons.internal.reflection._Reflect;
import org.jmock.Sequence;
import org.jmock.States;
import org.jmock.auto.Auto;
import org.jmock.auto.Mock;
+import org.apache.causeway.commons.internal.reflection._Reflect;
+
class MyMockomatic {
private final JUnitRuleMockery2 context;
diff --git a/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 50984b4757..18894ea9f9 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,9 +20,6 @@ package org.apache.causeway.core.metamodel;
import java.util.stream.Stream;
-import org.apache.causeway.commons.functional.Either;
-import org.apache.causeway.commons.functional.Railway;
-import org.apache.causeway.commons.functional.Try;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
@@ -31,6 +28,9 @@ import org.springframework.context.annotation.Primary;
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.graph.tree.TreeAdapter;
import org.apache.causeway.applib.services.appfeat.ApplicationFeatureSort;
+import org.apache.causeway.commons.functional.Either;
+import org.apache.causeway.commons.functional.Railway;
+import org.apache.causeway.commons.functional.Try;
import org.apache.causeway.core.config.CausewayModuleCoreConfig;
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants.CollectionSemantics;
import org.apache.causeway.core.metamodel.context.MetaModelContexts;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/MetaModelContext_forTesting.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/MetaModelContext_forTesting.java
index 6f6101c675..d67682f95a 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/MetaModelContext_forTesting.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/MetaModelContext_forTesting.java
@@ -29,15 +29,6 @@ import java.util.stream.Stream;
import static java.util.Objects.requireNonNull;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.base._Lazy;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.commons.internal.collections._Maps;
-import org.apache.causeway.commons.internal.collections._Sets;
-import org.apache.causeway.commons.internal.collections._Streams;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
-import org.apache.causeway.commons.internal.ioc._ManagedBeanAdapter;
import org.springframework.core.env.AbstractEnvironment;
import org.springframework.util.ClassUtils;
@@ -62,6 +53,15 @@ import org.apache.causeway.applib.services.xactn.TransactionState;
import org.apache.causeway.applib.value.semantics.ValueSemanticsAbstract;
import org.apache.causeway.applib.value.semantics.ValueSemanticsProvider;
import org.apache.causeway.applib.value.semantics.ValueSemanticsResolver;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.base._Lazy;
+import org.apache.causeway.commons.internal.base._NullSafe;
+import org.apache.causeway.commons.internal.collections._Lists;
+import org.apache.causeway.commons.internal.collections._Maps;
+import org.apache.causeway.commons.internal.collections._Sets;
+import org.apache.causeway.commons.internal.collections._Streams;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
+import org.apache.causeway.commons.internal.ioc._ManagedBeanAdapter;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.beans.CausewayBeanFactoryPostProcessorForSpring;
import org.apache.causeway.core.config.beans.CausewayBeanTypeClassifier;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/MethodRemover_forTesting.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/MethodRemover_forTesting.java
index 72cb20dda0..1d11c1365f 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/MethodRemover_forTesting.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/MethodRemover_forTesting.java
@@ -24,9 +24,9 @@ import java.util.List;
import java.util.function.Consumer;
import java.util.function.Predicate;
-import org.apache.causeway.commons.collections.Can;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.commons.CanBeVoid;
import org.apache.causeway.core.metamodel.facetapi.MethodRemover;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/ServiceInjector_forTesting.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/ServiceInjector_forTesting.java
index 3e97043385..93d3d8bab2 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/ServiceInjector_forTesting.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/ServiceInjector_forTesting.java
@@ -18,11 +18,11 @@
*/
package org.apache.causeway.core.metamodel._testing;
+import static java.util.Objects.requireNonNull;
+
import org.apache.causeway.applib.services.inject.ServiceInjector;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
-import static java.util.Objects.requireNonNull;
-
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/ServiceRegistry_forTesting.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/ServiceRegistry_forTesting.java
index 9a926562ff..abaa64ada1 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/ServiceRegistry_forTesting.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/ServiceRegistry_forTesting.java
@@ -25,6 +25,8 @@ import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Stream;
+import org.apache.causeway.applib.id.LogicalType;
+import org.apache.causeway.applib.services.registry.ServiceRegistry;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.causeway.commons.internal.base._Casts;
@@ -36,9 +38,6 @@ import org.apache.causeway.commons.internal.context._Context;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.commons.internal.ioc._IocContainer;
import org.apache.causeway.commons.internal.ioc._ManagedBeanAdapter;
-
-import org.apache.causeway.applib.id.LogicalType;
-import org.apache.causeway.applib.services.registry.ServiceRegistry;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import lombok.Getter;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/_ServiceInjectorLegacy.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/_ServiceInjectorLegacy.java
index 098b5798c8..da971d3cb3 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/_ServiceInjectorLegacy.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/_ServiceInjectorLegacy.java
@@ -32,6 +32,12 @@ import java.util.function.Predicate;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
+import org.springframework.beans.factory.InjectionPoint;
+import org.springframework.core.MethodParameter;
+
+import org.apache.causeway.applib.exceptions.unrecoverable.MetaModelException;
+import org.apache.causeway.applib.services.inject.ServiceInjector;
+import org.apache.causeway.applib.services.registry.ServiceRegistry;
import org.apache.causeway.commons.internal._Constants;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.internal.collections._Arrays;
@@ -39,12 +45,6 @@ import org.apache.causeway.commons.internal.collections._Collections;
import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.commons.internal.reflection._Generics;
import org.apache.causeway.commons.internal.reflection._Reflect;
-import org.springframework.beans.factory.InjectionPoint;
-import org.springframework.core.MethodParameter;
-
-import org.apache.causeway.applib.exceptions.unrecoverable.MetaModelException;
-import org.apache.causeway.applib.services.inject.ServiceInjector;
-import org.apache.causeway.applib.services.registry.ServiceRegistry;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.commons.ToString;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/commons/CanonicalInvoker.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/commons/CanonicalInvoker.java
index dc511c219d..6ecab9ca4e 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/commons/CanonicalInvoker.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/commons/CanonicalInvoker.java
@@ -23,11 +23,12 @@ import java.lang.reflect.Executable;
import java.lang.reflect.Method;
import java.util.Optional;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.internal.collections._Arrays;
import org.apache.causeway.commons.internal.reflection._Reflect;
-import org.springframework.lang.Nullable;
import lombok.Builder;
import lombok.NonNull;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/commons/ClassExtensions.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/commons/ClassExtensions.java
index 0338ba918b..72bd9384b1 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/commons/ClassExtensions.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/commons/ClassExtensions.java
@@ -26,14 +26,13 @@ import java.net.URL;
import java.util.Objects;
import java.util.Optional;
+import org.apache.causeway.applib.exceptions.UnrecoverableException;
import org.apache.causeway.commons.internal._Constants;
import org.apache.causeway.commons.internal.base._Reduction;
import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.commons.internal.resources._Resources;
-import org.apache.causeway.applib.exceptions.UnrecoverableException;
-
public final class ClassExtensions {
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/commons/MethodUtil.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/commons/MethodUtil.java
index 8563cbc941..908ffcbe73 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/commons/MethodUtil.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/commons/MethodUtil.java
@@ -25,7 +25,6 @@ import java.util.Objects;
import java.util.function.Predicate;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/commons/ParameterAdapter.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/commons/ParameterAdapter.java
index 31ad45154a..6f8bdd446e 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/commons/ParameterAdapter.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/commons/ParameterAdapter.java
@@ -20,11 +20,11 @@ package org.apache.causeway.core.metamodel.commons;
import java.lang.reflect.Executable;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.internal._Constants;
import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.commons.internal.collections._Arrays;
-import org.springframework.lang.Nullable;
-
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants;
import lombok.NonNull;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/commons/StringExtensions.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/commons/StringExtensions.java
index 60db654fe9..c457f48dff 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/commons/StringExtensions.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/commons/StringExtensions.java
@@ -23,11 +23,11 @@ import java.util.Collections;
import java.util.List;
import java.util.StringTokenizer;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.resources._Resources;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.util.Enums;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.resources._Resources;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/consent/Veto.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/consent/Veto.java
index d906456812..4c4dfd89f5 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/consent/Veto.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/consent/Veto.java
@@ -18,10 +18,10 @@
*/
package org.apache.causeway.core.metamodel.consent;
-import static org.apache.causeway.commons.internal.base._With.requiresNotEmpty;
-
import org.apache.causeway.core.metamodel.facetapi.Facet;
+import static org.apache.causeway.commons.internal.base._With.requiresNotEmpty;
+
public class Veto extends ConsentAbstract {
private static final long serialVersionUID = 1L;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/execution/MemberExecutorService.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/execution/MemberExecutorService.java
index 01ae2e202e..58774e1e31 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/execution/MemberExecutorService.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/execution/MemberExecutorService.java
@@ -21,11 +21,10 @@ package org.apache.causeway.core.metamodel.execution;
import java.lang.reflect.Method;
import java.util.Optional;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
-
import org.apache.causeway.applib.services.iactn.ActionInvocation;
import org.apache.causeway.applib.services.iactn.PropertyEdit;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.properties.property.modify.PropertySetterOrClearFacetForDomainEventAbstract.EditingVariant;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facetapi/Facet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facetapi/Facet.java
index d576ce7711..4a9e7121b7 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facetapi/Facet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facetapi/Facet.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facetapi;
import java.util.Optional;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
-
import org.apache.causeway.applib.Identifier;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.metamodel.facets.FacetFactory;
import org.apache.causeway.core.metamodel.facets.FacetedMethod;
import org.apache.causeway.core.metamodel.facets.actions.action.invocation.ActionInvocationFacet;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facetapi/FacetHolderAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facetapi/FacetHolderAbstract.java
index b6d2dca7df..47ce565d18 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facetapi/FacetHolderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facetapi/FacetHolderAbstract.java
@@ -22,14 +22,13 @@ import java.util.Map;
import java.util.Optional;
import java.util.stream.Stream;
+import org.apache.causeway.applib.Identifier;
import org.apache.causeway.commons.internal.base._Lazy;
import org.apache.causeway.commons.internal.collections._Maps;
+import org.apache.causeway.core.metamodel.context.MetaModelContext;
import static org.apache.causeway.commons.internal.base._Casts.uncheckedCast;
-import org.apache.causeway.applib.Identifier;
-import org.apache.causeway.core.metamodel.context.MetaModelContext;
-
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NonNull;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facetapi/FacetHolderLayered.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facetapi/FacetHolderLayered.java
index 21d4d4a920..5984d57fc5 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facetapi/FacetHolderLayered.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facetapi/FacetHolderLayered.java
@@ -22,10 +22,9 @@ import java.util.HashSet;
import java.util.Optional;
import java.util.stream.Stream;
-import org.apache.causeway.commons.internal.base._NullSafe;
-
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.services.i18n.TranslationContext;
+import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facets.FacetedMethod;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facetapi/FacetRanking.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facetapi/FacetRanking.java
index 61c2feb400..b67f2404de 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facetapi/FacetRanking.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facetapi/FacetRanking.java
@@ -32,7 +32,6 @@ import org.apache.causeway.commons.internal.base._Reduction;
import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.commons.internal.collections._Multimaps;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
-
import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence;
import lombok.Getter;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facetapi/FacetUtil.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facetapi/FacetUtil.java
index 8b99e96a7b..ccae8a0562 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facetapi/FacetUtil.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facetapi/FacetUtil.java
@@ -24,11 +24,11 @@ import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.collections._Lists;
import org.springframework.lang.Nullable;
import org.springframework.util.ClassUtils;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.core.metamodel.util.snapshot.XmlSchema;
import lombok.NonNull;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facetapi/FeatureType.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facetapi/FeatureType.java
index ae26b1b253..30e6983f55 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facetapi/FeatureType.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facetapi/FeatureType.java
@@ -21,10 +21,9 @@ package org.apache.causeway.core.metamodel.facetapi;
import java.beans.Introspector;
import java.lang.reflect.Method;
-import org.apache.causeway.commons.collections.ImmutableEnumSet;
-
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.id.LogicalType;
+import org.apache.causeway.commons.collections.ImmutableEnumSet;
import org.apache.causeway.core.metamodel.commons.StringExtensions;
import org.apache.causeway.core.metamodel.facets.FacetFactory;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facetapi/MethodRemover.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facetapi/MethodRemover.java
index e4172d5596..8fd5b1cffa 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facetapi/MethodRemover.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facetapi/MethodRemover.java
@@ -23,7 +23,6 @@ import java.util.function.Consumer;
import java.util.function.Predicate;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.commons.MethodUtil;
/**
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/ActionSupport.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/ActionSupport.java
index 7ff24c8822..26ce53057d 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/ActionSupport.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/ActionSupport.java
@@ -28,7 +28,6 @@ import java.util.function.Consumer;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal._Constants;
import org.apache.causeway.commons.internal.collections._Arrays;
-
import org.apache.causeway.core.metamodel.methods.MethodFinder;
import org.apache.causeway.core.metamodel.methods.MethodFinderPAT;
import org.apache.causeway.core.metamodel.methods.MethodFinderPAT.MethodAndPatConstructor;
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 8bc2ddb171..cac0ec18bf 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
@@ -24,18 +24,8 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.assertions._Assert;
-import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
-import org.apache.causeway.commons.internal.reflection._Reflect;
import org.springframework.lang.Nullable;
-import static org.apache.causeway.commons.internal.base._Casts.uncheckedCast;
-import static org.apache.causeway.commons.internal.reflection._Reflect.Filter.paramAssignableFrom;
-import static org.apache.causeway.commons.internal.reflection._Reflect.Filter.paramAssignableFromValue;
-import static org.apache.causeway.commons.internal.reflection._Reflect.Filter.paramCount;
-
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.events.domain.AbstractDomainEvent;
import org.apache.causeway.applib.events.domain.ActionDomainEvent;
@@ -43,6 +33,11 @@ import org.apache.causeway.applib.events.domain.CollectionDomainEvent;
import org.apache.causeway.applib.events.domain.PropertyDomainEvent;
import org.apache.causeway.applib.exceptions.UnrecoverableException;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.assertions._Assert;
+import org.apache.causeway.commons.internal.collections._Lists;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
+import org.apache.causeway.commons.internal.reflection._Reflect;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.interactions.InteractionHead;
import org.apache.causeway.core.metamodel.object.ManagedObject;
@@ -52,6 +47,11 @@ 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.ObjectActionParameter;
+import static org.apache.causeway.commons.internal.base._Casts.uncheckedCast;
+import static org.apache.causeway.commons.internal.reflection._Reflect.Filter.paramAssignableFrom;
+import static org.apache.causeway.commons.internal.reflection._Reflect.Filter.paramAssignableFromValue;
+import static org.apache.causeway.commons.internal.reflection._Reflect.Filter.paramCount;
+
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/Evaluators.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/Evaluators.java
index 762b841e04..ab35ca107c 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/Evaluators.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/Evaluators.java
@@ -28,6 +28,7 @@ import java.util.Optional;
import java.util.function.Predicate;
import java.util.stream.Stream;
+import org.apache.causeway.applib.exceptions.unrecoverable.MetaModelException;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.functional.Try;
import org.apache.causeway.commons.internal.base._NullSafe;
@@ -35,8 +36,6 @@ import org.apache.causeway.commons.internal.reflection._ClassCache;
import org.apache.causeway.commons.internal.reflection._Reflect;
import org.apache.causeway.commons.internal.reflection._Reflect.InterfacePolicy;
import org.apache.causeway.commons.internal.reflection._Reflect.TypeHierarchyPolicy;
-
-import org.apache.causeway.applib.exceptions.unrecoverable.MetaModelException;
import org.apache.causeway.core.metamodel.commons.MethodUtil;
import org.apache.causeway.core.metamodel.commons.ThrowableExtensions;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/FacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/FacetFactory.java
index eb6199cb71..de52db0870 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/FacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/FacetFactory.java
@@ -25,12 +25,12 @@ import java.util.Optional;
import java.util.function.Consumer;
import java.util.function.Predicate;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.collections.ImmutableEnumSet;
-import org.apache.causeway.commons.internal.reflection._Annotations;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.annotation.Introspection.IntrospectionPolicy;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.collections.ImmutableEnumSet;
+import org.apache.causeway.commons.internal.reflection._Annotations;
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/FacetFactoryAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/FacetFactoryAbstract.java
index 346c9f07b4..a93f742622 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/FacetFactoryAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/FacetFactoryAbstract.java
@@ -20,10 +20,10 @@ package org.apache.causeway.core.metamodel.facets;
import java.util.Optional;
-import org.apache.causeway.commons.collections.ImmutableEnumSet;
-import org.apache.causeway.commons.internal.reflection._ClassCache;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.collections.ImmutableEnumSet;
+import org.apache.causeway.commons.internal.reflection._ClassCache;
import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.Facet;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/FacetedMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/FacetedMethod.java
index 841c71225a..ebb9cf0b50 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/FacetedMethod.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/FacetedMethod.java
@@ -21,10 +21,9 @@ package org.apache.causeway.core.metamodel.facets;
import java.lang.reflect.Method;
import java.util.List;
+import org.apache.causeway.applib.id.LogicalType;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.collections._Lists;
-
-import org.apache.causeway.applib.id.LogicalType;
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants;
import org.apache.causeway.core.metamodel.commons.StringExtensions;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/ImperativeAspect.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/ImperativeAspect.java
index 818b61542d..7208504244 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/ImperativeAspect.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/ImperativeAspect.java
@@ -24,11 +24,10 @@ import java.util.stream.Collectors;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._Casts;
-
import org.apache.causeway.core.metamodel.facets.ImperativeFacet.Intent;
-import org.apache.causeway.core.metamodel.object.MmInvokeUtil;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.ManagedObjects;
+import org.apache.causeway.core.metamodel.object.MmInvokeUtil;
import lombok.Value;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/ImperativeFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/ImperativeFacet.java
index ec50d1b242..f4de0cd27a 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/ImperativeFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/ImperativeFacet.java
@@ -22,11 +22,10 @@ import java.lang.reflect.Method;
import java.util.function.BiConsumer;
import java.util.stream.Collectors;
+import org.apache.causeway.applib.services.wrapper.WrapperFactory;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.commons.internal.reflection._Reflect;
-
-import org.apache.causeway.applib.services.wrapper.WrapperFactory;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.spec.feature.ObjectMember;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/ObjectTypeFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/ObjectTypeFacetFactory.java
index 73755e9614..e7fea58fa9 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/ObjectTypeFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/ObjectTypeFacetFactory.java
@@ -18,9 +18,8 @@
*/
package org.apache.causeway.core.metamodel.facets;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
-
import org.apache.causeway.applib.annotation.Introspection.IntrospectionPolicy;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
/**
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/ParameterSupport.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/ParameterSupport.java
index f9b48166b1..fd7d7d7b02 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/ParameterSupport.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/ParameterSupport.java
@@ -29,7 +29,6 @@ import java.util.function.IntFunction;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal._Constants;
import org.apache.causeway.commons.internal.collections._Arrays;
-
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants.ReturnTypePattern;
import org.apache.causeway.core.metamodel.methods.MethodFinder;
import org.apache.causeway.core.metamodel.methods.MethodFinderPAT;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactoryAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactoryAbstract.java
index a5caa2090b..bd7bd8c64b 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactoryAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactoryAbstract.java
@@ -20,7 +20,6 @@ package org.apache.causeway.core.metamodel.facets;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.collections.ImmutableEnumSet;
-
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionChoicesForCollectionParameterFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionChoicesForCollectionParameterFacetFactory.java
index f231c1a5cb..75039a7be6 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionChoicesForCollectionParameterFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionChoicesForCollectionParameterFacetFactory.java
@@ -21,10 +21,10 @@ package org.apache.causeway.core.metamodel.facets.actions.action;
import javax.inject.Inject;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
-
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
import org.apache.causeway.core.metamodel.facetapi.MetaModelRefiner;
+import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.causeway.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.causeway.core.metamodel.facets.object.autocomplete.AutoCompleteFacet;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionOverloadingValidator.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionOverloadingValidator.java
index c4f6145e46..5010c21b82 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionOverloadingValidator.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionOverloadingValidator.java
@@ -20,10 +20,9 @@ package org.apache.causeway.core.metamodel.facets.actions.action;
import javax.inject.Inject;
+import org.apache.causeway.applib.services.metamodel.BeanSort;
import org.apache.causeway.commons.internal.base._Blackhole;
import org.apache.causeway.commons.internal.collections._Sets;
-
-import org.apache.causeway.applib.services.metamodel.BeanSort;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.spec.ActionScope;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/choicesfrom/ChoicesFromFacetForActionAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/choicesfrom/ChoicesFromFacetForActionAnnotation.java
index b64f7fe068..97284b1ed8 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/choicesfrom/ChoicesFromFacetForActionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/choicesfrom/ChoicesFromFacetForActionAnnotation.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.actions.action.choicesfrom;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.annotation.Action;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
public class ChoicesFromFacetForActionAnnotation
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/invocation/ActionDomainEventFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/invocation/ActionDomainEventFacetAbstract.java
index a3f728446d..460e44d472 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/invocation/ActionDomainEventFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/invocation/ActionDomainEventFacetAbstract.java
@@ -18,14 +18,13 @@
*/
package org.apache.causeway.core.metamodel.facets.actions.action.invocation;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.assertions._Assert;
-
import org.apache.causeway.applib.events.domain.AbstractDomainEvent;
import org.apache.causeway.applib.events.domain.ActionDomainEvent;
import org.apache.causeway.applib.services.i18n.TranslatableString;
import org.apache.causeway.applib.services.i18n.TranslationContext;
import org.apache.causeway.applib.services.i18n.TranslationService;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.DomainEventHelper;
import org.apache.causeway.core.metamodel.facets.SingleClassValueFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/invocation/ActionInvocationFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/invocation/ActionInvocationFacet.java
index f2c4fcf420..19d6e0fccf 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/invocation/ActionInvocationFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/invocation/ActionInvocationFacet.java
@@ -19,7 +19,6 @@
package org.apache.causeway.core.metamodel.facets.actions.action.invocation;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.interactions.InteractionHead;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
index 35bee8725f..9f351ea9ca 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
@@ -24,16 +24,15 @@ import java.util.List;
import java.util.Objects;
import java.util.function.BiConsumer;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.functional.Try;
-import org.apache.causeway.commons.internal.assertions._Assert;
-import org.apache.causeway.commons.internal.collections._Arrays;
-
import org.apache.causeway.applib.events.domain.AbstractDomainEvent;
import org.apache.causeway.applib.events.domain.ActionDomainEvent;
import org.apache.causeway.applib.services.iactn.ActionInvocation;
import org.apache.causeway.applib.services.queryresultscache.QueryResultsCache;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.functional.Try;
+import org.apache.causeway.commons.internal.assertions._Assert;
+import org.apache.causeway.commons.internal.collections._Arrays;
import org.apache.causeway.core.metamodel.commons.CanonicalInvoker;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.execution.InteractionInternal;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/invocation/IdentifierUtil.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/invocation/IdentifierUtil.java
index df383efcc0..2d13c2b961 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/invocation/IdentifierUtil.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/invocation/IdentifierUtil.java
@@ -18,13 +18,13 @@
*/
package org.apache.causeway.core.metamodel.facets.actions.action.invocation;
-import org.apache.causeway.commons.internal.base._Refs;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.id.LogicalType;
import org.apache.causeway.applib.services.command.Command;
+import org.apache.causeway.commons.internal.base._Refs;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.metamodel.commons.StringExtensions;
import org.apache.causeway.core.metamodel.interactions.InteractionHead;
import org.apache.causeway.core.metamodel.interactions.managed.ActionInteractionHead;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/contributing/derived/ContributingFacetFromMixinFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/contributing/derived/ContributingFacetFromMixinFacetFactory.java
index 45add474d4..5f052b6680 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/contributing/derived/ContributingFacetFromMixinFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/contributing/derived/ContributingFacetFromMixinFacetFactory.java
@@ -25,6 +25,7 @@ import org.apache.causeway.applib.annotation.ActionLayout;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FacetUtil;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
+import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.causeway.core.metamodel.facets.actions.contributing.ContributingFacet.Contributing;
import org.apache.causeway.core.metamodel.facets.actions.contributing.ContributingFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/fileaccept/FileAcceptFacetForActionAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/fileaccept/FileAcceptFacetForActionAnnotation.java
index 8a3e219000..52eae55e7a 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/fileaccept/FileAcceptFacetForActionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/fileaccept/FileAcceptFacetForActionAnnotation.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.actions.fileaccept;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.annotation.Action;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.objectvalue.fileaccept.FileAcceptFacet;
import org.apache.causeway.core.metamodel.facets.objectvalue.fileaccept.FileAcceptFacetAbstract;
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 f88ba4a630..50c0942a23 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
@@ -25,12 +25,9 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.collections._Maps;
-
-import static org.apache.causeway.commons.internal.functions._Predicates.not;
-
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.annotation.HomePage;
+import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FacetUtil;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
@@ -46,6 +43,8 @@ import org.apache.causeway.core.metamodel.specloader.validator.MetaModelValidato
import org.apache.causeway.core.metamodel.specloader.validator.MetaModelVisitingValidatorAbstract;
import org.apache.causeway.core.metamodel.specloader.validator.ValidationFailure;
+import static org.apache.causeway.commons.internal.functions._Predicates.not;
+
import lombok.NonNull;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java
index 5e1799ae10..10fbc5de78 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java
@@ -23,8 +23,8 @@ import javax.inject.Inject;
import org.apache.causeway.applib.annotation.ActionLayout;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
+import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract;
-import org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabledec.DomainObjectLayoutTableDecorationFacet;
import org.apache.causeway.core.metamodel.facets.actions.position.ActionPositionFacetFallback;
import org.apache.causeway.core.metamodel.facets.actions.redirect.RedirectFacetFallback;
import org.apache.causeway.core.metamodel.facets.members.layout.group.LayoutGroupFacetFromActionLayoutAnnotation;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/CssClassFaFacetForActionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/CssClassFaFacetForActionLayoutAnnotation.java
index 667aa15e40..728c78c9cd 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/CssClassFaFacetForActionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/CssClassFaFacetForActionLayoutAnnotation.java
@@ -20,10 +20,9 @@ package org.apache.causeway.core.metamodel.facets.actions.layout;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.annotation.ActionLayout;
import org.apache.causeway.applib.layout.component.CssClassFaPosition;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaStaticFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/CssClassFaFacetForActionLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/CssClassFaFacetForActionLayoutXml.java
index fa41b85170..5487dc49e0 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/CssClassFaFacetForActionLayoutXml.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/CssClassFaFacetForActionLayoutXml.java
@@ -20,10 +20,9 @@ package org.apache.causeway.core.metamodel.facets.actions.layout;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.layout.component.ActionLayoutData;
import org.apache.causeway.applib.layout.component.CssClassFaPosition;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet;
import org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaStaticFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/CssClassFaFacetForMenuBarXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/CssClassFaFacetForMenuBarXml.java
index 5780e0b685..0ddbc7f5c6 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/CssClassFaFacetForMenuBarXml.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/CssClassFaFacetForMenuBarXml.java
@@ -20,11 +20,11 @@ package org.apache.causeway.core.metamodel.facets.actions.layout;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.layout.component.CssClassFaPosition;
import org.apache.causeway.applib.layout.component.ServiceActionLayoutData;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet;
import org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaStaticFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/CssClassFacetForActionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/CssClassFacetForActionLayoutAnnotation.java
index 37d7f1572e..23720622f1 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/CssClassFacetForActionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/CssClassFacetForActionLayoutAnnotation.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.actions.layout;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.annotation.ActionLayout;
+import org.apache.causeway.commons.internal.base._Strings;
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/actions/layout/CssClassFacetForActionLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/CssClassFacetForActionLayoutXml.java
index b6f95fbf8c..a77c83eeb0 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/CssClassFacetForActionLayoutXml.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/CssClassFacetForActionLayoutXml.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.actions.layout;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.layout.component.ActionLayoutData;
+import org.apache.causeway.commons.internal.base._Strings;
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/actions/layout/CssClassFacetForMenuBarXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/CssClassFacetForMenuBarXml.java
index 2ee544af3d..4e7bb2c920 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/CssClassFacetForMenuBarXml.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/CssClassFacetForMenuBarXml.java
@@ -20,10 +20,10 @@ package org.apache.causeway.core.metamodel.facets.actions.layout;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.layout.component.ServiceActionLayoutData;
+import org.apache.causeway.commons.internal.base._Strings;
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/actions/layout/MemberDescribedFacetForActionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/MemberDescribedFacetForActionLayoutAnnotation.java
index 2a42acb990..7f99397ae1 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/MemberDescribedFacetForActionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/MemberDescribedFacetForActionLayoutAnnotation.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.actions.layout;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.annotation.ActionLayout;
+import org.apache.causeway.commons.internal.base._Strings;
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/actions/layout/MemberDescribedFacetForActionLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/MemberDescribedFacetForActionLayoutXml.java
index 961824523e..b4f330a0de 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/MemberDescribedFacetForActionLayoutXml.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/MemberDescribedFacetForActionLayoutXml.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.actions.layout;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.layout.component.ActionLayoutData;
+import org.apache.causeway.commons.internal.base._Strings;
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/actions/layout/MemberDescribedFacetForMenuBarXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/MemberDescribedFacetForMenuBarXml.java
index cb1eab24ab..302a397ab2 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/MemberDescribedFacetForMenuBarXml.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/MemberDescribedFacetForMenuBarXml.java
@@ -20,10 +20,10 @@ package org.apache.causeway.core.metamodel.facets.actions.layout;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.layout.component.ServiceActionLayoutData;
+import org.apache.causeway.commons.internal.base._Strings;
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/actions/layout/MemberNamedFacetForActionLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/MemberNamedFacetForActionLayoutXml.java
index cd3e7f431e..6ace7c19cc 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/MemberNamedFacetForActionLayoutXml.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/MemberNamedFacetForActionLayoutXml.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.actions.layout;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.layout.component.ActionLayoutData;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.all.named.MemberNamedFacet;
import org.apache.causeway.core.metamodel.facets.all.named.MemberNamedFacetWithStaticTextAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/MemberNamedFacetForMenuBarXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/MemberNamedFacetForMenuBarXml.java
index 5a8e2920d6..0a8f112f0d 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/MemberNamedFacetForMenuBarXml.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/MemberNamedFacetForMenuBarXml.java
@@ -20,10 +20,10 @@ package org.apache.causeway.core.metamodel.facets.actions.layout;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.layout.component.ServiceActionLayoutData;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.all.named.MemberNamedFacet;
import org.apache.causeway.core.metamodel.facets.all.named.MemberNamedFacetWithStaticTextAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/NamedFacetForActionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/NamedFacetForActionLayoutAnnotation.java
index 1c590110f5..67be242f38 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/NamedFacetForActionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/NamedFacetForActionLayoutAnnotation.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.actions.layout;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.annotation.ActionLayout;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.all.named.MemberNamedFacet;
import org.apache.causeway.core.metamodel.facets.all.named.MemberNamedFacetWithStaticTextAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/PromptStyleFacetForActionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/PromptStyleFacetForActionLayoutAnnotation.java
index 36e8b46db1..5dbec407e8 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/PromptStyleFacetForActionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/PromptStyleFacetForActionLayoutAnnotation.java
@@ -21,10 +21,9 @@ package org.apache.causeway.core.metamodel.facets.actions.layout;
import java.util.Optional;
import java.util.function.BiConsumer;
-import org.apache.causeway.commons.internal.base._Optionals;
-
import org.apache.causeway.applib.annotation.ActionLayout;
import org.apache.causeway.applib.annotation.PromptStyle;
+import org.apache.causeway.commons.internal.base._Optionals;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.object.promptStyle.PromptStyleFacet;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/position/ActionPositionFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/position/ActionPositionFacetAbstract.java
index 2e9b43089a..1e7ae6fb1a 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/position/ActionPositionFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/position/ActionPositionFacetAbstract.java
@@ -21,6 +21,7 @@ package org.apache.causeway.core.metamodel.facets.actions.position;
import java.util.function.BiConsumer;
import org.apache.causeway.applib.annotation.ActionLayout;
+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/actions/validate/ActionValidationFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/validate/ActionValidationFacet.java
index eb181866a1..68f1b08071 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/validate/ActionValidationFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/validate/ActionValidationFacet.java
@@ -19,7 +19,6 @@
package org.apache.causeway.core.metamodel.facets.actions.validate;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facets.actions.action.invocation.ActionInvocationFacet;
import org.apache.causeway.core.metamodel.interactions.ValidatingInteractionAdvisor;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/validate/method/ActionParameterValidationFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/validate/method/ActionParameterValidationFacetViaMethod.java
index 5b3fb1af0d..6200ec6d67 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/validate/method/ActionParameterValidationFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/validate/method/ActionParameterValidationFacetViaMethod.java
@@ -21,16 +21,15 @@ package org.apache.causeway.core.metamodel.facets.actions.validate.method;
import java.lang.reflect.Method;
import java.util.function.BiConsumer;
-import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.applib.services.i18n.TranslatableString;
import org.apache.causeway.applib.services.i18n.TranslationContext;
import org.apache.causeway.applib.services.i18n.TranslationService;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.ImperativeFacet;
import org.apache.causeway.core.metamodel.facets.actions.validate.ActionParameterValidationFacetAbstract;
-import org.apache.causeway.core.metamodel.object.MmInvokeUtil;
import org.apache.causeway.core.metamodel.object.ManagedObject;
+import org.apache.causeway.core.metamodel.object.MmInvokeUtil;
import lombok.Getter;
import lombok.NonNull;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethod.java
index eb5d839e5e..813794482f 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethod.java
@@ -23,15 +23,15 @@ import java.lang.reflect.Method;
import java.util.Optional;
import java.util.function.BiConsumer;
-import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.applib.services.i18n.TranslatableString;
import org.apache.causeway.applib.services.i18n.TranslationContext;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.ImperativeFacet;
+import org.apache.causeway.core.metamodel.facets.ImperativeFacet.Intent;
import org.apache.causeway.core.metamodel.facets.actions.validate.ActionValidationFacetAbstract;
-import org.apache.causeway.core.metamodel.object.MmInvokeUtil;
import org.apache.causeway.core.metamodel.object.ManagedObject;
+import org.apache.causeway.core.metamodel.object.MmInvokeUtil;
import lombok.Getter;
import lombok.NonNull;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/described/MemberDescribedFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/described/MemberDescribedFacet.java
index 426c26a1aa..4798172846 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/described/MemberDescribedFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/described/MemberDescribedFacet.java
@@ -19,7 +19,6 @@
package org.apache.causeway.core.metamodel.facets.all.described;
import org.apache.causeway.commons.functional.Either;
-
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facets.all.i8n.imperative.HasImperativeText;
import org.apache.causeway.core.metamodel.facets.all.i8n.staatic.HasStaticText;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/described/MemberDescribedFacetWithImperativeTextAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/described/MemberDescribedFacetWithImperativeTextAbstract.java
index 028bb23d00..b555300d8f 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/described/MemberDescribedFacetWithImperativeTextAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/described/MemberDescribedFacetWithImperativeTextAbstract.java
@@ -21,7 +21,6 @@ package org.apache.causeway.core.metamodel.facets.all.described;
import java.lang.reflect.Method;
import org.apache.causeway.commons.functional.Either;
-
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.all.i8n.imperative.HasImperativeText;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/described/MemberDescribedFacetWithStaticTextAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/described/MemberDescribedFacetWithStaticTextAbstract.java
index 55e2cee35f..259f98b356 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/described/MemberDescribedFacetWithStaticTextAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/described/MemberDescribedFacetWithStaticTextAbstract.java
@@ -19,7 +19,7 @@
package org.apache.causeway.core.metamodel.facets.all.described;
import org.apache.causeway.commons.functional.Either;
-
+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.i8n.imperative.HasImperativeText;
import org.apache.causeway.core.metamodel.facets.all.i8n.staatic.HasStaticText;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/i8n/imperative/HasImperativeText.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/i8n/imperative/HasImperativeText.java
index 4e93d69efe..1090f97ffd 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/i8n/imperative/HasImperativeText.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/i8n/imperative/HasImperativeText.java
@@ -18,10 +18,10 @@
*/
package org.apache.causeway.core.metamodel.facets.all.i8n.imperative;
-import org.apache.causeway.commons.functional.Try;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.services.i18n.TranslatableString;
+import org.apache.causeway.commons.functional.Try;
import org.apache.causeway.core.metamodel.object.ManagedObject;
public interface HasImperativeText {
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/i8n/imperative/HasImperativeTextFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/i8n/imperative/HasImperativeTextFacetAbstract.java
index a96dd1e7ee..3761b62ae7 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/i8n/imperative/HasImperativeTextFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/i8n/imperative/HasImperativeTextFacetAbstract.java
@@ -22,10 +22,9 @@ import java.lang.reflect.Method;
import java.util.Objects;
import java.util.function.BiConsumer;
+import org.apache.causeway.applib.services.i18n.TranslationContext;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.functional.Try;
-
-import org.apache.causeway.applib.services.i18n.TranslationContext;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetAbstract;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/i8n/noun/HasNoun.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/i8n/noun/HasNoun.java
index a0393137ac..c375a1cf37 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/i8n/noun/HasNoun.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/i8n/noun/HasNoun.java
@@ -20,9 +20,9 @@ package org.apache.causeway.core.metamodel.facets.all.i8n.noun;
import java.util.Optional;
-import org.apache.causeway.commons.collections.ImmutableEnumSet;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.collections.ImmutableEnumSet;
import org.apache.causeway.core.metamodel.facets.all.i8n.HasMemoizableTranslation;
import lombok.NonNull;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/i8n/noun/HasNounFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/i8n/noun/HasNounFacetAbstract.java
index e1c547304b..e332d31d6b 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/i8n/noun/HasNounFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/i8n/noun/HasNounFacetAbstract.java
@@ -23,10 +23,9 @@ import java.util.Optional;
import java.util.function.BiConsumer;
import java.util.stream.Collectors;
+import org.apache.causeway.applib.services.i18n.TranslationContext;
import org.apache.causeway.commons.collections.ImmutableEnumSet;
import org.apache.causeway.commons.internal.base._Lazy;
-
-import org.apache.causeway.applib.services.i18n.TranslationContext;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetAbstract;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/i8n/noun/NounForms.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/i8n/noun/NounForms.java
index 552b134535..2016e85077 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/i8n/noun/NounForms.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/i8n/noun/NounForms.java
@@ -21,12 +21,12 @@ package org.apache.causeway.core.metamodel.facets.all.i8n.noun;
import java.util.EnumSet;
import java.util.Optional;
-import org.apache.causeway.commons.collections.ImmutableEnumSet;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.services.i18n.TranslationContext;
import org.apache.causeway.applib.services.i18n.TranslationService;
+import org.apache.causeway.commons.collections.ImmutableEnumSet;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import lombok.Builder;
import lombok.Getter;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/i8n/staatic/HasStaticTextFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/i8n/staatic/HasStaticTextFacetAbstract.java
index a9b1f5ea8c..90e3bcbf03 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/i8n/staatic/HasStaticTextFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/i8n/staatic/HasStaticTextFacetAbstract.java
@@ -21,9 +21,8 @@ package org.apache.causeway.core.metamodel.facets.all.i8n.staatic;
import java.util.Objects;
import java.util.function.BiConsumer;
-import org.apache.causeway.commons.internal.base._Lazy;
-
import org.apache.causeway.applib.services.i18n.TranslationContext;
+import org.apache.causeway.commons.internal.base._Lazy;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetAbstract;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/named/MemberNamedFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/named/MemberNamedFacet.java
index db227503fc..87e8449dc3 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/named/MemberNamedFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/named/MemberNamedFacet.java
@@ -19,7 +19,6 @@
package org.apache.causeway.core.metamodel.facets.all.named;
import org.apache.causeway.commons.functional.Either;
-
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facets.all.i8n.imperative.HasImperativeText;
import org.apache.causeway.core.metamodel.facets.all.i8n.staatic.HasStaticText;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/named/MemberNamedFacetWithImperativeTextAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/named/MemberNamedFacetWithImperativeTextAbstract.java
index f58f7baf24..e0e4364229 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/named/MemberNamedFacetWithImperativeTextAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/named/MemberNamedFacetWithImperativeTextAbstract.java
@@ -21,7 +21,6 @@ package org.apache.causeway.core.metamodel.facets.all.named;
import java.lang.reflect.Method;
import org.apache.causeway.commons.functional.Either;
-
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.all.i8n.imperative.HasImperativeText;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/named/MemberNamedFacetWithStaticTextAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/named/MemberNamedFacetWithStaticTextAbstract.java
index c3cd9d5d69..7d65770fc1 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/named/MemberNamedFacetWithStaticTextAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/named/MemberNamedFacetWithStaticTextAbstract.java
@@ -19,7 +19,6 @@
package org.apache.causeway.core.metamodel.facets.all.named;
import org.apache.causeway.commons.functional.Either;
-
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.all.i8n.imperative.HasImperativeText;
import org.apache.causeway.core.metamodel.facets.all.i8n.staatic.HasStaticText;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/named/ObjectNamedFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/named/ObjectNamedFacetAbstract.java
index 8b96074769..5cc62851f5 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/named/ObjectNamedFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/named/ObjectNamedFacetAbstract.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;
import org.apache.causeway.core.metamodel.facets.all.i8n.noun.HasNounFacetAbstract;
import org.apache.causeway.core.metamodel.facets.all.i8n.noun.NounForms;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/named/ObjectNamedFacetSynthesized.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/named/ObjectNamedFacetSynthesized.java
index a5a75e65b0..d7c4538bff 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/named/ObjectNamedFacetSynthesized.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/named/ObjectNamedFacetSynthesized.java
@@ -19,7 +19,7 @@
package org.apache.causeway.core.metamodel.facets.all.named;
import org.apache.causeway.commons.internal.assertions._Assert;
-
+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.i8n.noun.NounForms;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/CollectionFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/CollectionFacet.java
index 37c38998ed..e756cd0a83 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/CollectionFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/CollectionFacet.java
@@ -38,17 +38,17 @@ import java.util.stream.Collector;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.internal.base._With;
import org.apache.causeway.commons.internal.collections._Arrays;
import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.commons.internal.collections._Sets;
-import org.springframework.lang.Nullable;
-
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.causeway.core.metamodel.object.ManagedObject;
-import org.apache.causeway.core.metamodel.object.PackedManagedObject;
import org.apache.causeway.core.metamodel.object.MmUnwrapUtil;
+import org.apache.causeway.core.metamodel.object.PackedManagedObject;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import lombok.NonNull;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessor.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessor.java
index fec8ae2090..e0c8bdbd4d 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessor.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessor.java
@@ -22,14 +22,14 @@ import java.lang.reflect.Method;
import java.util.function.BiConsumer;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.ImperativeFacet;
+import org.apache.causeway.core.metamodel.facets.ImperativeFacet.Intent;
import org.apache.causeway.core.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacetAbstract;
+import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.MmInvokeUtil;
import org.apache.causeway.core.metamodel.object.MmVisibilityUtil;
-import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import lombok.Getter;
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 8c078e0af7..7ecd3351f5 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
@@ -24,7 +24,6 @@ import java.util.List;
import javax.inject.Inject;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants;
import org.apache.causeway.core.metamodel.commons.MethodUtil;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetAbstract.java
index 9735997acb..573034371f 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetAbstract.java
@@ -18,10 +18,9 @@
*/
package org.apache.causeway.core.metamodel.facets.collections.collection.modify;
-import org.apache.causeway.commons.internal.base._Casts;
-
import org.apache.causeway.applib.events.domain.AbstractDomainEvent;
import org.apache.causeway.applib.events.domain.CollectionDomainEvent;
+import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.DomainEventHelper;
import org.apache.causeway.core.metamodel.facets.SingleClassValueFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/javautilcollection/JavaArrayFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/javautilcollection/JavaArrayFacet.java
index b0f8370d52..5ca0afc606 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/javautilcollection/JavaArrayFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/javautilcollection/JavaArrayFacet.java
@@ -21,16 +21,16 @@ package org.apache.causeway.core.metamodel.facets.collections.javautilcollection
import java.util.function.Supplier;
import java.util.stream.Stream;
-import org.apache.causeway.commons.internal.base._NullSafe;
import org.springframework.lang.Nullable;
-import static org.apache.causeway.commons.internal.collections._Arrays.toArray;
-
+import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.collections.CollectionFacetAbstract;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
+import static org.apache.causeway.commons.internal.collections._Arrays.toArray;
+
import lombok.val;
public class JavaArrayFacet extends CollectionFacetAbstract {
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/javautilcollection/JavaCollectionFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/javautilcollection/JavaCollectionFacet.java
index 69926f7d4d..07ef31417c 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/javautilcollection/JavaCollectionFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/javautilcollection/JavaCollectionFacet.java
@@ -22,10 +22,10 @@ import java.util.Collection;
import java.util.function.Supplier;
import java.util.stream.Stream;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.base._NullSafe;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.collections.CollectionFacetAbstract;
import org.apache.causeway.core.metamodel.object.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/CollectionLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/CollectionLayoutFacetFactory.java
index db05f031f1..126e4eb69e 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/CollectionLayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/CollectionLayoutFacetFactory.java
@@ -23,6 +23,7 @@ import javax.inject.Inject;
import org.apache.causeway.applib.annotation.CollectionLayout;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
+import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet;
import org.apache.causeway.core.metamodel.facets.members.layout.order.LayoutOrderFacetFromCollectionLayoutAnnotation;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/CssClassFacetForCollectionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/CssClassFacetForCollectionLayoutAnnotation.java
index 2b85980ae4..e8a91f870d 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/CssClassFacetForCollectionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/CssClassFacetForCollectionLayoutAnnotation.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.collections.layout;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.annotation.CollectionLayout;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
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/CssClassFacetForCollectionLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/CssClassFacetForCollectionLayoutXml.java
index ab20950a1f..786e7e5ed0 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
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.collections.layout;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.layout.component.CollectionLayoutData;
+import org.apache.causeway.commons.internal.base._Strings;
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/DefaultViewFacetAsConfigured.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/DefaultViewFacetAsConfigured.java
index 792eecd42d..4042dc972f 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/DefaultViewFacetAsConfigured.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/DefaultViewFacetAsConfigured.java
@@ -19,7 +19,6 @@
package org.apache.causeway.core.metamodel.facets.collections.layout;
import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.collections.collection.defaultview.DefaultViewFacet;
import org.apache.causeway.core.metamodel.facets.collections.collection.defaultview.DefaultViewFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutAnnotation.java
index afe9815a7d..e8f9e8229b 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutAnnotation.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.collections.layout;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.annotation.CollectionLayout;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.collections.collection.defaultview.DefaultViewFacet;
import org.apache.causeway.core.metamodel.facets.collections.collection.defaultview.DefaultViewFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutXml.java
index bb1c836f61..9bfac989f3 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutXml.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutXml.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.collections.layout;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.layout.component.CollectionLayoutData;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.collections.collection.defaultview.DefaultViewFacet;
import org.apache.causeway.core.metamodel.facets.collections.collection.defaultview.DefaultViewFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/MemberDescribedFacetForCollectionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/MemberDescribedFacetForCollectionLayoutAnnotation.java
index 8d5e3f1dce..fa94bd2991 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/MemberDescribedFacetForCollectionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/MemberDescribedFacetForCollectionLayoutAnnotation.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.collections.layout;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.annotation.CollectionLayout;
+import org.apache.causeway.commons.internal.base._Strings;
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/collections/layout/MemberDescribedFacetForCollectionLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/MemberDescribedFacetForCollectionLayoutXml.java
index d916ed1fd6..11938e8236 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/MemberDescribedFacetForCollectionLayoutXml.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/MemberDescribedFacetForCollectionLayoutXml.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.collections.layout;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.layout.component.CollectionLayoutData;
+import org.apache.causeway.commons.internal.base._Strings;
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/collections/layout/MemberNamedFacetForCollectionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/MemberNamedFacetForCollectionLayoutAnnotation.java
index c59ed14850..1765e194e2 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/MemberNamedFacetForCollectionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/MemberNamedFacetForCollectionLayoutAnnotation.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.collections.layout;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.annotation.CollectionLayout;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.all.named.MemberNamedFacet;
import org.apache.causeway.core.metamodel.facets.all.named.MemberNamedFacetWithStaticTextAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/MemberNamedFacetForCollectionLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/MemberNamedFacetForCollectionLayoutXml.java
index 6457a572bb..9cf5a8a54d 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/MemberNamedFacetForCollectionLayoutXml.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/MemberNamedFacetForCollectionLayoutXml.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.collections.layout;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.layout.component.CollectionLayoutData;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.all.named.MemberNamedFacet;
import org.apache.causeway.core.metamodel.facets.all.named.MemberNamedFacetWithStaticTextAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/PagedFacetOverriddenByDataTablesDecoration.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/PagedFacetOverriddenByDataTablesDecoration.java
index c4d535c192..643987b974 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/PagedFacetOverriddenByDataTablesDecoration.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/PagedFacetOverriddenByDataTablesDecoration.java
@@ -18,11 +18,7 @@
*/
package org.apache.causeway.core.metamodel.facets.collections.layout;
-import java.util.Optional;
-
-import org.apache.causeway.applib.annotation.CollectionLayout;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
-import org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet;
import org.apache.causeway.core.metamodel.facets.object.paged.PagedFacetAbstract;
public class PagedFacetOverriddenByDataTablesDecoration extends PagedFacetAbstract {
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/SortedByFacetForCollectionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/SortedByFacetForCollectionLayoutAnnotation.java
index 5cb5d1bf9e..12420822f0 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/SortedByFacetForCollectionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/SortedByFacetForCollectionLayoutAnnotation.java
@@ -21,12 +21,12 @@ package org.apache.causeway.core.metamodel.facets.collections.layout;
import java.util.Comparator;
import java.util.Optional;
-import static org.apache.causeway.commons.internal.base._Casts.uncheckedCast;
-
import org.apache.causeway.applib.annotation.CollectionLayout;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.collections.sortedby.SortedByFacetAbstract;
+import static org.apache.causeway.commons.internal.base._Casts.uncheckedCast;
+
public class SortedByFacetForCollectionLayoutAnnotation
extends SortedByFacetAbstract {
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/SortedByFacetForCollectionLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/SortedByFacetForCollectionLayoutXml.java
index 046d586ede..97941168ab 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/SortedByFacetForCollectionLayoutXml.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/SortedByFacetForCollectionLayoutXml.java
@@ -21,14 +21,14 @@ package org.apache.causeway.core.metamodel.facets.collections.layout;
import java.util.Comparator;
import java.util.Optional;
-import static org.apache.causeway.commons.internal.base._Casts.uncheckedCast;
-
import org.apache.causeway.applib.layout.component.CollectionLayoutData;
import org.apache.causeway.core.metamodel.commons.ClassUtil;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.collections.sortedby.SortedByFacet;
import org.apache.causeway.core.metamodel.facets.collections.sortedby.SortedByFacetAbstract;
+import static org.apache.causeway.commons.internal.base._Casts.uncheckedCast;
+
public class SortedByFacetForCollectionLayoutXml
extends SortedByFacetAbstract {
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/CollectionLayoutTableDecorationFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/CollectionLayoutTableDecorationFacet.java
index 146b82abdc..a82cd41e20 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/CollectionLayoutTableDecorationFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/CollectionLayoutTableDecorationFacet.java
@@ -21,10 +21,9 @@ package org.apache.causeway.core.metamodel.facets.collections.layout.tabledec;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Optionals;
-
import org.apache.causeway.applib.annotation.CollectionLayout;
import org.apache.causeway.applib.annotation.Parameter;
+import org.apache.causeway.commons.internal.base._Optionals;
import org.apache.causeway.core.config.metamodel.facets.CollectionLayoutConfigOptions;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.SingleValueFacet;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/CollectionLayoutTableDecorationFacetForCollectionLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/CollectionLayoutTableDecorationFacetForCollectionLayoutXml.java
index 3587013b23..9eec7ad76e 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/CollectionLayoutTableDecorationFacetForCollectionLayoutXml.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/CollectionLayoutTableDecorationFacetForCollectionLayoutXml.java
@@ -24,7 +24,6 @@ import org.apache.causeway.applib.layout.component.CollectionLayoutData;
import org.apache.causeway.applib.layout.component.TableDecoration;
import org.apache.causeway.core.config.metamodel.facets.CollectionLayoutConfigOptions;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
-import org.apache.causeway.core.metamodel.facets.collections.collection.defaultview.DefaultViewFacet;
public class CollectionLayoutTableDecorationFacetForCollectionLayoutXml
extends CollectionLayoutTableDecorationFacetAbstract {
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/sortedby/annotation/SortedByFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/sortedby/annotation/SortedByFacetAnnotationFactory.java
index 980b89db48..846d656aaf 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/sortedby/annotation/SortedByFacetAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/sortedby/annotation/SortedByFacetAnnotationFactory.java
@@ -26,6 +26,7 @@ import javax.inject.Inject;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
import org.apache.causeway.core.metamodel.facetapi.MetaModelRefiner;
+import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.causeway.core.metamodel.facets.collections.sortedby.SortedByFacet;
import org.apache.causeway.core.metamodel.progmodel.ProgrammingModel;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/fallback/FallbackFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/fallback/FallbackFacetFactory.java
index 02bd8e8497..a168c21749 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/fallback/FallbackFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/fallback/FallbackFacetFactory.java
@@ -26,6 +26,9 @@ import javax.inject.Inject;
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.FacetFactory.ProcessMethodContext;
+import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessParameterContext;
import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.causeway.core.metamodel.facets.FacetedMethod;
import org.apache.causeway.core.metamodel.facets.TypedHolder;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/fallback/TitleFacetNone.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/fallback/TitleFacetNone.java
index 31ca6e1126..6c3fbfa09d 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/fallback/TitleFacetNone.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/fallback/TitleFacetNone.java
@@ -18,6 +18,7 @@
*/
package org.apache.causeway.core.metamodel.facets.fallback;
+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.title.TitleFacetAbstract;
import org.apache.causeway.core.metamodel.facets.object.title.TitleRenderRequest;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/jaxb/JaxbFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/jaxb/JaxbFacetFactory.java
index 7cda042f31..2486bbd2cd 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/jaxb/JaxbFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/jaxb/JaxbFacetFactory.java
@@ -36,10 +36,6 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.commons.internal.reflection._Reflect;
-
-import static org.apache.causeway.commons.internal.reflection._Reflect.Filter.isPublic;
-import static org.apache.causeway.commons.internal.reflection._Reflect.Filter.paramCount;
-
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
@@ -54,6 +50,9 @@ import org.apache.causeway.core.metamodel.spec.feature.MixedIn;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.causeway.core.metamodel.specloader.validator.ValidationFailure;
+import static org.apache.causeway.commons.internal.reflection._Reflect.Filter.isPublic;
+import static org.apache.causeway.commons.internal.reflection._Reflect.Filter.paramCount;
+
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/cssclassfa/CssClassFaFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/cssclassfa/CssClassFaFacet.java
index 7d80d11fc7..0bc89386f4 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/cssclassfa/CssClassFaFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/cssclassfa/CssClassFaFacet.java
@@ -19,7 +19,6 @@
package org.apache.causeway.core.metamodel.facets.members.cssclassfa;
import org.apache.causeway.commons.functional.Either;
-
import org.apache.causeway.core.metamodel.facetapi.Facet;
/**
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/cssclassfa/CssClassFaFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/cssclassfa/CssClassFaFactory.java
index 32db005864..df6322c196 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/cssclassfa/CssClassFaFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/cssclassfa/CssClassFaFactory.java
@@ -21,11 +21,10 @@ package org.apache.causeway.core.metamodel.facets.members.cssclassfa;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import org.apache.causeway.applib.layout.component.CssClassFaPosition;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.applib.layout.component.CssClassFaPosition;
-
/**
* @since 2.0
*/
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/cssclassfa/CssClassFaImperativeFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/cssclassfa/CssClassFaImperativeFacetAbstract.java
index e77f4d0c65..71dd745008 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/cssclassfa/CssClassFaImperativeFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/cssclassfa/CssClassFaImperativeFacetAbstract.java
@@ -19,7 +19,6 @@ package org.apache.causeway.core.metamodel.facets.members.cssclassfa;
import java.util.function.BiConsumer;
import org.apache.causeway.commons.functional.Either;
-
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetAbstract;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/cssclassfa/CssClassFaStaticFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/cssclassfa/CssClassFaStaticFacetAbstract.java
index e5a574b437..9590d21707 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/cssclassfa/CssClassFaStaticFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/cssclassfa/CssClassFaStaticFacetAbstract.java
@@ -22,14 +22,13 @@ import java.util.function.BiConsumer;
import java.util.regex.Pattern;
import java.util.stream.Stream;
+import org.apache.causeway.applib.layout.component.CssClassFaPosition;
import org.apache.causeway.commons.functional.Either;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.commons.internal.collections._Sets;
import org.apache.causeway.commons.internal.functions._Predicates;
-
-import org.apache.causeway.applib.layout.component.CssClassFaPosition;
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/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFromConfiguredRegex.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFromConfiguredRegex.java
index 255e393708..ddfce2fab9 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFromConfiguredRegex.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFromConfiguredRegex.java
@@ -24,10 +24,9 @@ import java.util.function.Supplier;
import java.util.regex.Pattern;
import java.util.stream.Stream;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.annotation.ActionLayout;
import org.apache.causeway.applib.layout.component.CssClassFaPosition;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.all.named.MemberNamedFacet;
import org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/described/annotprop/MemberDescribedFacetFromType.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/described/annotprop/MemberDescribedFacetFromType.java
index c63a3e1a72..e6a6d002ef 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/described/annotprop/MemberDescribedFacetFromType.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/described/annotprop/MemberDescribedFacetFromType.java
@@ -21,7 +21,6 @@ package org.apache.causeway.core.metamodel.facets.members.described.annotprop;
import java.util.Optional;
import org.apache.causeway.commons.internal.base._Strings;
-
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/members/disabled/DisabledFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/disabled/DisabledFacetAbstract.java
index c4f2f3fe38..1b8e15d58b 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/disabled/DisabledFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/disabled/DisabledFacetAbstract.java
@@ -20,10 +20,10 @@ package org.apache.causeway.core.metamodel.facets.members.disabled;
import java.util.function.BiConsumer;
-import org.apache.causeway.commons.internal.base._Strings;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.annotation.Where;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.WhereValueFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethod.java
index 3409a61c70..fe0f972aaf 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethod.java
@@ -21,15 +21,15 @@ package org.apache.causeway.core.metamodel.facets.members.disabled.method;
import java.lang.reflect.Method;
import java.util.function.BiConsumer;
-import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.applib.services.i18n.TranslatableString;
import org.apache.causeway.applib.services.i18n.TranslationContext;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.ImperativeFacet;
+import org.apache.causeway.core.metamodel.facets.ImperativeFacet.Intent;
import org.apache.causeway.core.metamodel.interactions.UsabilityContext;
-import org.apache.causeway.core.metamodel.object.MmInvokeUtil;
import org.apache.causeway.core.metamodel.object.ManagedObject;
+import org.apache.causeway.core.metamodel.object.MmInvokeUtil;
import lombok.Getter;
import lombok.NonNull;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java
index d06f8c78b4..f548967c98 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java
@@ -23,6 +23,7 @@ import javax.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/hidden/HiddenFacetFromLayoutPropertiesAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/hidden/HiddenFacetFromLayoutPropertiesAbstract.java
index e11b45a727..96a622b0b7 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/hidden/HiddenFacetFromLayoutPropertiesAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/hidden/HiddenFacetFromLayoutPropertiesAbstract.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.members.hidden;
import java.util.Properties;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.annotation.Where;
+import org.apache.causeway.commons.internal.base._Strings;
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/members/hidden/method/HideForContextFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/hidden/method/HideForContextFacetViaMethod.java
index 8dfcee5d00..6f961dd0e9 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/hidden/method/HideForContextFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/hidden/method/HideForContextFacetViaMethod.java
@@ -22,12 +22,11 @@ import java.lang.reflect.Method;
import java.util.function.BiConsumer;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.ImperativeFacet;
import org.apache.causeway.core.metamodel.interactions.VisibilityContext;
-import org.apache.causeway.core.metamodel.object.MmInvokeUtil;
import org.apache.causeway.core.metamodel.object.ManagedObject;
+import org.apache.causeway.core.metamodel.object.MmInvokeUtil;
import lombok.Getter;
import lombok.NonNull;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/layout/group/GroupIdAndName.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/layout/group/GroupIdAndName.java
index 72e5a4167a..537808edcd 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/layout/group/GroupIdAndName.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/layout/group/GroupIdAndName.java
@@ -21,7 +21,6 @@ package org.apache.causeway.core.metamodel.facets.members.layout.group;
import java.io.Serializable;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.annotation.Action;
@@ -30,6 +29,7 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.layout.component.CollectionLayoutData;
import org.apache.causeway.applib.layout.component.FieldSet;
import org.apache.causeway.applib.layout.component.PropertyLayoutData;
+import org.apache.causeway.commons.internal.base._Strings;
import lombok.NonNull;
import lombok.Value;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/layout/group/LayoutGroupFacetForActionAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/layout/group/LayoutGroupFacetForActionAnnotation.java
index 1622918ca8..1e90e0faff 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/layout/group/LayoutGroupFacetForActionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/layout/group/LayoutGroupFacetForActionAnnotation.java
@@ -21,6 +21,7 @@ package org.apache.causeway.core.metamodel.facets.members.layout.group;
import java.util.Optional;
import org.apache.causeway.applib.annotation.Action;
+import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
public class LayoutGroupFacetForActionAnnotation
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/named/method/NamedFacetForMemberViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/named/method/NamedFacetForMemberViaMethodFactory.java
index d90bed39b3..18b767f03e 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/named/method/NamedFacetForMemberViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/named/method/NamedFacetForMemberViaMethodFactory.java
@@ -23,6 +23,7 @@ import javax.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/publish/command/CommandPublishingFacetForActionAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/command/CommandPublishingFacetForActionAnnotation.java
index 709f97489e..afbb98bad9 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/command/CommandPublishingFacetForActionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/command/CommandPublishingFacetForActionAnnotation.java
@@ -20,12 +20,11 @@ package org.apache.causeway.core.metamodel.facets.members.publish.command;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Optionals;
-
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.Publishing;
import org.apache.causeway.applib.services.commanddto.processor.CommandDtoProcessor;
import org.apache.causeway.applib.services.inject.ServiceInjector;
+import org.apache.causeway.commons.internal.base._Optionals;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.metamodel.facets.ActionConfigOptions;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/command/CommandPublishingFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/command/CommandPublishingFacetForPropertyAnnotation.java
index 205e6db69e..ca62b789a4 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/command/CommandPublishingFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/command/CommandPublishingFacetForPropertyAnnotation.java
@@ -20,12 +20,11 @@ package org.apache.causeway.core.metamodel.facets.members.publish.command;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Optionals;
-
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.Publishing;
import org.apache.causeway.applib.services.commanddto.processor.CommandDtoProcessor;
import org.apache.causeway.applib.services.inject.ServiceInjector;
+import org.apache.causeway.commons.internal.base._Optionals;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.metamodel.facets.PropertyConfigOptions;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/execution/ExecutionPublishingActionFacetForActionAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/execution/ExecutionPublishingActionFacetForActionAnnotation.java
index aa12190222..7f55be2d45 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/execution/ExecutionPublishingActionFacetForActionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/execution/ExecutionPublishingActionFacetForActionAnnotation.java
@@ -20,10 +20,9 @@ package org.apache.causeway.core.metamodel.facets.members.publish.execution;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Optionals;
-
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.Publishing;
+import org.apache.causeway.commons.internal.base._Optionals;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.metamodel.facets.ActionConfigOptions;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/execution/ExecutionPublishingPropertyFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/execution/ExecutionPublishingPropertyFacetForPropertyAnnotation.java
index 4a46a26b39..91ea71be6b 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/execution/ExecutionPublishingPropertyFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/execution/ExecutionPublishingPropertyFacetForPropertyAnnotation.java
@@ -20,10 +20,9 @@ package org.apache.causeway.core.metamodel.facets.members.publish.execution;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Optionals;
-
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.Publishing;
+import org.apache.causeway.commons.internal.base._Optionals;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.metamodel.facets.PropertyConfigOptions;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/support/MemberAndPropertySupportFacetFactoryAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/support/MemberAndPropertySupportFacetFactoryAbstract.java
index f886107593..38ec08af09 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/support/MemberAndPropertySupportFacetFactoryAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/support/MemberAndPropertySupportFacetFactoryAbstract.java
@@ -19,7 +19,6 @@
package org.apache.causeway.core.metamodel.facets.members.support;
import org.apache.causeway.commons.collections.ImmutableEnumSet;
-
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;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/support/MemberSupportFacetFactoryAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/support/MemberSupportFacetFactoryAbstract.java
index d52aded95a..007b8a35f0 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/support/MemberSupportFacetFactoryAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/support/MemberSupportFacetFactoryAbstract.java
@@ -19,7 +19,6 @@
package org.apache.causeway.core.metamodel.facets.members.support;
import org.apache.causeway.commons.collections.ImmutableEnumSet;
-
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;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/autocomplete/AutoCompleteFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/autocomplete/AutoCompleteFacet.java
index 9f43274bb4..2af34f3abf 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/autocomplete/AutoCompleteFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/autocomplete/AutoCompleteFacet.java
@@ -19,7 +19,6 @@
package org.apache.causeway.core.metamodel.facets.object.autocomplete;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.object.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/autocomplete/AutoCompleteFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/autocomplete/AutoCompleteFacetAbstract.java
index 7068e19a91..558570c2d3 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/autocomplete/AutoCompleteFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/autocomplete/AutoCompleteFacetAbstract.java
@@ -24,7 +24,6 @@ import java.util.function.BiConsumer;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.reflection._Reflect;
-
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/CallbackFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/CallbackFacetAbstract.java
index 138c559c01..a7b640f020 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/CallbackFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/CallbackFacetAbstract.java
@@ -22,12 +22,11 @@ import java.lang.reflect.Method;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.reflection._Reflect;
-
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetAbstract;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
-import org.apache.causeway.core.metamodel.object.MmInvokeUtil;
import org.apache.causeway.core.metamodel.object.ManagedObject;
+import org.apache.causeway.core.metamodel.object.MmInvokeUtil;
import lombok.Getter;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/CallbackFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/CallbackFacetFactory.java
index d99d432976..b8217cfe3c 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/CallbackFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/CallbackFacetFactory.java
@@ -25,7 +25,6 @@ import java.util.stream.Stream;
import javax.inject.Inject;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants.CallbackMethod;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/CreatedCallbackFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/CreatedCallbackFacetAbstract.java
index 94771e8d55..978196037b 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/CreatedCallbackFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/CreatedCallbackFacetAbstract.java
@@ -21,7 +21,6 @@ package org.apache.causeway.core.metamodel.facets.object.callbacks;
import java.lang.reflect.Method;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/CreatedCallbackFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/CreatedCallbackFacetViaMethod.java
index 3ea20befd8..adc8b6c4e2 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/CreatedCallbackFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/CreatedCallbackFacetViaMethod.java
@@ -21,7 +21,6 @@ package org.apache.causeway.core.metamodel.facets.object.callbacks;
import java.lang.reflect.Method;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.ImperativeFacet;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/CreatedLifecycleEventFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/CreatedLifecycleEventFacetForDomainObjectAnnotation.java
index e8a94e6232..03b7eadb92 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/CreatedLifecycleEventFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/CreatedLifecycleEventFacetForDomainObjectAnnotation.java
@@ -18,10 +18,9 @@
*/
package org.apache.causeway.core.metamodel.facets.object.callbacks;
-import org.apache.causeway.commons.internal.base._Casts;
-
import org.apache.causeway.applib.events.lifecycle.AbstractLifecycleEvent;
import org.apache.causeway.applib.events.lifecycle.ObjectCreatedEvent;
+import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.SingleClassValueFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/LoadedCallbackFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/LoadedCallbackFacetAbstract.java
index e4d3333def..97860b701f 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/LoadedCallbackFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/LoadedCallbackFacetAbstract.java
@@ -21,7 +21,6 @@ package org.apache.causeway.core.metamodel.facets.object.callbacks;
import java.lang.reflect.Method;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/LoadedCallbackFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/LoadedCallbackFacetViaMethod.java
index 0dab1e7d31..7325ed115d 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/LoadedCallbackFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/LoadedCallbackFacetViaMethod.java
@@ -21,7 +21,6 @@ package org.apache.causeway.core.metamodel.facets.object.callbacks;
import java.lang.reflect.Method;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
public class LoadedCallbackFacetViaMethod
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/LoadedLifecycleEventFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/LoadedLifecycleEventFacetForDomainObjectAnnotation.java
index c0e2aa841b..a9984eafc7 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/LoadedLifecycleEventFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/LoadedLifecycleEventFacetForDomainObjectAnnotation.java
@@ -18,9 +18,8 @@
*/
package org.apache.causeway.core.metamodel.facets.object.callbacks;
-import org.apache.causeway.commons.internal.base._Casts;
-
import org.apache.causeway.applib.events.lifecycle.ObjectLoadedEvent;
+import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.SingleClassValueFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/PersistedCallbackFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/PersistedCallbackFacetAbstract.java
index a6406c9cff..48d12a56d5 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/PersistedCallbackFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/PersistedCallbackFacetAbstract.java
@@ -21,7 +21,6 @@ package org.apache.causeway.core.metamodel.facets.object.callbacks;
import java.lang.reflect.Method;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/PersistedCallbackFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/PersistedCallbackFacetViaMethod.java
index d3d72c22e9..c052432e81 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/PersistedCallbackFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/PersistedCallbackFacetViaMethod.java
@@ -21,7 +21,6 @@ package org.apache.causeway.core.metamodel.facets.object.callbacks;
import java.lang.reflect.Method;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
public class PersistedCallbackFacetViaMethod
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/PersistedLifecycleEventFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/PersistedLifecycleEventFacetForDomainObjectAnnotation.java
index 48cc863196..ffccc41a47 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/PersistedLifecycleEventFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/PersistedLifecycleEventFacetForDomainObjectAnnotation.java
@@ -18,9 +18,8 @@
*/
package org.apache.causeway.core.metamodel.facets.object.callbacks;
-import org.apache.causeway.commons.internal.base._Casts;
-
import org.apache.causeway.applib.events.lifecycle.ObjectPersistedEvent;
+import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.SingleClassValueFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/PersistingCallbackFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/PersistingCallbackFacetAbstract.java
index bec8b30f0f..e70fbae50d 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/PersistingCallbackFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/PersistingCallbackFacetAbstract.java
@@ -21,7 +21,6 @@ package org.apache.causeway.core.metamodel.facets.object.callbacks;
import java.lang.reflect.Method;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/PersistingCallbackFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/PersistingCallbackFacetViaMethod.java
index 1ccea32fd2..ebb5dc47f7 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/PersistingCallbackFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/PersistingCallbackFacetViaMethod.java
@@ -21,7 +21,6 @@ package org.apache.causeway.core.metamodel.facets.object.callbacks;
import java.lang.reflect.Method;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
public class PersistingCallbackFacetViaMethod
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/PersistingLifecycleEventFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/PersistingLifecycleEventFacetForDomainObjectAnnotation.java
index 09ea39ed04..7b7e6c2f8d 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/PersistingLifecycleEventFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/PersistingLifecycleEventFacetForDomainObjectAnnotation.java
@@ -18,9 +18,8 @@
*/
package org.apache.causeway.core.metamodel.facets.object.callbacks;
-import org.apache.causeway.commons.internal.base._Casts;
-
import org.apache.causeway.applib.events.lifecycle.ObjectPersistingEvent;
+import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.SingleClassValueFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/RemovingCallbackFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/RemovingCallbackFacetAbstract.java
index f671b7b206..f8c542fb91 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/RemovingCallbackFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/RemovingCallbackFacetAbstract.java
@@ -21,7 +21,6 @@ package org.apache.causeway.core.metamodel.facets.object.callbacks;
import java.lang.reflect.Method;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/RemovingCallbackFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/RemovingCallbackFacetViaMethod.java
index 7de16a80a6..2a5198cdbb 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/RemovingCallbackFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/RemovingCallbackFacetViaMethod.java
@@ -21,7 +21,6 @@ package org.apache.causeway.core.metamodel.facets.object.callbacks;
import java.lang.reflect.Method;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
public class RemovingCallbackFacetViaMethod
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/RemovingLifecycleEventFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/RemovingLifecycleEventFacetForDomainObjectAnnotation.java
index 7b1428bc0d..d0045ffa42 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/RemovingLifecycleEventFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/RemovingLifecycleEventFacetForDomainObjectAnnotation.java
@@ -18,9 +18,8 @@
*/
package org.apache.causeway.core.metamodel.facets.object.callbacks;
-import org.apache.causeway.commons.internal.base._Casts;
-
import org.apache.causeway.applib.events.lifecycle.ObjectRemovingEvent;
+import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.SingleClassValueFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/UpdatedCallbackFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/UpdatedCallbackFacetAbstract.java
index 20f0ad238f..b6e1eaacb9 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/UpdatedCallbackFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/UpdatedCallbackFacetAbstract.java
@@ -21,7 +21,6 @@ package org.apache.causeway.core.metamodel.facets.object.callbacks;
import java.lang.reflect.Method;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/UpdatedCallbackFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/UpdatedCallbackFacetViaMethod.java
index 1ec6da598b..aae3cab58c 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/UpdatedCallbackFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/UpdatedCallbackFacetViaMethod.java
@@ -21,7 +21,6 @@ package org.apache.causeway.core.metamodel.facets.object.callbacks;
import java.lang.reflect.Method;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
public class UpdatedCallbackFacetViaMethod
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/UpdatedLifecycleEventFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/UpdatedLifecycleEventFacetForDomainObjectAnnotation.java
index 19d5a2da1c..c81a6e23ef 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/UpdatedLifecycleEventFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/UpdatedLifecycleEventFacetForDomainObjectAnnotation.java
@@ -18,9 +18,8 @@
*/
package org.apache.causeway.core.metamodel.facets.object.callbacks;
-import org.apache.causeway.commons.internal.base._Casts;
-
import org.apache.causeway.applib.events.lifecycle.ObjectUpdatedEvent;
+import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.SingleClassValueFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/UpdatingCallbackFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/UpdatingCallbackFacetAbstract.java
index b7108270d5..7e7767c0f9 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/UpdatingCallbackFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/UpdatingCallbackFacetAbstract.java
@@ -21,7 +21,6 @@ package org.apache.causeway.core.metamodel.facets.object.callbacks;
import java.lang.reflect.Method;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/UpdatingCallbackFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/UpdatingCallbackFacetViaMethod.java
index 80800a7b03..8a4f280290 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/UpdatingCallbackFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/UpdatingCallbackFacetViaMethod.java
@@ -21,7 +21,6 @@ package org.apache.causeway.core.metamodel.facets.object.callbacks;
import java.lang.reflect.Method;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
public class UpdatingCallbackFacetViaMethod
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/UpdatingLifecycleEventFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/UpdatingLifecycleEventFacetForDomainObjectAnnotation.java
index 546af3be4a..9fe2361397 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/UpdatingLifecycleEventFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/UpdatingLifecycleEventFacetForDomainObjectAnnotation.java
@@ -18,9 +18,8 @@
*/
package org.apache.causeway.core.metamodel.facets.object.callbacks;
-import org.apache.causeway.commons.internal.base._Casts;
-
import org.apache.causeway.applib.events.lifecycle.ObjectUpdatingEvent;
+import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.SingleClassValueFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/choices/ChoicesFacetFromBoundedAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/choices/ChoicesFacetFromBoundedAbstract.java
index a6d85d2481..68395f8c7c 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/choices/ChoicesFacetFromBoundedAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/choices/ChoicesFacetFromBoundedAbstract.java
@@ -18,9 +18,8 @@
*/
package org.apache.causeway.core.metamodel.facets.object.choices;
-import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.applib.query.Query;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/choices/enums/ChoicesFacetFromEnum.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/choices/enums/ChoicesFacetFromEnum.java
index c89c85387f..19c2a92e11 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/choices/enums/ChoicesFacetFromEnum.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/choices/enums/ChoicesFacetFromEnum.java
@@ -22,7 +22,6 @@ import java.util.function.BiConsumer;
import java.util.stream.Collectors;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.objectvalue.choices.ChoicesFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/cssclassfa/annotation/CssClassFaFacetForDomainObjectLayoutFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/cssclassfa/annotation/CssClassFaFacetForDomainObjectLayoutFactory.java
index 3280601521..f1dcbaf71e 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/cssclassfa/annotation/CssClassFaFacetForDomainObjectLayoutFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/cssclassfa/annotation/CssClassFaFacetForDomainObjectLayoutFactory.java
@@ -16,10 +16,9 @@
* under the License. */
package org.apache.causeway.core.metamodel.facets.object.cssclassfa.annotation;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.layout.component.CssClassFaPosition;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet;
import org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaStaticFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/AliasedFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/AliasedFacetForDomainObjectAnnotation.java
index 468ffcf650..bae12d4897 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/AliasedFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/AliasedFacetForDomainObjectAnnotation.java
@@ -20,10 +20,9 @@ package org.apache.causeway.core.metamodel.facets.object.domainobject;
import java.util.Optional;
-import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.id.LogicalType;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.object.domainservice.annotation.AliasedFacetForDomainServiceAnnotation;
import org.apache.causeway.core.metamodel.facets.object.logicaltype.AliasedFacet;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
index 5a225b7493..6aa77021a6 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
@@ -28,11 +28,6 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.collections._Multimaps;
-
-import static org.apache.causeway.commons.internal.base._NullSafe.stream;
-
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.Collection;
@@ -51,15 +46,19 @@ import org.apache.causeway.applib.events.lifecycle.ObjectRemovingEvent;
import org.apache.causeway.applib.events.lifecycle.ObjectUpdatedEvent;
import org.apache.causeway.applib.events.lifecycle.ObjectUpdatingEvent;
import org.apache.causeway.applib.id.LogicalType;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.collections._Multimaps;
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
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.ProcessClassContext;
import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.causeway.core.metamodel.facets.HasPostConstructMethodCache;
import org.apache.causeway.core.metamodel.facets.ObjectTypeFacetFactory;
+import org.apache.causeway.core.metamodel.facets.ObjectTypeFacetFactory.ProcessObjectTypeContext;
import org.apache.causeway.core.metamodel.facets.object.callbacks.CreatedLifecycleEventFacetForDomainObjectAnnotation;
import org.apache.causeway.core.metamodel.facets.object.callbacks.LoadedLifecycleEventFacetForDomainObjectAnnotation;
import org.apache.causeway.core.metamodel.facets.object.callbacks.PersistedLifecycleEventFacetForDomainObjectAnnotation;
@@ -86,6 +85,8 @@ import org.apache.causeway.core.metamodel.specloader.validator.MetaModelVisiting
import org.apache.causeway.core.metamodel.specloader.validator.ValidationFailure;
import org.apache.causeway.core.metamodel.util.EventUtil;
+import static org.apache.causeway.commons.internal.base._NullSafe.stream;
+
import lombok.Getter;
import lombok.NonNull;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
index d2318ba6f1..f4cda5ee0f 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.object.domainobject.editing;
import java.util.Optional;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
-
import org.apache.causeway.applib.annotation.DomainObject;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.metamodel.facets.DomainObjectConfigOptions;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
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 0fe540e704..33b3020a6d 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
@@ -18,6 +18,7 @@
*/
package org.apache.causeway.core.metamodel.facets.object.domainobject.editing;
+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/domainobject/entitychangepublishing/EntityChangePublishingFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/entitychangepublishing/EntityChangePublishingFacetForDomainObjectAnnotation.java
index 5159d2ed9e..a5d5ef8209 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/entitychangepublishing/EntityChangePublishingFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/entitychangepublishing/EntityChangePublishingFacetForDomainObjectAnnotation.java
@@ -21,9 +21,8 @@ package org.apache.causeway.core.metamodel.facets.object.domainobject.entitychan
import java.util.Optional;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
-
import org.apache.causeway.applib.annotation.Publishing;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.metamodel.facets.DomainObjectConfigOptions;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/introspection/IntrospectionPolicyFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/introspection/IntrospectionPolicyFacetForDomainObjectAnnotation.java
index 807a1638b9..add587c7a8 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/introspection/IntrospectionPolicyFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/introspection/IntrospectionPolicyFacetForDomainObjectAnnotation.java
@@ -20,10 +20,9 @@ package org.apache.causeway.core.metamodel.facets.object.domainobject.introspect
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._NullSafe;
-
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Introspection;
+import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.object.introspection.IntrospectionPolicyFacet;
import org.apache.causeway.core.metamodel.facets.object.introspection.IntrospectionPolicyFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForDomainObjectLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForDomainObjectLayoutAnnotation.java
index 80ee412035..1c22c4f82b 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForDomainObjectLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForDomainObjectLayoutAnnotation.java
@@ -18,10 +18,9 @@ package org.apache.causeway.core.metamodel.facets.object.domainobjectlayout;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.layout.component.CssClassFaPosition;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet;
import org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaStaticFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForDomainObjectLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForDomainObjectLayoutXml.java
index 1e93c3c444..6b56a09c48 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForDomainObjectLayoutXml.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForDomainObjectLayoutXml.java
@@ -20,10 +20,9 @@ package org.apache.causeway.core.metamodel.facets.object.domainobjectlayout;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.layout.component.CssClassFaPosition;
import org.apache.causeway.applib.layout.component.DomainObjectLayoutData;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFacet;
import org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaStaticFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/CssClassFacetForDomainObjectLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/CssClassFacetForDomainObjectLayoutAnnotation.java
index e10d66c3a7..936de508d1 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/CssClassFacetForDomainObjectLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/CssClassFacetForDomainObjectLayoutAnnotation.java
@@ -18,9 +18,8 @@ package org.apache.causeway.core.metamodel.facets.object.domainobjectlayout;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.annotation.DomainObjectLayout;
+import org.apache.causeway.commons.internal.base._Strings;
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/object/domainobjectlayout/CssClassFacetForDomainObjectLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/CssClassFacetForDomainObjectLayoutXml.java
index 838c491305..116316c903 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/CssClassFacetForDomainObjectLayoutXml.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/CssClassFacetForDomainObjectLayoutXml.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.object.domainobjectlayout;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.layout.component.DomainObjectLayoutData;
+import org.apache.causeway.commons.internal.base._Strings;
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/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
index 32e04bdbe5..36abd7e042 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
@@ -22,11 +22,10 @@ import java.lang.reflect.InvocationTargetException;
import java.util.Optional;
import java.util.function.BiConsumer;
-import org.apache.causeway.commons.internal.base._Casts;
-
import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.events.ui.CssClassUiEvent;
import org.apache.causeway.applib.exceptions.UnrecoverableException;
+import org.apache.causeway.commons.internal.base._Casts;
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.CssClassFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java
index 26109ac550..697dc73a23 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java
@@ -18,9 +18,8 @@ package org.apache.causeway.core.metamodel.facets.object.domainobjectlayout;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.base._Lazy;
-
import org.apache.causeway.applib.annotation.DomainObjectLayout;
+import org.apache.causeway.commons.internal.base._Lazy;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
index d61db66e44..20f4b64ef5 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
@@ -22,11 +22,10 @@ import java.lang.reflect.InvocationTargetException;
import java.util.Optional;
import java.util.function.BiConsumer;
-import org.apache.causeway.commons.internal.base._Casts;
-
import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.events.ui.IconUiEvent;
import org.apache.causeway.applib.exceptions.UnrecoverableException;
+import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.object.icon.IconFacet;
import org.apache.causeway.core.metamodel.facets.object.icon.IconFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/LayoutFacetViaDomainObjectLayoutAnnotationUsingLayoutUiEvent.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/LayoutFacetViaDomainObjectLayoutAnnotationUsingLayoutUiEvent.java
index 8ebd434650..3d72be8fdf 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/LayoutFacetViaDomainObjectLayoutAnnotationUsingLayoutUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/LayoutFacetViaDomainObjectLayoutAnnotationUsingLayoutUiEvent.java
@@ -22,11 +22,11 @@ import java.lang.reflect.InvocationTargetException;
import java.util.Optional;
import java.util.function.BiConsumer;
-import org.apache.causeway.commons.internal.base._Casts;
-
import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.events.ui.LayoutUiEvent;
import org.apache.causeway.applib.exceptions.UnrecoverableException;
+import org.apache.causeway.commons.internal.base._Casts;
+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.layout.LayoutFacet;
import org.apache.causeway.core.metamodel.facets.object.layout.LayoutFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/ObjectDescribedFacetForDomainObjectLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/ObjectDescribedFacetForDomainObjectLayoutAnnotation.java
index 61505f7117..2a68556b9a 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/ObjectDescribedFacetForDomainObjectLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/ObjectDescribedFacetForDomainObjectLayoutAnnotation.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.object.domainobjectlayout;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.annotation.DomainObjectLayout;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.all.described.ObjectDescribedFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/ObjectDescribedFacetForDomainObjectLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/ObjectDescribedFacetForDomainObjectLayoutXml.java
index be31a29731..1e085b7de5 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/ObjectDescribedFacetForDomainObjectLayoutXml.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/ObjectDescribedFacetForDomainObjectLayoutXml.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.object.domainobjectlayout;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.layout.component.DomainObjectLayoutData;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.all.described.ObjectDescribedFacet;
import org.apache.causeway.core.metamodel.facets.all.described.ObjectDescribedFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/ObjectNamedFacetForDomainObjectLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/ObjectNamedFacetForDomainObjectLayoutAnnotation.java
index 204c201adc..b538533ebd 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/ObjectNamedFacetForDomainObjectLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/ObjectNamedFacetForDomainObjectLayoutAnnotation.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.object.domainobjectlayout;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.annotation.DomainObjectLayout;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.all.i8n.noun.NounForms;
import org.apache.causeway.core.metamodel.facets.all.named.ObjectNamedFacet;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/ObjectNamedFacetForDomainObjectLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/ObjectNamedFacetForDomainObjectLayoutXml.java
index c926476159..50a3252695 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/ObjectNamedFacetForDomainObjectLayoutXml.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/ObjectNamedFacetForDomainObjectLayoutXml.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.object.domainobjectlayout;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.layout.component.DomainObjectLayoutData;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.all.i8n.noun.NounForms;
import org.apache.causeway.core.metamodel.facets.all.named.ObjectNamedFacet;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
index 99a5c5a471..e42e34e43a 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
@@ -22,14 +22,14 @@ import java.lang.reflect.InvocationTargetException;
import java.util.Optional;
import java.util.function.BiConsumer;
-import org.apache.causeway.commons.internal.base._Casts;
-
import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.events.ui.TitleUiEvent;
import org.apache.causeway.applib.exceptions.UnrecoverableException;
import org.apache.causeway.applib.services.i18n.TranslatableString;
import org.apache.causeway.applib.services.i18n.TranslationContext;
import org.apache.causeway.applib.services.i18n.TranslationService;
+import org.apache.causeway.commons.internal.base._Casts;
+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.title.TitleFacet;
import org.apache.causeway.core.metamodel.facets.object.title.TitleFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/DomainObjectLayoutTableDecorationFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/DomainObjectLayoutTableDecorationFacet.java
index de30eca4e7..ab24eba368 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/DomainObjectLayoutTableDecorationFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/DomainObjectLayoutTableDecorationFacet.java
@@ -21,10 +21,9 @@ package org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabl
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Optionals;
-
import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.annotation.Parameter;
+import org.apache.causeway.commons.internal.base._Optionals;
import org.apache.causeway.core.config.metamodel.facets.DomainObjectLayoutConfigOptions;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.SingleValueFacet;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/DomainObjectLayoutTableDecorationFacetForDomainObjectLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/DomainObjectLayoutTableDecorationFacetForDomainObjectLayoutXml.java
index c482c12f4b..cdd8b76cbb 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/DomainObjectLayoutTableDecorationFacetForDomainObjectLayoutXml.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/DomainObjectLayoutTableDecorationFacetForDomainObjectLayoutXml.java
@@ -20,15 +20,10 @@ package org.apache.causeway.core.metamodel.facets.object.domainobjectlayout.tabl
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.layout.component.DomainObjectLayoutData;
import org.apache.causeway.applib.layout.component.TableDecoration;
import org.apache.causeway.core.config.metamodel.facets.DomainObjectLayoutConfigOptions;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
-import org.apache.causeway.core.metamodel.facets.all.i8n.noun.NounForms;
-import org.apache.causeway.core.metamodel.facets.all.named.ObjectNamedFacet;
-import org.apache.causeway.core.metamodel.facets.all.named.ObjectNamedFacetAbstract;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainservice/DomainServiceFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainservice/DomainServiceFacet.java
index 5bf671c1d1..e5fb238b8f 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainservice/DomainServiceFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainservice/DomainServiceFacet.java
@@ -20,10 +20,10 @@ package org.apache.causeway.core.metamodel.facets.object.domainservice;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._NullSafe;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.annotation.NatureOfService;
+import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainservice/annotation/AliasedFacetForDomainServiceAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainservice/annotation/AliasedFacetForDomainServiceAnnotation.java
index 2ce4827ea1..a1501d6e21 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainservice/annotation/AliasedFacetForDomainServiceAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainservice/annotation/AliasedFacetForDomainServiceAnnotation.java
@@ -20,10 +20,9 @@ package org.apache.causeway.core.metamodel.facets.object.domainservice.annotatio
import java.util.Optional;
-import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.applib.annotation.DomainService;
import org.apache.causeway.applib.id.LogicalType;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.object.domainobject.AliasedFacetForDomainObjectAnnotation;
import org.apache.causeway.core.metamodel.facets.object.logicaltype.AliasedFacet;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainservicelayout/ObjectNamedFacetForDomainServiceLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainservicelayout/ObjectNamedFacetForDomainServiceLayoutAnnotation.java
index 1387e37df7..c8afb5873e 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainservicelayout/ObjectNamedFacetForDomainServiceLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainservicelayout/ObjectNamedFacetForDomainServiceLayoutAnnotation.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.object.domainservicelayout;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.annotation.DomainServiceLayout;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.all.i8n.noun.NounForms;
import org.apache.causeway.core.metamodel.facets.all.named.ObjectNamedFacet;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/entity/EntityFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/entity/EntityFacet.java
index b52ff38300..151640c4ab 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/entity/EntityFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/entity/EntityFacet.java
@@ -22,9 +22,6 @@ import java.lang.reflect.Method;
import java.util.Optional;
import java.util.function.Function;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.springframework.lang.Nullable;
import org.springframework.util.ClassUtils;
@@ -32,6 +29,9 @@ import org.apache.causeway.applib.query.Query;
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.bookmark.IdStringifier;
import org.apache.causeway.applib.services.repository.EntityState;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.config.beans.PersistenceStack;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
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 35c751e73a..7b197c7a3c 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
@@ -22,12 +22,11 @@ import java.lang.reflect.Method;
import java.util.Optional;
import java.util.function.BiConsumer;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
-
import org.apache.causeway.applib.query.Query;
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.repository.EntityState;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.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.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/grid/GridFacetDefault.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/grid/GridFacetDefault.java
index 72b68905c3..36ce83402b 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/grid/GridFacetDefault.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/grid/GridFacetDefault.java
@@ -22,13 +22,13 @@ import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.causeway.commons.internal.base._Lazy;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.layout.grid.Grid;
import org.apache.causeway.applib.services.grid.GridService;
+import org.apache.causeway.commons.internal.base._Lazy;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetAbstract;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/grid/GridFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/grid/GridFacetFactory.java
index b4935a495d..cf82e33881 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/grid/GridFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/grid/GridFacetFactory.java
@@ -18,9 +18,8 @@ package org.apache.causeway.core.metamodel.facets.object.grid;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.base._Lazy;
-
import org.apache.causeway.applib.services.grid.GridService;
+import org.apache.causeway.commons.internal.base._Lazy;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/hidden/HiddenTypeFacetFromAuthorization.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/hidden/HiddenTypeFacetFromAuthorization.java
index 0cfb61c984..fd386c3c0f 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/hidden/HiddenTypeFacetFromAuthorization.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/hidden/HiddenTypeFacetFromAuthorization.java
@@ -19,6 +19,7 @@
package org.apache.causeway.core.metamodel.facets.object.hidden;
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.VisibilityContext;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/icon/ObjectIcon.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/icon/ObjectIcon.java
index 5138ec6234..6336cb87e6 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/icon/ObjectIcon.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/icon/ObjectIcon.java
@@ -22,12 +22,11 @@ import java.io.InputStream;
import java.io.Serializable;
import java.net.URL;
+import org.apache.causeway.applib.value.NamedWithMimeType.CommonMimeType;
import org.apache.causeway.commons.internal._Constants;
import org.apache.causeway.commons.internal.base._Bytes;
import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.applib.value.NamedWithMimeType.CommonMimeType;
-
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NonNull;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java
index 0a0e08ffb0..829fec2595 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java
@@ -24,6 +24,7 @@ import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants;
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants.MethodExcludeMarker;
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/ignore/datanucleus/RemoveDatanucleusPersistableTypesFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/ignore/datanucleus/RemoveDatanucleusPersistableTypesFacetFactory.java
index 34b073dfe9..4926bc7c7d 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/ignore/datanucleus/RemoveDatanucleusPersistableTypesFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/ignore/datanucleus/RemoveDatanucleusPersistableTypesFacetFactory.java
@@ -24,7 +24,6 @@ import javax.inject.Inject;
import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.commons.internal.factory._InstanceUtil;
-
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/ignore/datanucleus/RemoveDnPrefixedMethodsFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/ignore/datanucleus/RemoveDnPrefixedMethodsFacetFactory.java
index 886b1e84d9..e23fef6323 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/ignore/datanucleus/RemoveDnPrefixedMethodsFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/ignore/datanucleus/RemoveDnPrefixedMethodsFacetFactory.java
@@ -22,6 +22,7 @@ import javax.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;
/**
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 e186ec4565..a8b3c18e22 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
@@ -22,16 +22,16 @@ import java.util.List;
import javax.inject.Inject;
+import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.commons.internal._Constants;
import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.commons.internal.reflection._Annotations;
import org.apache.causeway.commons.internal.reflection._Reflect;
-
-import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.core.metamodel.commons.ClassExtensions;
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/ignore/jdo/RemoveJdoEnhancementTypesFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/ignore/jdo/RemoveJdoEnhancementTypesFacetFactory.java
index 4b2d2ccafe..435e96ea0b 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/ignore/jdo/RemoveJdoEnhancementTypesFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/ignore/jdo/RemoveJdoEnhancementTypesFacetFactory.java
@@ -24,7 +24,6 @@ import javax.inject.Inject;
import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.commons.internal.factory._InstanceUtil;
-
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/ignore/jdo/RemoveJdoPrefixedMethodsFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/ignore/jdo/RemoveJdoPrefixedMethodsFacetFactory.java
index f882f8ec7c..d8d5ed84ee 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/ignore/jdo/RemoveJdoPrefixedMethodsFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/ignore/jdo/RemoveJdoPrefixedMethodsFacetFactory.java
@@ -23,6 +23,7 @@ import javax.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;
/**
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/immutable/ImmutableFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/immutable/ImmutableFacetAbstract.java
index 7f14509ca3..9165d43709 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/immutable/ImmutableFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/immutable/ImmutableFacetAbstract.java
@@ -20,9 +20,9 @@ package org.apache.causeway.core.metamodel.facets.object.immutable;
import java.util.function.BiConsumer;
-import org.apache.causeway.commons.internal.base._Strings;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetAbstract;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/introspection/IntrospectionPolicyFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/introspection/IntrospectionPolicyFacet.java
index a7a6e1e8a6..022fd16f3f 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/introspection/IntrospectionPolicyFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/introspection/IntrospectionPolicyFacet.java
@@ -19,12 +19,11 @@
package org.apache.causeway.core.metamodel.facets.object.introspection;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
-
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Introspection;
import org.apache.causeway.applib.annotation.Introspection.EncapsulationPolicy;
import org.apache.causeway.applib.annotation.Introspection.IntrospectionPolicy;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.facetapi.Facet;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/introspection/IntrospectionPolicyFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/introspection/IntrospectionPolicyFacetAbstract.java
index 0527aeaca6..4c811f9e4b 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/introspection/IntrospectionPolicyFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/introspection/IntrospectionPolicyFacetAbstract.java
@@ -22,6 +22,7 @@ import java.util.function.BiConsumer;
import org.apache.causeway.applib.annotation.Introspection;
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/object/logicaltype/AliasedFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/logicaltype/AliasedFacet.java
index c4b3c3a32c..0cbdf014ee 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/logicaltype/AliasedFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/logicaltype/AliasedFacet.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.object.logicaltype;
import javax.inject.Named;
-import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.applib.id.LogicalType;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.facetapi.Facet;
/**
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/logicaltype/AliasedFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/logicaltype/AliasedFacetAbstract.java
index 32fab21978..fddab66fc0 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/logicaltype/AliasedFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/logicaltype/AliasedFacetAbstract.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.object.logicaltype;
import java.util.function.BiConsumer;
-import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.applib.id.LogicalType;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetAbstract;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/logicaltype/LogicalTypeMalformedValidator.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/logicaltype/LogicalTypeMalformedValidator.java
index 736c3d067e..659f70462c 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/logicaltype/LogicalTypeMalformedValidator.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/logicaltype/LogicalTypeMalformedValidator.java
@@ -22,7 +22,6 @@ import java.util.Map;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants;
import org.apache.causeway.core.metamodel.facetapi.MetaModelRefiner;
import org.apache.causeway.core.metamodel.progmodel.ProgrammingModel;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/logicaltype/classname/LogicalTypeFacetFromClassNameFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/logicaltype/classname/LogicalTypeFacetFromClassNameFactory.java
index 247b427f7e..ff21988e25 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/logicaltype/classname/LogicalTypeFacetFromClassNameFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/logicaltype/classname/LogicalTypeFacetFromClassNameFactory.java
@@ -24,8 +24,10 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
import org.apache.causeway.core.metamodel.facetapi.MetaModelRefiner;
+import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.causeway.core.metamodel.facets.ObjectTypeFacetFactory;
+import org.apache.causeway.core.metamodel.facets.ObjectTypeFacetFactory.ProcessObjectTypeContext;
import org.apache.causeway.core.metamodel.facets.object.domainservice.DomainServiceFacet;
import org.apache.causeway.core.metamodel.progmodel.ProgrammingModel;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/mixin/MetaModelValidatorForMixinTypes.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/mixin/MetaModelValidatorForMixinTypes.java
index afd7013ebd..9281280347 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/mixin/MetaModelValidatorForMixinTypes.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/mixin/MetaModelValidatorForMixinTypes.java
@@ -18,15 +18,14 @@
*/
package org.apache.causeway.core.metamodel.facets.object.mixin;
-import org.apache.causeway.commons.internal.reflection._Reflect;
-
-import static org.apache.causeway.commons.internal.reflection._Reflect.Filter.paramCount;
-
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.id.LogicalType;
+import org.apache.causeway.commons.internal.reflection._Reflect;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.specloader.validator.ValidationFailure;
+import static org.apache.causeway.commons.internal.reflection._Reflect.Filter.paramCount;
+
import lombok.NonNull;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/mixin/MixinFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/mixin/MixinFacetAbstract.java
index f596996291..26f06d0acd 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/mixin/MixinFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/mixin/MixinFacetAbstract.java
@@ -24,7 +24,6 @@ import java.lang.reflect.Method;
import java.util.function.BiConsumer;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
-
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.SingleValueFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactory.java
index dd7271a532..c0cbdd9c0b 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactory.java
@@ -25,13 +25,12 @@ import java.util.Optional;
import javax.inject.Inject;
+import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.reflection._Annotations;
import org.apache.causeway.commons.internal.reflection._Reflect;
import org.apache.causeway.commons.internal.reflection._Reflect.InterfacePolicy;
import org.apache.causeway.commons.internal.reflection._Reflect.TypeHierarchyPolicy;
-
-import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/navparent/method/NavigableParentFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/navparent/method/NavigableParentFacetViaMethod.java
index 2fe51b0204..fda3c0a44e 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/navparent/method/NavigableParentFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/navparent/method/NavigableParentFacetViaMethod.java
@@ -26,7 +26,6 @@ import java.util.Optional;
import java.util.function.BiConsumer;
import org.apache.causeway.commons.functional.Either;
-
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.object.navparent.NavigableParentFacet;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/paged/PagedFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/paged/PagedFacet.java
index 717421bd2b..4ac2a8ed3c 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/paged/PagedFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/paged/PagedFacet.java
@@ -18,8 +18,6 @@
*/
package org.apache.causeway.core.metamodel.facets.object.paged;
-import org.springframework.lang.Nullable;
-
import org.apache.causeway.core.metamodel.facetapi.Facet;
/**
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/support/ObjectSupportFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/support/ObjectSupportFacetFactory.java
index 1acb5b7c2d..1c5e8597b8 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/support/ObjectSupportFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/support/ObjectSupportFacetFactory.java
@@ -26,7 +26,6 @@ import java.util.stream.Stream;
import javax.inject.Inject;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants.ObjectSupportMethod;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.Facet;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/title/TitleRenderRequest.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/title/TitleRenderRequest.java
index ce7e563f66..039f52de3b 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/title/TitleRenderRequest.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/title/TitleRenderRequest.java
@@ -20,9 +20,9 @@ package org.apache.causeway.core.metamodel.facets.object.title;
import java.util.function.Predicate;
-import org.apache.causeway.commons.internal.functions._Predicates;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.internal.functions._Predicates;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.spec.feature.ObjectFeature;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/title/annotation/TitleAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/title/annotation/TitleAnnotationFacetFactory.java
index 66c79698ea..64b3427f49 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/title/annotation/TitleAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/title/annotation/TitleAnnotationFacetFactory.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.object.title.annotation;
import javax.inject.Inject;
-import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.applib.annotation.Title;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
import org.apache.causeway.core.metamodel.facetapi.MetaModelRefiner;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
index 94826d1e97..e22b065821 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
@@ -26,6 +26,7 @@ import java.util.Optional;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
+import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.collections._Lists;
@@ -33,8 +34,6 @@ import org.apache.causeway.commons.internal.compare._Comparators;
import org.apache.causeway.commons.internal.reflection._Annotations;
import org.apache.causeway.commons.internal.reflection._Reflect.InterfacePolicy;
import org.apache.causeway.commons.internal.reflection._Reflect.TypeHierarchyPolicy;
-
-import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants.ObjectSupportMethod;
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants.Validation;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/title/methods/TitleFacetFromToStringMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/title/methods/TitleFacetFromToStringMethod.java
index 66d61d7edc..e6fe6a2a8d 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/title/methods/TitleFacetFromToStringMethod.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/title/methods/TitleFacetFromToStringMethod.java
@@ -25,9 +25,11 @@ import java.util.function.BiConsumer;
import org.springframework.lang.Nullable;
import org.apache.causeway.core.metamodel.commons.ClassExtensions;
+import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.HasImperativeAspect;
import org.apache.causeway.core.metamodel.facets.ImperativeAspect;
+import org.apache.causeway.core.metamodel.facets.ImperativeFacet.Intent;
import org.apache.causeway.core.metamodel.facets.object.title.TitleFacet;
import org.apache.causeway.core.metamodel.facets.object.title.TitleFacetAbstract;
import org.apache.causeway.core.metamodel.facets.object.title.TitleRenderRequest;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/CompositeValueUpdater.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/CompositeValueUpdater.java
index b69bf6a45f..d7c2e65bfa 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/CompositeValueUpdater.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/CompositeValueUpdater.java
@@ -18,10 +18,9 @@
*/
package org.apache.causeway.core.metamodel.facets.object.value;
-import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.annotation.Where;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.commons.CanonicalInvoker;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.interactions.InteractionHead;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/CompositeValueUpdaterForParameter.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/CompositeValueUpdaterForParameter.java
index 54bdbcf5a8..cc50b4c631 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/CompositeValueUpdaterForParameter.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/CompositeValueUpdaterForParameter.java
@@ -19,7 +19,6 @@
package org.apache.causeway.core.metamodel.facets.object.value;
import org.apache.causeway.commons.internal.delegate._Delegate;
-
import org.apache.causeway.core.metamodel.interactions.managed.ParameterNegotiationModel;
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/object/value/CompositeValueUpdaterForProperty.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/CompositeValueUpdaterForProperty.java
index 1f79a7aa46..34bd6b725a 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/CompositeValueUpdaterForProperty.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/CompositeValueUpdaterForProperty.java
@@ -19,7 +19,6 @@
package org.apache.causeway.core.metamodel.facets.object.value;
import org.apache.causeway.commons.internal.delegate._Delegate;
-
import org.apache.causeway.core.metamodel.interactions.managed.ManagedProperty;
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/object/value/ValueFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/ValueFacet.java
index 1248306ccf..c0206c1f47 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/ValueFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/ValueFacet.java
@@ -21,7 +21,6 @@ package org.apache.causeway.core.metamodel.facets.object.value;
import java.util.Optional;
import java.util.stream.Stream;
-import org.apache.causeway.commons.collections.Can;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.Identifier;
@@ -32,6 +31,7 @@ import org.apache.causeway.applib.value.semantics.Parser;
import org.apache.causeway.applib.value.semantics.Renderer;
import org.apache.causeway.applib.value.semantics.ValueSemanticsProvider;
import org.apache.causeway.applib.value.semantics.ValueSemanticsProvider.Context;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedProperty;
import org.apache.causeway.core.metamodel.interactions.managed.ParameterNegotiationModel;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/ValueFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/ValueFacetAbstract.java
index 717a932025..7cac0c9ea3 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/ValueFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/ValueFacetAbstract.java
@@ -23,11 +23,6 @@ import java.util.function.BiConsumer;
import java.util.function.Predicate;
import java.util.stream.Stream;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.base._NullSafe;
-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 org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.lang.Nullable;
@@ -39,6 +34,11 @@ import org.apache.causeway.applib.value.semantics.Parser;
import org.apache.causeway.applib.value.semantics.Renderer;
import org.apache.causeway.applib.value.semantics.ValueSemanticsProvider;
import org.apache.causeway.applib.value.semantics.ValueSemanticsProvider.Context;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.base._NullSafe;
+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 org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetAbstract;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/ValueSerializerDefault.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/ValueSerializerDefault.java
index fb181fab45..d1a973a894 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/ValueSerializerDefault.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/ValueSerializerDefault.java
@@ -18,13 +18,13 @@
*/
package org.apache.causeway.core.metamodel.facets.object.value;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.value.semantics.ValueDecomposition;
import org.apache.causeway.applib.value.semantics.ValueSemanticsProvider;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/annotcfg/ValueFacetForValueAnnotationOrAnyMatchingValueSemanticsFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/annotcfg/ValueFacetForValueAnnotationOrAnyMatchingValueSemanticsFacetFactory.java
index 00e7dae9e4..f6ff8a3c35 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/annotcfg/ValueFacetForValueAnnotationOrAnyMatchingValueSemanticsFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/annotcfg/ValueFacetForValueAnnotationOrAnyMatchingValueSemanticsFacetFactory.java
@@ -20,15 +20,14 @@ package org.apache.causeway.core.metamodel.facets.object.value.annotcfg;
import java.util.Optional;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.assertions._Assert;
-import org.apache.causeway.commons.internal.base._Casts;
-
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.annotation.Value;
import org.apache.causeway.applib.id.LogicalType;
import org.apache.causeway.applib.value.semantics.ValueSemanticsProvider;
import org.apache.causeway.applib.value.semantics.ValueSemanticsResolver;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.assertions._Assert;
+import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FacetUtil;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/vsp/ValueFacetUsingSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/vsp/ValueFacetUsingSemanticsProvider.java
index 9dca340669..aadfcb895d 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/vsp/ValueFacetUsingSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/vsp/ValueFacetUsingSemanticsProvider.java
@@ -18,9 +18,8 @@
*/
package org.apache.causeway.core.metamodel.facets.object.value.vsp;
-import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.applib.value.semantics.ValueSemanticsProvider;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.object.value.ValueFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetAbstract.java
index e914333a8c..9ad17cf8c0 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetAbstract.java
@@ -21,9 +21,8 @@ package org.apache.causeway.core.metamodel.facets.object.viewmodel;
import java.lang.reflect.Method;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.services.bookmark.Bookmark;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.commons.CanonicalInvoker;
import org.apache.causeway.core.metamodel.commons.ClassExtensions;
import org.apache.causeway.core.metamodel.facetapi.Facet;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForDomainObjectAnnotation.java
index 9c0db1262d..267b59c5f4 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForDomainObjectAnnotation.java
@@ -22,14 +22,13 @@ import java.util.Objects;
import java.util.Optional;
import java.util.stream.Stream;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.memento._Mementos;
-import org.apache.causeway.commons.internal.memento._Mementos.SerializingAdapter;
-
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.metamodel.BeanSort;
import org.apache.causeway.applib.services.urlencoding.UrlEncodingService;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.commons.internal.memento._Mementos;
+import org.apache.causeway.commons.internal.memento._Mementos.SerializingAdapter;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.HasPostConstructMethodCache;
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 eea75df8d3..fe2cdc4f78 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
@@ -26,10 +26,10 @@ import java.io.Serializable;
import java.nio.charset.StandardCharsets;
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.applib.services.bookmark.Bookmark;
+import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.HasPostConstructMethodCache;
import org.apache.causeway.core.metamodel.object.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForXmlRootElementAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForXmlRootElementAnnotation.java
index a43851c430..0f2f5e0b63 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForXmlRootElementAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForXmlRootElementAnnotation.java
@@ -22,12 +22,11 @@ import java.util.Optional;
import javax.xml.bind.annotation.XmlRootElement;
-import org.apache.causeway.commons.internal.debug._Debug;
-import org.apache.causeway.commons.internal.debug.xray.XrayUi;
-
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.jaxb.JaxbService;
import org.apache.causeway.applib.services.urlencoding.UrlEncodingService;
+import org.apache.causeway.commons.internal.debug._Debug;
+import org.apache.causeway.commons.internal.debug.xray.XrayUi;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.HasPostConstructMethodCache;
import org.apache.causeway.core.metamodel.object.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/choices/ChoicesFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/choices/ChoicesFacet.java
index 2dca8a9b88..91f37d543f 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/choices/ChoicesFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/choices/ChoicesFacet.java
@@ -19,7 +19,6 @@
package org.apache.causeway.core.metamodel.facets.objectvalue.choices;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.object.ManagedObject;
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 ca1d957d56..f544f3ca69 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
@@ -23,7 +23,6 @@ import java.util.function.BiConsumer;
import java.util.function.Supplier;
import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetAbstract;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/mustsatisfyspec/MustSatisfySpecificationFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/mustsatisfyspec/MustSatisfySpecificationFacetAbstract.java
index a374bbb1f4..664891eb3b 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/mustsatisfyspec/MustSatisfySpecificationFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/mustsatisfyspec/MustSatisfySpecificationFacetAbstract.java
@@ -23,12 +23,11 @@ import java.util.Objects;
import java.util.function.BiConsumer;
import java.util.stream.Collectors;
-import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.services.i18n.TranslationContext;
import org.apache.causeway.applib.services.i18n.TranslationService;
import org.apache.causeway.applib.spec.Specification;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetAbstract;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/typicallen/TypicalLengthFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/typicallen/TypicalLengthFacet.java
index 52acf69003..fe6f877d0f 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/typicallen/TypicalLengthFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/typicallen/TypicalLengthFacet.java
@@ -20,7 +20,6 @@ package org.apache.causeway.core.metamodel.facets.objectvalue.typicallen;
import org.apache.causeway.commons.internal.primitives._Ints;
import org.apache.causeway.commons.internal.primitives._Ints.Bound;
-
import org.apache.causeway.core.metamodel.facets.SingleIntValueFacet;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/autocomplete/ActionParameterAutoCompleteFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/autocomplete/ActionParameterAutoCompleteFacet.java
index b065746476..1f2a7003da 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/autocomplete/ActionParameterAutoCompleteFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/autocomplete/ActionParameterAutoCompleteFacet.java
@@ -19,7 +19,6 @@
package org.apache.causeway.core.metamodel.facets.param.autocomplete;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.object.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethod.java
index f5b90d7d9b..1daa7e866f 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethod.java
@@ -25,7 +25,6 @@ import java.util.Optional;
import java.util.function.BiConsumer;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants.CollectionSemantics;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethodFactory.java
index 0a3423e699..4d1ac3236c 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethodFactory.java
@@ -21,7 +21,6 @@ package org.apache.causeway.core.metamodel.facets.param.autocomplete.method;
import javax.inject.Inject;
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.facets.FacetedMethodParameter;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/choices/ActionParameterChoicesFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/choices/ActionParameterChoicesFacet.java
index f80109011d..9622370f29 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/choices/ActionParameterChoicesFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/choices/ActionParameterChoicesFacet.java
@@ -19,7 +19,6 @@
package org.apache.causeway.core.metamodel.facets.param.choices;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.interactions.managed.ActionInteractionHead;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/choices/ActionParameterChoicesFacetFromChoicesFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/choices/ActionParameterChoicesFacetFromChoicesFacet.java
index b16979c7ee..659b574018 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/choices/ActionParameterChoicesFacetFromChoicesFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/choices/ActionParameterChoicesFacetFromChoicesFacet.java
@@ -21,8 +21,8 @@ package org.apache.causeway.core.metamodel.facets.param.choices;
import java.util.Optional;
import org.apache.causeway.commons.collections.Can;
-
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.objectvalue.choices.ChoicesFacet;
import org.apache.causeway.core.metamodel.interactions.managed.ActionInteractionHead;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/choices/ActionParameterChoicesFacetFromChoicesFromFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/choices/ActionParameterChoicesFacetFromChoicesFromFacet.java
index fda7fc20b6..458bb78768 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/choices/ActionParameterChoicesFacetFromChoicesFromFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/choices/ActionParameterChoicesFacetFromChoicesFromFacet.java
@@ -21,7 +21,6 @@ package org.apache.causeway.core.metamodel.facets.param.choices;
import java.util.Optional;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.actions.action.choicesfrom.ChoicesFromFacet;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethod.java
index c3d5a26aaa..2b137f70bd 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethod.java
@@ -24,7 +24,6 @@ import java.util.Optional;
import java.util.function.BiConsumer;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants.CollectionSemantics;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/defaults/ActionParameterDefaultsFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/defaults/ActionParameterDefaultsFacet.java
index e4ead9fdb0..950aedf834 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/defaults/ActionParameterDefaultsFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/defaults/ActionParameterDefaultsFacet.java
@@ -19,7 +19,6 @@
package org.apache.causeway.core.metamodel.facets.param.defaults;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.interactions.managed.ParameterNegotiationModel;
import org.apache.causeway.core.metamodel.object.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethod.java
index e57b3b9251..cf6d7d7bd4 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethod.java
@@ -25,7 +25,6 @@ import java.util.function.BiConsumer;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._NullSafe;
-
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.ImperativeFacet;
import org.apache.causeway.core.metamodel.facets.param.defaults.ActionParameterDefaultsFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/described/annotderived/ParamDescribedFacetFromType.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/described/annotderived/ParamDescribedFacetFromType.java
index 70bc1dc0c3..d4eb1d8b19 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/described/annotderived/ParamDescribedFacetFromType.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/described/annotderived/ParamDescribedFacetFromType.java
@@ -21,7 +21,7 @@ package org.apache.causeway.core.metamodel.facets.param.described.annotderived;
import java.util.Optional;
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.ObjectDescribedFacet;
import org.apache.causeway.core.metamodel.facets.all.described.ParamDescribedFacet;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/disable/ActionParameterDisabledFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/disable/ActionParameterDisabledFacet.java
index 3012b9183c..adbf9f7892 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/disable/ActionParameterDisabledFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/disable/ActionParameterDisabledFacet.java
@@ -19,7 +19,6 @@
package org.apache.causeway.core.metamodel.facets.param.disable;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.interactions.DisablingInteractionAdvisor;
import org.apache.causeway.core.metamodel.object.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/disable/method/ActionParameterDisabledFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/disable/method/ActionParameterDisabledFacetViaMethod.java
index 7a057bf2dd..b0a5beeb9e 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/disable/method/ActionParameterDisabledFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/disable/method/ActionParameterDisabledFacetViaMethod.java
@@ -23,15 +23,14 @@ import java.lang.reflect.Method;
import java.util.Optional;
import java.util.function.BiConsumer;
-import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.applib.services.i18n.TranslatableString;
import org.apache.causeway.applib.services.i18n.TranslationContext;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.ImperativeFacet;
import org.apache.causeway.core.metamodel.facets.param.disable.ActionParameterDisabledFacetAbstract;
-import org.apache.causeway.core.metamodel.object.MmInvokeUtil;
import org.apache.causeway.core.metamodel.object.ManagedObject;
+import org.apache.causeway.core.metamodel.object.MmInvokeUtil;
import lombok.Getter;
import lombok.NonNull;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/hide/ActionParameterHiddenFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/hide/ActionParameterHiddenFacet.java
index f321dcf3a0..9def209973 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/hide/ActionParameterHiddenFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/hide/ActionParameterHiddenFacet.java
@@ -19,7 +19,6 @@
package org.apache.causeway.core.metamodel.facets.param.hide;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.interactions.HidingInteractionAdvisor;
import org.apache.causeway.core.metamodel.object.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/hide/method/ActionParameterHiddenFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/hide/method/ActionParameterHiddenFacetViaMethod.java
index b0b4fe6e43..5799e2725d 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/hide/method/ActionParameterHiddenFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/hide/method/ActionParameterHiddenFacetViaMethod.java
@@ -24,13 +24,12 @@ import java.util.Optional;
import java.util.function.BiConsumer;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.ImperativeFacet;
import org.apache.causeway.core.metamodel.facets.param.hide.ActionParameterHiddenFacetAbstract;
-import org.apache.causeway.core.metamodel.object.MmInvokeUtil;
import org.apache.causeway.core.metamodel.object.ManagedObject;
+import org.apache.causeway.core.metamodel.object.MmInvokeUtil;
import lombok.Getter;
import lombok.NonNull;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/layout/CssClassFacetForParameterLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/layout/CssClassFacetForParameterLayoutAnnotation.java
index fbeec17a6f..a7c4b382d6 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/layout/CssClassFacetForParameterLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/layout/CssClassFacetForParameterLayoutAnnotation.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.param.layout;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.annotation.ParameterLayout;
+import org.apache.causeway.commons.internal.base._Strings;
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/param/layout/NamedFacetForParameterLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/layout/NamedFacetForParameterLayoutAnnotation.java
index 84a59aed46..9187412737 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/layout/NamedFacetForParameterLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/layout/NamedFacetForParameterLayoutAnnotation.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.param.layout;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.annotation.ParameterLayout;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.all.named.ParamNamedFacet;
import org.apache.causeway.core.metamodel.facets.all.named.ParamNamedFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/layout/ParamDescribedFacetForParameterLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/layout/ParamDescribedFacetForParameterLayoutAnnotation.java
index 4cc06b448c..2bcb1671f3 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/layout/ParamDescribedFacetForParameterLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/layout/ParamDescribedFacetForParameterLayoutAnnotation.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.param.layout;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.annotation.ParameterLayout;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.all.described.ParamDescribedFacet;
import org.apache.causeway.core.metamodel.facets.all.described.ParamDescribedFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/mandatory/dflt/MandatoryFacetOnParametersDefaultFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/mandatory/dflt/MandatoryFacetOnParametersDefaultFactory.java
index be6f573667..4a10367e2c 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/mandatory/dflt/MandatoryFacetOnParametersDefaultFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/mandatory/dflt/MandatoryFacetOnParametersDefaultFactory.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.ProcessParameterContext;
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/param/parameter/ParameterAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java
index 9a2e6da7f6..28a9c8f95b 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
@@ -18,16 +18,13 @@
*/
package org.apache.causeway.core.metamodel.facets.param.parameter;
-import java.util.Optional;
-
import javax.inject.Inject;
import javax.validation.constraints.Pattern;
-import org.apache.causeway.commons.internal.base._NullSafe;
import org.springframework.core.MethodParameter;
-import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.Parameter;
+import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/depdef/ParameterDependentDefaultsFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/depdef/ParameterDependentDefaultsFacet.java
index 26379db749..10d25a030c 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/depdef/ParameterDependentDefaultsFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/depdef/ParameterDependentDefaultsFacet.java
@@ -21,9 +21,8 @@ package org.apache.causeway.core.metamodel.facets.param.parameter.depdef;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Optionals;
-
import org.apache.causeway.applib.annotation.Parameter;
+import org.apache.causeway.commons.internal.base._Optionals;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.metamodel.facets.ParameterConfigOptions;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/fileaccept/FileAcceptFacetForParameterAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/fileaccept/FileAcceptFacetForParameterAnnotation.java
index 9c23acfda4..c856be5ba7 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/fileaccept/FileAcceptFacetForParameterAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/fileaccept/FileAcceptFacetForParameterAnnotation.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.param.parameter.fileaccept;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.annotation.Parameter;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.objectvalue.fileaccept.FileAcceptFacet;
import org.apache.causeway.core.metamodel.facets.objectvalue.fileaccept.FileAcceptFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/mustsatisfy/MustSatisfySpecificationFacetForParameterAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/mustsatisfy/MustSatisfySpecificationFacetForParameterAnnotation.java
index 6baff2270b..82e4471276 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/mustsatisfy/MustSatisfySpecificationFacetForParameterAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/mustsatisfy/MustSatisfySpecificationFacetForParameterAnnotation.java
@@ -20,11 +20,10 @@ package org.apache.causeway.core.metamodel.facets.param.parameter.mustsatisfy;
import java.util.Optional;
-import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.applib.annotation.Parameter;
import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.spec.Specification;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.objectvalue.mustsatisfyspec.MustSatisfySpecificationFacet;
import org.apache.causeway.core.metamodel.facets.objectvalue.mustsatisfyspec.MustSatisfySpecificationFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/regex/RegExFacetForParameterAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/regex/RegExFacetForParameterAnnotation.java
index 6908a477bb..f4690d8f52 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/regex/RegExFacetForParameterAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/regex/RegExFacetForParameterAnnotation.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.param.parameter.regex;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.annotation.Parameter;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.objectvalue.regex.RegExFacet;
import org.apache.causeway.core.metamodel.facets.objectvalue.regex.RegExFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/regex/RegExFacetForPatternAnnotationOnParameter.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/regex/RegExFacetForPatternAnnotationOnParameter.java
index a3bf63bc54..42784f6fa4 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/regex/RegExFacetForPatternAnnotationOnParameter.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/regex/RegExFacetForPatternAnnotationOnParameter.java
@@ -21,7 +21,6 @@ package org.apache.causeway.core.metamodel.facets.param.parameter.regex;
import java.util.Optional;
import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.objectvalue.regex.RegExFacet;
import org.apache.causeway.core.metamodel.facets.objectvalue.regex.RegExFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/validate/ActionParameterValidationFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/validate/ActionParameterValidationFacet.java
index 09de2898ea..c3dce6947e 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/validate/ActionParameterValidationFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/validate/ActionParameterValidationFacet.java
@@ -19,7 +19,6 @@
package org.apache.causeway.core.metamodel.facets.param.validate;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facets.actions.action.invocation.ActionInvocationFacet;
import org.apache.causeway.core.metamodel.interactions.ValidatingInteractionAdvisor;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/validate/method/ActionParameterValidationFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/validate/method/ActionParameterValidationFacetViaMethod.java
index b59132cfe0..91c0babe8e 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/validate/method/ActionParameterValidationFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/validate/method/ActionParameterValidationFacetViaMethod.java
@@ -23,15 +23,14 @@ import java.lang.reflect.Method;
import java.util.Optional;
import java.util.function.BiConsumer;
-import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.applib.services.i18n.TranslatableString;
import org.apache.causeway.applib.services.i18n.TranslationContext;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.ImperativeFacet;
import org.apache.causeway.core.metamodel.facets.param.validate.ActionParameterValidationFacetAbstract;
-import org.apache.causeway.core.metamodel.object.MmInvokeUtil;
import org.apache.causeway.core.metamodel.object.ManagedObject;
+import org.apache.causeway.core.metamodel.object.MmInvokeUtil;
import lombok.Getter;
import lombok.NonNull;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessor.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessor.java
index 1b0a929542..895c2134cf 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessor.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessor.java
@@ -22,7 +22,6 @@ import java.lang.reflect.Method;
import java.util.function.BiConsumer;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.ImperativeFacet;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessorFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessorFactory.java
index c2ea3ec739..288eba978d 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessorFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessorFactory.java
@@ -24,7 +24,6 @@ import java.util.List;
import javax.inject.Inject;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants;
import org.apache.causeway.core.metamodel.commons.MethodUtil;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethod.java
index 39f58e5979..9439c27eaf 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethod.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethod.java
@@ -22,15 +22,14 @@ import java.lang.reflect.Method;
import java.util.function.BiConsumer;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.ImperativeFacet;
import org.apache.causeway.core.metamodel.facets.param.autocomplete.MinLengthUtil;
import org.apache.causeway.core.metamodel.facets.properties.autocomplete.PropertyAutoCompleteFacetAbstract;
+import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.MmInvokeUtil;
import org.apache.causeway.core.metamodel.object.MmVisibilityUtil;
-import org.apache.causeway.core.metamodel.object.ManagedObject;
import lombok.Getter;
import lombok.NonNull;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethodFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethodFactory.java
index 853206a1d1..0d8a796f04 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethodFactory.java
@@ -23,6 +23,7 @@ import javax.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/choices/PropertyChoicesFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/choices/PropertyChoicesFacet.java
index 820e94985c..575a6a9cfa 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/choices/PropertyChoicesFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/choices/PropertyChoicesFacet.java
@@ -19,7 +19,6 @@
package org.apache.causeway.core.metamodel.facets.properties.choices;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.object.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetFromChoicesFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetFromChoicesFacet.java
index 68d4d0a7ea..a975f3c887 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetFromChoicesFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetFromChoicesFacet.java
@@ -21,8 +21,8 @@ package org.apache.causeway.core.metamodel.facets.properties.choices.enums;
import java.util.Optional;
import org.apache.causeway.commons.collections.Can;
-
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.objectvalue.choices.ChoicesFacet;
import org.apache.causeway.core.metamodel.facets.properties.choices.PropertyChoicesFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethod.java
index 78865c3ae8..90e19a9889 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethod.java
@@ -22,7 +22,6 @@ import java.lang.reflect.Method;
import java.util.function.BiConsumer;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.FacetedMethod;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/defaults/PropertyDefaultFacetNone.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/defaults/PropertyDefaultFacetNone.java
index 51b0e74eca..e2ce869443 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/defaults/PropertyDefaultFacetNone.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/defaults/PropertyDefaultFacetNone.java
@@ -18,6 +18,7 @@
*/
package org.apache.causeway.core.metamodel.facets.properties.defaults;
+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/properties/defaults/method/PropertyDefaultFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethod.java
index 41f9449d93..1f3a3c916e 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethod.java
@@ -21,14 +21,13 @@ package org.apache.causeway.core.metamodel.facets.properties.defaults.method;
import java.lang.reflect.Method;
import java.util.function.BiConsumer;
-import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.applib.exceptions.unrecoverable.UnknownTypeException;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.ImperativeFacet;
import org.apache.causeway.core.metamodel.facets.properties.defaults.PropertyDefaultFacetAbstract;
-import org.apache.causeway.core.metamodel.object.MmInvokeUtil;
import org.apache.causeway.core.metamodel.object.ManagedObject;
+import org.apache.causeway.core.metamodel.object.MmInvokeUtil;
import lombok.Getter;
import lombok.NonNull;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/disabled/fromimmutable/DisabledFacetOnPropertyFromImmutable.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/disabled/fromimmutable/DisabledFacetOnPropertyFromImmutable.java
index d7e8f38155..ef7ca20939 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/disabled/fromimmutable/DisabledFacetOnPropertyFromImmutable.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/disabled/fromimmutable/DisabledFacetOnPropertyFromImmutable.java
@@ -18,9 +18,8 @@
*/
package org.apache.causeway.core.metamodel.facets.properties.disabled.fromimmutable;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.annotation.Where;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.FacetedMethod;
import org.apache.causeway.core.metamodel.facets.members.disabled.DisabledFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
index 4de9a5a070..7d09c735c7 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
@@ -23,12 +23,11 @@ import java.util.Optional;
import javax.inject.Inject;
import javax.validation.constraints.Pattern;
-import org.apache.causeway.commons.internal.base._NullSafe;
-
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.events.domain.PropertyDomainEvent;
import org.apache.causeway.applib.mixins.system.HasInteractionId;
+import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/fileaccept/FileAcceptFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/fileaccept/FileAcceptFacetForPropertyAnnotation.java
index f2f8f6bff0..780a0ae7e8 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/fileaccept/FileAcceptFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/fileaccept/FileAcceptFacetForPropertyAnnotation.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.properties.property.fileaccept
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.annotation.Property;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.objectvalue.fileaccept.FileAcceptFacet;
import org.apache.causeway.core.metamodel.facets.objectvalue.fileaccept.FileAcceptFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/modify/PropertyDomainEventFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/modify/PropertyDomainEventFacetAbstract.java
index 2d898951ec..e48156e112 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/modify/PropertyDomainEventFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/modify/PropertyDomainEventFacetAbstract.java
@@ -20,14 +20,13 @@ package org.apache.causeway.core.metamodel.facets.properties.property.modify;
import java.util.function.BiConsumer;
-import org.apache.causeway.commons.internal.base._Casts;
-
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.events.domain.AbstractDomainEvent;
import org.apache.causeway.applib.events.domain.PropertyDomainEvent;
import org.apache.causeway.applib.services.i18n.TranslatableString;
import org.apache.causeway.applib.services.i18n.TranslationContext;
import org.apache.causeway.applib.services.i18n.TranslationService;
+import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.DomainEventHelper;
import org.apache.causeway.core.metamodel.facets.SingleClassValueFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java
index 924389d69c..f57830b7e5 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java
@@ -21,8 +21,6 @@ package org.apache.causeway.core.metamodel.facets.properties.property.modify;
import java.util.Objects;
import java.util.function.BiConsumer;
-import static org.apache.causeway.commons.internal.base._Casts.uncheckedCast;
-
import org.apache.causeway.applib.events.domain.AbstractDomainEvent;
import org.apache.causeway.applib.events.domain.PropertyDomainEvent;
import org.apache.causeway.applib.services.iactn.PropertyEdit;
@@ -43,6 +41,8 @@ import org.apache.causeway.core.metamodel.object.MmUnwrapUtil;
import org.apache.causeway.core.metamodel.services.ixn.InteractionDtoFactory;
import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
+import static org.apache.causeway.commons.internal.base._Casts.uncheckedCast;
+
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/mustsatisfy/MustSatisfySpecificationFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/mustsatisfy/MustSatisfySpecificationFacetForPropertyAnnotation.java
index 2c51f3749d..8630433753 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/mustsatisfy/MustSatisfySpecificationFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/mustsatisfy/MustSatisfySpecificationFacetForPropertyAnnotation.java
@@ -20,11 +20,10 @@ package org.apache.causeway.core.metamodel.facets.properties.property.mustsatisf
import java.util.Optional;
-import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.spec.Specification;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.objectvalue.mustsatisfyspec.MustSatisfySpecificationFacet;
import org.apache.causeway.core.metamodel.facets.objectvalue.mustsatisfyspec.MustSatisfySpecificationFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/regex/RegExFacetForPatternAnnotationOnProperty.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/regex/RegExFacetForPatternAnnotationOnProperty.java
index 8105c28ab2..91f18b2ce6 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/regex/RegExFacetForPatternAnnotationOnProperty.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/regex/RegExFacetForPatternAnnotationOnProperty.java
@@ -21,7 +21,6 @@ package org.apache.causeway.core.metamodel.facets.properties.property.regex;
import java.util.Optional;
import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.objectvalue.regex.RegExFacet;
import org.apache.causeway.core.metamodel.facets.objectvalue.regex.RegExFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/regex/RegExFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/regex/RegExFacetForPropertyAnnotation.java
index 287b1b2c21..ba3dc1a12c 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/regex/RegExFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/regex/RegExFacetForPropertyAnnotation.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.properties.property.regex;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.annotation.Property;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.objectvalue.regex.RegExFacet;
import org.apache.causeway.core.metamodel.facets.objectvalue.regex.RegExFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyLayoutAnnotation.java
index 554a3a6c74..7f6566b89e 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyLayoutAnnotation.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.properties.propertylayout;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.annotation.PropertyLayout;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.members.cssclass.CssClassFacetSimple;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyLayoutXml.java
index dc55dd46de..d143c01300 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyLayoutXml.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyLayoutXml.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.properties.propertylayout;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.layout.component.PropertyLayoutData;
+import org.apache.causeway.commons.internal.base._Strings;
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/properties/propertylayout/MemberDescribedFacetForPropertyLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/MemberDescribedFacetForPropertyLayoutAnnotation.java
index 5c86def419..44ad792964 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/MemberDescribedFacetForPropertyLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/MemberDescribedFacetForPropertyLayoutAnnotation.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.properties.propertylayout;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.annotation.PropertyLayout;
+import org.apache.causeway.commons.internal.base._Strings;
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/MemberDescribedFacetForPropertyLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/MemberDescribedFacetForPropertyLayoutXml.java
index b54e59895e..966e7dad42 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
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.properties.propertylayout;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.layout.component.PropertyLayoutData;
+import org.apache.causeway.commons.internal.base._Strings;
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/MemberNamedFacetForPropertyLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/MemberNamedFacetForPropertyLayoutXml.java
index 0b08efc7e6..bb2268b2c0 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/MemberNamedFacetForPropertyLayoutXml.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/MemberNamedFacetForPropertyLayoutXml.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.properties.propertylayout;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.layout.component.PropertyLayoutData;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.all.named.MemberNamedFacet;
import org.apache.causeway.core.metamodel.facets.all.named.MemberNamedFacetWithStaticTextAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/NamedFacetForPropertyLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/NamedFacetForPropertyLayoutAnnotation.java
index 49ca24e085..d0807fda81 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/NamedFacetForPropertyLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/NamedFacetForPropertyLayoutAnnotation.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.properties.propertylayout;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.annotation.PropertyLayout;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.all.named.MemberNamedFacet;
import org.apache.causeway.core.metamodel.facets.all.named.MemberNamedFacetWithStaticTextAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/PromptStyleFacetForPropertyLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/PromptStyleFacetForPropertyLayoutAnnotation.java
index a9f9bce766..3904edd518 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/PromptStyleFacetForPropertyLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/PromptStyleFacetForPropertyLayoutAnnotation.java
@@ -21,10 +21,9 @@ package org.apache.causeway.core.metamodel.facets.properties.propertylayout;
import java.util.Optional;
import java.util.function.BiConsumer;
-import org.apache.causeway.commons.internal.base._Optionals;
-
import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.applib.annotation.PropertyLayout;
+import org.apache.causeway.commons.internal.base._Optionals;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/update/PropertySetterFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/update/PropertySetterFacetFactory.java
index 6bd4a78d51..7b6755e425 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/update/PropertySetterFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/update/PropertySetterFacetFactory.java
@@ -23,7 +23,6 @@ import java.lang.reflect.Method;
import javax.inject.Inject;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants.AccessorPrefix;
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants.ReturnTypeCategory;
import org.apache.causeway.core.metamodel.commons.StringExtensions;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/update/clear/PropertyClearFacetViaClearMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/update/clear/PropertyClearFacetViaClearMethod.java
index e7df672919..cc498372a2 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/update/clear/PropertyClearFacetViaClearMethod.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/update/clear/PropertyClearFacetViaClearMethod.java
@@ -22,12 +22,11 @@ import java.lang.reflect.Method;
import java.util.function.BiConsumer;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.ImperativeFacet;
-import org.apache.causeway.core.metamodel.object.MmInvokeUtil;
import org.apache.causeway.core.metamodel.object.ManagedObject;
+import org.apache.causeway.core.metamodel.object.MmInvokeUtil;
import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
import lombok.Getter;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/update/clear/PropertyClearFacetViaSetterMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/update/clear/PropertyClearFacetViaSetterMethod.java
index 645702a74b..ca074bb5cc 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/update/clear/PropertyClearFacetViaSetterMethod.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/update/clear/PropertyClearFacetViaSetterMethod.java
@@ -22,12 +22,11 @@ import java.lang.reflect.Method;
import java.util.function.BiConsumer;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.ImperativeFacet;
-import org.apache.causeway.core.metamodel.object.MmInvokeUtil;
import org.apache.causeway.core.metamodel.object.ManagedObject;
+import org.apache.causeway.core.metamodel.object.MmInvokeUtil;
import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
import lombok.Getter;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/update/init/PropertyInitializationFacetViaSetterMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/update/init/PropertyInitializationFacetViaSetterMethod.java
index dba804e8f6..ee113af5c7 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/update/init/PropertyInitializationFacetViaSetterMethod.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/update/init/PropertyInitializationFacetViaSetterMethod.java
@@ -22,11 +22,10 @@ import java.lang.reflect.Method;
import java.util.function.BiConsumer;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.ImperativeFacet;
-import org.apache.causeway.core.metamodel.object.MmInvokeUtil;
import org.apache.causeway.core.metamodel.object.ManagedObject;
+import org.apache.causeway.core.metamodel.object.MmInvokeUtil;
import lombok.Getter;
import lombok.NonNull;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/update/modify/PropertySetterFacetViaSetterMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/update/modify/PropertySetterFacetViaSetterMethod.java
index 905cec4040..c3781a8c59 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/update/modify/PropertySetterFacetViaSetterMethod.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/update/modify/PropertySetterFacetViaSetterMethod.java
@@ -22,12 +22,11 @@ import java.lang.reflect.Method;
import java.util.function.BiConsumer;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.ImperativeFacet;
-import org.apache.causeway.core.metamodel.object.MmInvokeUtil;
import org.apache.causeway.core.metamodel.object.ManagedObject;
+import org.apache.causeway.core.metamodel.object.MmInvokeUtil;
import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
import lombok.Getter;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/validating/PropertyValidateFacetNone.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/validating/PropertyValidateFacetNone.java
index b785491167..f91cebdb75 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/validating/PropertyValidateFacetNone.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/validating/PropertyValidateFacetNone.java
@@ -18,6 +18,7 @@
*/
package org.apache.causeway.core.metamodel.facets.properties.validating;
+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/properties/validating/method/PropertyValidateFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/validating/method/PropertyValidateFacetViaMethod.java
index 2984453f9a..41cd4469ac 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/validating/method/PropertyValidateFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/validating/method/PropertyValidateFacetViaMethod.java
@@ -21,15 +21,14 @@ package org.apache.causeway.core.metamodel.facets.properties.validating.method;
import java.lang.reflect.Method;
import java.util.function.BiConsumer;
-import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.applib.services.i18n.TranslatableString;
import org.apache.causeway.applib.services.i18n.TranslationContext;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.ImperativeFacet;
import org.apache.causeway.core.metamodel.facets.properties.validating.PropertyValidateFacetAbstract;
-import org.apache.causeway.core.metamodel.object.MmInvokeUtil;
import org.apache.causeway.core.metamodel.object.ManagedObject;
+import org.apache.causeway.core.metamodel.object.MmInvokeUtil;
public class PropertyValidateFacetViaMethod extends PropertyValidateFacetAbstract implements ImperativeFacet {
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/value/semantics/ValueSemanticsSelectingFacetForAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/value/semantics/ValueSemanticsSelectingFacetForAnnotation.java
index 00df9c7f8e..b60da1563a 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/value/semantics/ValueSemanticsSelectingFacetForAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/value/semantics/ValueSemanticsSelectingFacetForAnnotation.java
@@ -20,9 +20,8 @@ package org.apache.causeway.core.metamodel.facets.value.semantics;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.annotation.ValueSemantics;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.objectvalue.valuesemantics.ValueSemanticsSelectingFacet;
import org.apache.causeway.core.metamodel.facets.objectvalue.valuesemantics.ValueSemanticsSelectingFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/inspect/Object_inspectMetamodel.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/inspect/Object_inspectMetamodel.java
index e5f48b563d..a2c691a587 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/inspect/Object_inspectMetamodel.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/inspect/Object_inspectMetamodel.java
@@ -23,8 +23,6 @@ import java.util.Optional;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
-
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
import org.apache.causeway.applib.annotation.MemberSupport;
@@ -38,6 +36,7 @@ import org.apache.causeway.applib.layout.LayoutConstants;
import org.apache.causeway.applib.services.message.MessageService;
import org.apache.causeway.applib.services.metamodel.Config;
import org.apache.causeway.applib.services.metamodel.MetaModelService;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.metamodel.inspect.model.MMNodeFactory;
import org.apache.causeway.core.metamodel.inspect.model.MMTreeAdapter;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/inspect/model/FacetGroupNode.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/inspect/model/FacetGroupNode.java
index 8dac9935d0..085eedf66a 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/inspect/model/FacetGroupNode.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/inspect/model/FacetGroupNode.java
@@ -26,14 +26,13 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
-import org.apache.causeway.commons.internal.base._NullSafe;
-
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Introspection;
import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.Where;
+import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.schema.metamodel.v2.FacetHolder.Facets;
import org.apache.causeway.schema.metamodel.v2.MetamodelElement;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/inspect/model/FacetNode.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/inspect/model/FacetNode.java
index d0dd10ce6f..0c2d4bde1c 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/inspect/model/FacetNode.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/inspect/model/FacetNode.java
@@ -26,14 +26,13 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
-import org.apache.causeway.commons.internal.base._NullSafe;
-
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Introspection;
import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.Where;
+import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.schema.metamodel.v2.Annotation;
import org.apache.causeway.schema.metamodel.v2.Facet;
import org.apache.causeway.schema.metamodel.v2.FacetAttr;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/inspect/model/MMNode.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/inspect/model/MMNode.java
index b8edd6d92d..9d03fe23bb 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/inspect/model/MMNode.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/inspect/model/MMNode.java
@@ -29,14 +29,13 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlSeeAlso;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.annotation.Collection;
import org.apache.causeway.applib.annotation.Navigable;
import org.apache.causeway.applib.annotation.ObjectSupport;
import org.apache.causeway.applib.annotation.Programmatic;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Where;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.schema.metamodel.v2.Annotation;
import org.apache.causeway.schema.metamodel.v2.FacetHolder;
import org.apache.causeway.schema.metamodel.v2.MetamodelElement;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/inspect/model/MMTreeAdapter.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/inspect/model/MMTreeAdapter.java
index cddc70d220..401f230b39 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/inspect/model/MMTreeAdapter.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/inspect/model/MMTreeAdapter.java
@@ -21,9 +21,8 @@ package org.apache.causeway.core.metamodel.inspect.model;
import java.util.Optional;
import java.util.stream.Stream;
-import org.apache.causeway.commons.internal.base._NullSafe;
-
import org.apache.causeway.applib.graph.tree.TreeAdapter;
+import org.apache.causeway.commons.internal.base._NullSafe;
public class MMTreeAdapter implements TreeAdapter<MMNode> {
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/inspect/model/TypeNode.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/inspect/model/TypeNode.java
index 3347422c2a..ab47599d6e 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/inspect/model/TypeNode.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/inspect/model/TypeNode.java
@@ -27,14 +27,13 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
-import org.apache.causeway.commons.internal.collections._Streams;
-
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Introspection;
import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.Where;
+import org.apache.causeway.commons.internal.collections._Streams;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
import org.apache.causeway.schema.metamodel.v2.Annotation;
import org.apache.causeway.schema.metamodel.v2.DomainClassDto;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/ActionArgUsabilityContext.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/ActionArgUsabilityContext.java
index ed2fe5215f..d0c73c19a5 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/ActionArgUsabilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/ActionArgUsabilityContext.java
@@ -18,12 +18,11 @@
*/
package org.apache.causeway.core.metamodel.interactions;
-import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.events.ActionArgumentUsabilityEvent;
import org.apache.causeway.applib.services.wrapper.events.ActionArgumentEvent;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.consent.InteractionContextType;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.object.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/ActionArgValidityContext.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/ActionArgValidityContext.java
index cb01d9dad4..4b68eb8996 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/ActionArgValidityContext.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/ActionArgValidityContext.java
@@ -18,10 +18,9 @@
*/
package org.apache.causeway.core.metamodel.interactions;
-import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.services.wrapper.events.ActionArgumentEvent;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.consent.InteractionContextType;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.object.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/ActionArgVisibilityContext.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/ActionArgVisibilityContext.java
index e438208dd8..9b6478b310 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/ActionArgVisibilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/ActionArgVisibilityContext.java
@@ -18,12 +18,11 @@
*/
package org.apache.causeway.core.metamodel.interactions;
-import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.events.ActionArgumentVisibilityEvent;
import org.apache.causeway.applib.services.wrapper.events.ActionArgumentEvent;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.consent.InteractionContextType;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.object.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/ActionValidityContext.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/ActionValidityContext.java
index 898f2cd58f..d8c25ad508 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/ActionValidityContext.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/ActionValidityContext.java
@@ -18,10 +18,9 @@
*/
package org.apache.causeway.core.metamodel.interactions;
-import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.services.wrapper.events.ActionInvocationEvent;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.consent.InteractionContextType;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.object.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/InteractionHead.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/InteractionHead.java
index dd0235df5e..a1af639dc6 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/InteractionHead.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/InteractionHead.java
@@ -22,7 +22,6 @@ import java.util.Objects;
import java.util.Optional;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
-
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.ManagedObjects;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ActionInteraction.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ActionInteraction.java
index a386dc8f1c..3a72472f43 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ActionInteraction.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ActionInteraction.java
@@ -21,12 +21,11 @@ package org.apache.causeway.core.metamodel.interactions.managed;
import java.util.Optional;
import java.util.function.Function;
+import org.apache.causeway.applib.Identifier;
+import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.functional.Railway;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
-
-import org.apache.causeway.applib.Identifier;
-import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.core.metamodel.facets.object.value.ValueFacet;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.ManagedObjects;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ActionInteractionHead.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ActionInteractionHead.java
index 72eda072e4..2929cd8e9e 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ActionInteractionHead.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ActionInteractionHead.java
@@ -21,12 +21,12 @@ package org.apache.causeway.core.metamodel.interactions.managed;
import java.util.List;
import java.util.function.UnaryOperator;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.functional.Either;
import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.causeway.commons.internal.base._NullSafe;
-import org.springframework.lang.Nullable;
-
import org.apache.causeway.core.metamodel.interactions.InteractionHead;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ManagedAction.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ManagedAction.java
index a51088fb1b..bb8508d794 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ManagedAction.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ManagedAction.java
@@ -21,11 +21,6 @@ package org.apache.causeway.core.metamodel.interactions.managed;
import java.io.Serializable;
import java.util.Optional;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.functional.Railway;
-import org.apache.causeway.commons.internal.assertions._Assert;
-import org.apache.causeway.commons.internal.base._Lazy;
-import org.apache.causeway.commons.internal.base._NullSafe;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.Identifier;
@@ -33,6 +28,11 @@ import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.services.inject.ServiceInjector;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
import org.apache.causeway.applib.services.routing.RoutingService;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.functional.Railway;
+import org.apache.causeway.commons.internal.assertions._Assert;
+import org.apache.causeway.commons.internal.base._Lazy;
+import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.object.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ManagedCollection.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ManagedCollection.java
index ef78fd9e93..633a7d2732 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ManagedCollection.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ManagedCollection.java
@@ -21,10 +21,9 @@ package org.apache.causeway.core.metamodel.interactions.managed;
import java.util.Optional;
import java.util.stream.Stream;
-import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.annotation.Where;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.facets.collections.CollectionFacet;
import org.apache.causeway.core.metamodel.interactions.managed.nonscalar.DataTableModel;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ManagedFeature.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ManagedFeature.java
index 2ef04ddb7e..e075aef46a 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ManagedFeature.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ManagedFeature.java
@@ -20,10 +20,10 @@ package org.apache.causeway.core.metamodel.interactions.managed;
import java.util.Optional;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.Identifier;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.spec.feature.ObjectFeature;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ManagedMember.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ManagedMember.java
index 40cc49216e..ddb8fb23ac 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ManagedMember.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ManagedMember.java
@@ -20,10 +20,9 @@ package org.apache.causeway.core.metamodel.interactions.managed;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Casts;
-
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.annotation.Where;
+import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.consent.Veto;
import org.apache.causeway.core.metamodel.object.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ManagedParameter.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ManagedParameter.java
index 6500351362..b66faf726c 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ManagedParameter.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ManagedParameter.java
@@ -21,7 +21,6 @@ package org.apache.causeway.core.metamodel.interactions.managed;
import java.util.Optional;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.consent.Veto;
import org.apache.causeway.core.metamodel.object.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ManagedProperty.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ManagedProperty.java
index c0f546f310..625603daf3 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ManagedProperty.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ManagedProperty.java
@@ -20,14 +20,14 @@ package org.apache.causeway.core.metamodel.interactions.managed;
import java.util.Optional;
-import org.apache.causeway.commons.binding.Observable;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.binding._Observables;
-import org.apache.causeway.commons.internal.binding._Observables.LazyObservable;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.annotation.Where;
+import org.apache.causeway.commons.binding.Observable;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.binding._Observables;
+import org.apache.causeway.commons.internal.binding._Observables.LazyObservable;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.consent.Veto;
import org.apache.causeway.core.metamodel.object.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ManagedValue.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ManagedValue.java
index dd0691640b..2085635a7a 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ManagedValue.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ManagedValue.java
@@ -20,12 +20,11 @@ package org.apache.causeway.core.metamodel.interactions.managed;
import java.util.function.UnaryOperator;
+import org.apache.causeway.applib.value.semantics.Parser;
+import org.apache.causeway.applib.value.semantics.Renderer;
import org.apache.causeway.commons.binding.Bindable;
import org.apache.causeway.commons.binding.Observable;
import org.apache.causeway.commons.collections.Can;
-
-import org.apache.causeway.applib.value.semantics.Parser;
-import org.apache.causeway.applib.value.semantics.Renderer;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.ManagedObjects;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/MultiselectChoices.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/MultiselectChoices.java
index f1e05dc4c1..866d130448 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/MultiselectChoices.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/MultiselectChoices.java
@@ -19,7 +19,6 @@
package org.apache.causeway.core.metamodel.interactions.managed;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.object.ManagedObject;
@FunctionalInterface
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ParameterNegotiationModel.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ParameterNegotiationModel.java
index 18977531ee..e4e229c15c 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ParameterNegotiationModel.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ParameterNegotiationModel.java
@@ -22,18 +22,18 @@ import java.util.Objects;
import java.util.Optional;
import java.util.stream.IntStream;
+import org.springframework.lang.Nullable;
+
+import org.apache.causeway.applib.Identifier;
import org.apache.causeway.commons.binding.Bindable;
import org.apache.causeway.commons.binding.Observable;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.binding._BindableAbstract;
import org.apache.causeway.commons.internal.binding._Bindables;
-import org.apache.causeway.commons.internal.binding._Observables;
import org.apache.causeway.commons.internal.binding._Bindables.BooleanBindable;
+import org.apache.causeway.commons.internal.binding._Observables;
import org.apache.causeway.commons.internal.binding._Observables.LazyObservable;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
-import org.springframework.lang.Nullable;
-
-import org.apache.causeway.applib.Identifier;
import org.apache.causeway.core.metamodel.consent.Consent;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.consent.InteractionResult;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/PropertyNegotiationModel.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/PropertyNegotiationModel.java
index 69f9d832bf..20c2a99f31 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/PropertyNegotiationModel.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/PropertyNegotiationModel.java
@@ -28,7 +28,6 @@ import org.apache.causeway.commons.internal.binding._Observables.BooleanObservab
import org.apache.causeway.commons.internal.binding._Observables.LazyObservable;
import org.apache.causeway.commons.internal.debug._Debug;
import org.apache.causeway.commons.internal.debug.xray.XrayUi;
-
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.interactions.managed._BindingUtil.TargetFormat;
import org.apache.causeway.core.metamodel.object.ManagedObject;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/_BindingUtil.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/_BindingUtil.java
index 127a818d0f..fa4a0dca5b 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/_BindingUtil.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/_BindingUtil.java
@@ -18,15 +18,14 @@
*/
package org.apache.causeway.core.metamodel.interactions.managed;
+import org.apache.causeway.applib.value.semantics.Parser;
+import org.apache.causeway.applib.value.semantics.Renderer;
+import org.apache.causeway.applib.value.semantics.ValueSemanticsProvider;
import org.apache.causeway.commons.binding.Observable;
import org.apache.causeway.commons.functional.Either;
import org.apache.causeway.commons.internal.binding._BindableAbstract;
import org.apache.causeway.commons.internal.binding._Bindables;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
-
-import org.apache.causeway.applib.value.semantics.Parser;
-import org.apache.causeway.applib.value.semantics.Renderer;
-import org.apache.causeway.applib.value.semantics.ValueSemanticsProvider;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.MmUnwrapUtil;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/nonscalar/DataColumn.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/nonscalar/DataColumn.java
index 71d83f8479..c590b1c7ed 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/nonscalar/DataColumn.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/nonscalar/DataColumn.java
@@ -22,7 +22,6 @@ import java.util.Optional;
import org.apache.causeway.commons.internal.binding._Observables;
import org.apache.causeway.commons.internal.binding._Observables.LazyObservable;
-
import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
import lombok.Getter;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/nonscalar/DataRow.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/nonscalar/DataRow.java
index 916cde5a26..609d250d49 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/nonscalar/DataRow.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/nonscalar/DataRow.java
@@ -22,7 +22,6 @@ import java.util.UUID;
import org.apache.causeway.commons.internal.binding._Bindables;
import org.apache.causeway.commons.internal.binding._Bindables.BooleanBindable;
-
import org.apache.causeway.core.metamodel.object.ManagedObject;
import lombok.Getter;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/nonscalar/DataTableModel.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/nonscalar/DataTableModel.java
index 94502344c3..9843aa5071 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/nonscalar/DataTableModel.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/nonscalar/DataTableModel.java
@@ -25,6 +25,10 @@ import java.util.UUID;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Supplier;
+import org.springframework.lang.Nullable;
+
+import org.apache.causeway.applib.Identifier;
+import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.binding._BindableAbstract;
import org.apache.causeway.commons.internal.binding._Bindables;
@@ -32,10 +36,6 @@ import org.apache.causeway.commons.internal.binding._Observables;
import org.apache.causeway.commons.internal.binding._Observables.LazyObservable;
import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
-import org.springframework.lang.Nullable;
-
-import org.apache.causeway.applib.Identifier;
-import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.consent.InteractionResult;
import org.apache.causeway.core.metamodel.interactions.InteractionHead;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/layout/DeweyOrderSet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/layout/DeweyOrderSet.java
index 4a96b2b9af..fdad937dae 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/layout/DeweyOrderSet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/layout/DeweyOrderSet.java
@@ -31,7 +31,6 @@ import java.util.TreeSet;
import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.commons.internal.collections._Sets;
-
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.FacetedMethod;
import org.apache.causeway.core.metamodel.facets.members.layout.group.LayoutGroupFacet;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/layout/LayoutFacetUtil.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/layout/LayoutFacetUtil.java
index 2de6b93d2f..9ef2914b86 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/layout/LayoutFacetUtil.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/layout/LayoutFacetUtil.java
@@ -20,9 +20,6 @@ package org.apache.causeway.core.metamodel.layout;
import java.util.Comparator;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.functions._Functions;
-
import org.apache.causeway.applib.annotation.ActionLayout;
import org.apache.causeway.applib.annotation.BookmarkPolicy;
import org.apache.causeway.applib.annotation.LabelPosition;
@@ -38,6 +35,8 @@ import org.apache.causeway.applib.layout.component.HasHidden;
import org.apache.causeway.applib.layout.component.HasNamed;
import org.apache.causeway.applib.layout.component.PropertyLayoutData;
import org.apache.causeway.applib.layout.grid.Grid;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.functions._Functions;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.actions.position.ActionPositionFacet;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/layout/memberorderfacet/MemberOrderComparator.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/layout/memberorderfacet/MemberOrderComparator.java
index 0692e7fff4..476ede5924 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/layout/memberorderfacet/MemberOrderComparator.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/layout/memberorderfacet/MemberOrderComparator.java
@@ -21,7 +21,6 @@ package org.apache.causeway.core.metamodel.layout.memberorderfacet;
import java.util.Comparator;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
-
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.FacetedMethod;
import org.apache.causeway.core.metamodel.facets.members.layout.order.LayoutOrderFacet;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/methods/DomainIncludeAnnotationEnforcesMetamodelContributionValidator.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/methods/DomainIncludeAnnotationEnforcesMetamodelContributionValidator.java
index ff69bcc84f..3b1d4fdd39 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/methods/DomainIncludeAnnotationEnforcesMetamodelContributionValidator.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/methods/DomainIncludeAnnotationEnforcesMetamodelContributionValidator.java
@@ -28,14 +28,13 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
+import org.apache.causeway.applib.annotation.Domain;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.commons.internal.collections._Sets;
import org.apache.causeway.commons.internal.reflection._Annotations;
import org.apache.causeway.commons.internal.reflection._ClassCache;
import org.apache.causeway.commons.internal.reflection._Reflect;
-
-import org.apache.causeway.applib.annotation.Domain;
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants.Validation;
import org.apache.causeway.core.metamodel.commons.MethodUtil;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/methods/MethodFinder.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/methods/MethodFinder.java
index 1a4d4d4b1f..8a8e1cbf37 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/methods/MethodFinder.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/methods/MethodFinder.java
@@ -24,17 +24,17 @@ import java.util.Arrays;
import java.util.function.Predicate;
import java.util.stream.Stream;
+import org.springframework.lang.Nullable;
+
+import org.apache.causeway.applib.annotation.Domain;
+import org.apache.causeway.applib.annotation.Introspection.EncapsulationPolicy;
+import org.apache.causeway.applib.annotation.Introspection.IntrospectionPolicy;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.internal.functions._Predicates;
import org.apache.causeway.commons.internal.reflection._Annotations;
import org.apache.causeway.commons.internal.reflection._ClassCache;
import org.apache.causeway.commons.internal.reflection._Reflect;
-import org.springframework.lang.Nullable;
-
-import org.apache.causeway.applib.annotation.Domain;
-import org.apache.causeway.applib.annotation.Introspection.EncapsulationPolicy;
-import org.apache.causeway.applib.annotation.Introspection.IntrospectionPolicy;
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants;
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants.ConflictingAnnotations;
import org.apache.causeway.core.metamodel.commons.MethodUtil;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/methods/MethodFinderPAT.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/methods/MethodFinderPAT.java
index 1f26a03d5b..bd19046dc7 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/methods/MethodFinderPAT.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/methods/MethodFinderPAT.java
@@ -23,10 +23,10 @@ import java.lang.reflect.Method;
import java.util.Optional;
import java.util.stream.Stream;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.reflection._ClassCache;
import org.springframework.util.ClassUtils;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.reflection._ClassCache;
import org.apache.causeway.core.metamodel.commons.ClassExtensions;
import org.apache.causeway.core.metamodel.commons.MethodUtil;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/methods/MethodPrefixBasedFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/methods/MethodPrefixBasedFacetFactory.java
index 59584fbffb..30cc37cfc9 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/methods/MethodPrefixBasedFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/methods/MethodPrefixBasedFacetFactory.java
@@ -19,7 +19,6 @@
package org.apache.causeway.core.metamodel.methods;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.facetapi.MetaModelRefiner;
import org.apache.causeway.core.metamodel.facets.FacetFactory;
import org.apache.causeway.core.metamodel.specloader.facetprocessor.FacetProcessor;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/methods/MethodPrefixBasedFacetFactoryAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/methods/MethodPrefixBasedFacetFactoryAbstract.java
index 172bd95b80..ddab2f6ea8 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/methods/MethodPrefixBasedFacetFactoryAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/methods/MethodPrefixBasedFacetFactoryAbstract.java
@@ -20,7 +20,6 @@ package org.apache.causeway.core.metamodel.methods;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.collections.ImmutableEnumSet;
-
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;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/Bookmarkable.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/Bookmarkable.java
index 25f8cb7114..b674d94986 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/Bookmarkable.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/Bookmarkable.java
@@ -21,10 +21,9 @@ package org.apache.causeway.core.metamodel.object;
import java.io.Serializable;
import java.util.Optional;
+import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
-
-import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.core.metamodel.object.ManagedObject.Specialization.BookmarkPolicy;
import org.apache.causeway.core.metamodel.objectmanager.ObjectManager;
import org.apache.causeway.core.metamodel.objectmanager.memento.ObjectMemento;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/ManagedObject.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/ManagedObject.java
index 2338555ad0..a47f960251 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/ManagedObject.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/ManagedObject.java
@@ -21,13 +21,13 @@ package org.apache.causeway.core.metamodel.object;
import java.util.Optional;
import java.util.function.Supplier;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.functional.Either;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.repository.EntityState;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.functional.Either;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
import org.apache.causeway.core.metamodel.facets.object.icon.ObjectIcon;
import org.apache.causeway.core.metamodel.object.ManagedObject.Specialization.BookmarkPolicy;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/ManagedObjects.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/ManagedObjects.java
index 5e5636c013..3d297fbd0d 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/ManagedObjects.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/ManagedObjects.java
@@ -24,18 +24,18 @@ import java.util.Objects;
import java.util.Optional;
import java.util.function.Supplier;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.functional.Try;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.base._Objects;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.springframework.lang.Nullable;
import org.springframework.util.ClassUtils;
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.i18n.TranslatableString;
import org.apache.causeway.applib.services.i18n.TranslationContext;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.functional.Try;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.commons.internal.base._NullSafe;
+import org.apache.causeway.commons.internal.base._Objects;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.metamodel.commons.ClassExtensions;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/MmAssertionUtil.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/MmAssertionUtil.java
index 0ecca0ffa6..cf3b56539e 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/MmAssertionUtil.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/MmAssertionUtil.java
@@ -20,11 +20,11 @@ package org.apache.causeway.core.metamodel.object;
import java.util.function.UnaryOperator;
-import org.apache.causeway.commons.internal.assertions._Assert;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.springframework.lang.Nullable;
import org.springframework.util.ClassUtils;
+import org.apache.causeway.commons.internal.assertions._Assert;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants;
import org.apache.causeway.core.metamodel.commons.ClassUtil;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/MmDebugUtil.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/MmDebugUtil.java
index b5d7eb12ce..7ff073a015 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/MmDebugUtil.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/MmDebugUtil.java
@@ -21,7 +21,6 @@ package org.apache.causeway.core.metamodel.object;
import java.util.stream.Collectors;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.interactions.managed.ManagedParameter;
import org.apache.causeway.core.metamodel.interactions.managed.ParameterNegotiationModel;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/MmEntityUtil.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/MmEntityUtil.java
index 369672d04a..5c3de0e3ec 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/MmEntityUtil.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/MmEntityUtil.java
@@ -20,11 +20,11 @@ package org.apache.causeway.core.metamodel.object;
import java.util.Optional;
-import org.apache.causeway.commons.internal.assertions._Assert;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.services.repository.EntityState;
+import org.apache.causeway.commons.internal.assertions._Assert;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.config.beans.PersistenceStack;
import org.apache.causeway.core.metamodel.facets.object.entity.EntityFacet;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/MmInvokeUtil.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/MmInvokeUtil.java
index 394021fd59..2ec95ac3fc 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/MmInvokeUtil.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/MmInvokeUtil.java
@@ -24,10 +24,10 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.collections._Arrays;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.collections._Arrays;
import org.apache.causeway.core.metamodel.commons.CanonicalInvoker;
import org.apache.causeway.core.metamodel.commons.ClassExtensions;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/MmUnwrapUtil.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/MmUnwrapUtil.java
index 93fc1fa5b5..29be43a8d6 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/MmUnwrapUtil.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/MmUnwrapUtil.java
@@ -23,11 +23,12 @@ import java.util.Collections;
import java.util.List;
import java.util.Set;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.collections._Arrays;
import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.commons.internal.collections._Sets;
-import org.springframework.lang.Nullable;
import lombok.NonNull;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/MmVisibilityUtil.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/MmVisibilityUtil.java
index a0fd1a1296..9ae30ec8cd 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/MmVisibilityUtil.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/MmVisibilityUtil.java
@@ -21,9 +21,8 @@ package org.apache.causeway.core.metamodel.object;
import java.util.function.Predicate;
import java.util.stream.Stream;
-import org.apache.causeway.commons.internal.collections._Arrays;
-
import org.apache.causeway.applib.annotation.Where;
+import org.apache.causeway.commons.internal.collections._Arrays;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.facets.collections.CollectionFacet;
import org.apache.causeway.core.metamodel.interactions.InteractionHead;
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 6fb25f18f5..ab96e9a10e 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
@@ -20,15 +20,15 @@ package org.apache.causeway.core.metamodel.object;
import java.util.Optional;
-import org.apache.causeway.commons.internal.debug._Debug;
-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.springframework.lang.Nullable;
import org.apache.causeway.applib.exceptions.unrecoverable.ObjectNotFoundException;
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.repository.EntityState;
+import org.apache.causeway.commons.internal.debug._Debug;
+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.spec.ObjectSpecification;
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 bdd11f4a90..ac6f3272ac 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
@@ -20,12 +20,12 @@ package org.apache.causeway.core.metamodel.object;
import java.util.Optional;
+import org.apache.causeway.applib.services.bookmark.Bookmark;
+import org.apache.causeway.applib.services.repository.EntityState;
import org.apache.causeway.commons.functional.Either;
import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.causeway.commons.internal.base._Blackhole;
-
-import org.apache.causeway.applib.services.bookmark.Bookmark;
-import org.apache.causeway.applib.services.repository.EntityState;
+import org.apache.causeway.core.metamodel.object.ManagedObject.Specialization;
import lombok.NonNull;
import lombok.Synchronized;
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 826e2eca31..5d8a63b9b9 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
@@ -18,9 +18,8 @@
*/
package org.apache.causeway.core.metamodel.object;
-import org.apache.causeway.commons.internal.assertions._Assert;
-
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.spec.ObjectSpecification;
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 1eb5c85d7e..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,7 +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/object/_ManagedObjectOther.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectOther.java
index 56a59b8286..d04a24ac3e 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectOther.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectOther.java
@@ -19,7 +19,6 @@
package org.apache.causeway.core.metamodel.object;
import org.apache.causeway.commons.internal.assertions._Assert;
-
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/_ManagedObjectPacked.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectPacked.java
index c523988edb..16d134c23b 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectPacked.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectPacked.java
@@ -21,9 +21,9 @@ package org.apache.causeway.core.metamodel.object;
import java.util.Collections;
import java.util.stream.Collectors;
-import org.apache.causeway.commons.collections.Can;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.collections.Can;
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/_ManagedObjectService.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectService.java
index 6cc7bbe738..b852235e53 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectService.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectService.java
@@ -20,10 +20,9 @@ package org.apache.causeway.core.metamodel.object;
import java.util.Optional;
+import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.causeway.commons.internal.base._Lazy;
-
-import org.apache.causeway.applib.services.bookmark.Bookmark;
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/_ManagedObjectSpecified.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectSpecified.java
index 2393660211..1958790b7e 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectSpecified.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectSpecified.java
@@ -24,11 +24,11 @@ import java.util.Optional;
import java.util.function.Supplier;
import java.util.stream.Collectors;
-import org.apache.causeway.commons.internal.assertions._Assert;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.services.bookmark.Bookmark;
+import org.apache.causeway.commons.internal.assertions._Assert;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facets.object.title.TitleRenderRequest;
import org.apache.causeway.core.metamodel.objectmanager.memento.ObjectMemento;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectUnspecified.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectUnspecified.java
index a4baa6fb0b..c60b8ea56c 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectUnspecified.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectUnspecified.java
@@ -22,7 +22,6 @@ import java.util.Objects;
import java.util.function.Supplier;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
-
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectValue.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectValue.java
index e090618ef2..2a7eb8ee0a 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectValue.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectValue.java
@@ -20,11 +20,10 @@ package org.apache.causeway.core.metamodel.object;
import java.util.Optional;
+import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.commons.internal.base._Lazy;
-
-import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.core.metamodel.facets.object.value.ValueFacet;
import org.apache.causeway.core.metamodel.facets.object.value.ValueSerializer.Format;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectViewmodel.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectViewmodel.java
index 893c88b825..db00449a25 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectViewmodel.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_ManagedObjectViewmodel.java
@@ -24,12 +24,12 @@ import java.util.UUID;
import java.util.function.Supplier;
import java.util.function.UnaryOperator;
-import org.apache.causeway.commons.internal.assertions._Assert;
-import org.apache.causeway.commons.internal.base._Lazy;
-import org.apache.causeway.commons.internal.debug._XrayEvent;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.services.bookmark.Bookmark;
+import org.apache.causeway.commons.internal.assertions._Assert;
+import org.apache.causeway.commons.internal.base._Lazy;
+import org.apache.causeway.commons.internal.debug._XrayEvent;
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/ObjectBulkLoader.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/objectmanager/ObjectBulkLoader.java
index 205d3ddb2a..b319f2febe 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/objectmanager/ObjectBulkLoader.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/objectmanager/ObjectBulkLoader.java
@@ -20,11 +20,10 @@ package org.apache.causeway.core.metamodel.objectmanager;
import java.util.List;
+import org.apache.causeway.applib.query.Query;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.handler.ChainOfResponsibility;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
-
-import org.apache.causeway.applib.query.Query;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
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/objectmanager/ObjectCreator.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/objectmanager/ObjectCreator.java
index eba507fe70..4c6d4e90ec 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/objectmanager/ObjectCreator.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/objectmanager/ObjectCreator.java
@@ -24,7 +24,6 @@ import java.lang.reflect.Modifier;
import org.apache.causeway.commons.internal._Constants;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.commons.internal.factory._InstanceUtil;
-
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.services.objectlifecycle.ObjectLifecyclePublisher;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/objectmanager/ObjectLoader.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/objectmanager/ObjectLoader.java
index 44dd7df78e..41d0ecd97a 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/objectmanager/ObjectLoader.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/objectmanager/ObjectLoader.java
@@ -26,7 +26,6 @@ import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.handler.ChainOfResponsibility;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
... 5580 lines suppressed ...