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:28:24 UTC
[isis] branch master updated: ISIS-3142: batch organize imports: demo 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 953fc62a2c ISIS-3142: batch organize imports: demo sources
953fc62a2c is described below
commit 953fc62a2c901e7102053bcfb2fe981e29dff8b3
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Oct 25 10:28:16 2022 +0200
ISIS-3142: batch organize imports: demo sources
---
.../demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java | 5 +++--
.../java/demoapp/dom/_infra/LibraryPreloadingService.java | 4 ++--
.../asciidocdesc/HasAsciiDocDescription_description.java | 3 +--
.../_infra/asciidocdesc/HasAsciiDocDescription_sources.java | 3 +--
.../demoapp/dom/_infra/resources/AsciiDocReaderService.java | 4 ++--
.../dom/_infra/resources/MarkupVariableResolverService.java | 4 ++--
.../main/java/demoapp/dom/_infra/samples/EnumSamples.java | 3 +--
.../main/java/demoapp/dom/_infra/samples/NameSamples.java | 3 +--
.../java/demoapp/dom/_infra/seed/SeedServiceAbstract.java | 3 +--
.../_infra/urlencoding/UrlEncodingServiceNaiveInMemory.java | 12 ++++++------
.../demoapp/dom/_infra/values/ValueHolderRepository.java | 3 +--
.../domain/_changes/ExposeCapturedChanges_recentChanges.java | 2 --
.../java/demoapp/dom/domain/actions/Action/ActionMenu.java | 5 ++---
.../associateWith/ActionAssociateWithVm_makeFavorite.java | 3 +--
.../associateWith/child/ActionAssociateWithChildVm.java | 3 +--
.../commandPublishing/jdo/ActionCommandPublishingJdo.java | 5 ++---
.../commandPublishing/jpa/ActionCommandPublishingJpa.java | 7 +++----
.../actions/Action/domainEvent/ActionDomainEventVm.java | 3 +--
.../subscribers/ActionDomainEventControlService.java | 3 +--
.../subscribers/ActionDomainEventVm_controlUpdateText.java | 3 +--
.../ActionDomainEventVm_controlUpdateTextInvocation.java | 3 +--
.../jdo/ActionExecutionPublishingJdo.java | 5 ++---
.../jpa/ActionExecutionPublishingJpa.java | 7 +++----
.../dom/domain/actions/Action/hidden/ActionHiddenVm.java | 3 +--
.../domain/actions/Action/restrictTo/ActionRestrictToVm.java | 3 +--
.../domain/actions/Action/semantics/ActionSemanticsVm.java | 3 +--
.../dom/domain/actions/Action/typeOf/ActionTypeOfVm.java | 5 ++---
.../actions/Action/typeOf/child/ActionTypeOfChildVm.java | 3 +--
.../ActionLayout/position/ActionLayoutPositionVm.java | 3 +--
.../ActionLayout/promptStyle/ActionLayoutPromptStyleVm.java | 3 +--
.../domain/actions/progmodel/assoc/AssociatedActionDemo.java | 3 +--
.../actions/progmodel/depargs/DependentArgsActionDemo.java | 3 +--
.../depargs/DependentArgsActionDemo_bulkAction.java | 5 ++---
.../depargs/DependentArgsActionDemo_useAutoComplete.java | 3 +--
.../depargs/DependentArgsActionDemo_useAutoComplete2.java | 7 +++----
.../depargs/DependentArgsActionDemo_useChoices2.java | 5 ++---
.../dom/domain/collections/Collection/CollectionMenu.java | 5 ++---
.../Collection/domainEvent/CollectionDomainEventVm.java | 5 ++---
.../domainEvent/CollectionDomainEventVm_addChild.java | 5 ++---
.../domainEvent/CollectionDomainEventVm_removeChild.java | 3 +--
.../domainEvent/child/CollectionDomainEventChildVm.java | 3 +--
.../subscribers/CollectionDomainEventControlService.java | 3 +--
.../subscribers/CollectionDomainEventVm_controlChildren.java | 3 +--
.../CollectionDomainEventVm_controlChildrenVisibility.java | 3 +--
.../dom/domain/objects/DomainObject/DomainObjectMenu.java | 5 ++---
.../DomainObjectEntityChangePublishingVm_updateAll.java | 3 +--
...angePublishingVm_publishingDisabledAnnotatedEntities.java | 3 +--
.../jdo/DomainObjectEntityChangePublishingDisabledJdo.java | 3 +--
.../jpa/DomainObjectEntityChangePublishingDisabledJpa.java | 3 +--
...hangePublishingVm_publishingEnabledAnnotatedEntities.java | 4 +---
.../jdo/DomainObjectEntityChangePublishingEnabledJdo.java | 3 +--
.../jpa/DomainObjectEntityChangePublishingEnabledJpa.java | 3 +--
...ePublishingVm_publishingEnabledMetaAnnotatedEntities.java | 3 +--
...nObjectEntityChangePublishingEnabledMetaAnnotatedJdo.java | 5 ++---
...nObjectEntityChangePublishingEnabledMetaAnnotatedJpa.java | 5 ++---
...shingVm_publishingEnabledMetaAnnotOverriddenEntities.java | 3 +--
...tEntityChangePublishingEnabledMetaAnnotOverriddenJdo.java | 5 ++---
...tEntityChangePublishingEnabledMetaAnnotOverriddenJpa.java | 5 ++---
.../viewmodels/jaxbrefentity/StatefulVmJaxbRefsEntity.java | 5 ++---
.../nature/viewmodels/jaxbrefentity/jdo/JaxbRefJdo.java | 3 +--
.../nature/viewmodels/jaxbrefentity/jpa/JaxbRefJpa.java | 3 +--
.../nature/viewmodels/usingjaxb/StatefulVmUsingJaxb.java | 3 +--
.../domain/objects/other/embedded/jdo/ComplexNumberJdo.java | 3 +--
.../domain/objects/other/embedded/jdo/NumberConstantJdo.java | 5 ++---
.../other/embedded/jdo/NumberConstantJdoRepository.java | 3 +--
.../domain/objects/other/embedded/jpa/ComplexNumberJpa.java | 3 +--
.../domain/objects/other/embedded/jpa/NumberConstantJpa.java | 5 ++---
.../other/embedded/jpa/NumberConstantJpaRepository.java | 3 +--
.../demoapp/dom/domain/objects/other/mixins/MixinVm.java | 3 +--
.../demoapp/dom/domain/properties/Property/PropertyMenu.java | 5 ++---
.../commandPublishing/jdo/PropertyCommandPublishingJdo.java | 5 ++---
.../commandPublishing/jpa/PropertyCommandPublishingJpa.java | 7 +++----
.../Property/domainEvent/PropertyDomainEventVm.java | 3 +--
.../subscribers/PropertyDomainEventControlService.java | 3 +--
.../subscribers/PropertyDomainEventVm_controlText.java | 3 +--
.../PropertyDomainEventVm_controlTextEditing.java | 3 +--
.../properties/Property/editing/PropertyEditingVm.java | 3 +--
.../jdo/PropertyExecutionPublishingJdo.java | 5 ++---
.../jpa/PropertyExecutionPublishingJpa.java | 7 +++----
.../properties/Property/fileAccept/PropertyFileAcceptVm.java | 3 +--
.../domain/properties/Property/hidden/PropertyHiddenVm.java | 5 ++---
.../Property/hidden/PropertyHiddenVm_returnsChildren.java | 3 +--
.../Property/hidden/child/PropertyHiddenChildVm.java | 5 ++---
.../properties/Property/maxLength/PropertyMaxLengthVm.java | 3 +--
.../Property/mustSatisfy/PropertyMustSatisfyVm.java | 3 +--
.../Property/optionality/PropertyOptionalityVm.java | 3 +--
.../properties/Property/projecting/PropertyProjectingVm.java | 5 ++---
.../projecting/PropertyProjectingVm_returnsChildren.java | 3 +--
.../Property/projecting/child/PropertyProjectingChildVm.java | 7 +++----
.../Property/projecting/jdo/PropertyProjectingChildJdo.java | 3 +--
.../Property/projecting/jpa/PropertyProjectingChildJpa.java | 3 +--
.../Property/regexPattern/PropertyRegexPatternVm.java | 3 +--
.../properties/Property/snapshot/PropertySnapshotVm.java | 3 +--
.../domain/properties/PropertyLayout/PropertyLayoutMenu.java | 5 ++---
.../PropertyLayout/cssClass/PropertyLayoutCssClassVm.java | 3 +--
.../describedAs/PropertyLayoutDescribedAsVm.java | 3 +--
.../PropertyLayout/hidden/PropertyLayoutHiddenVm.java | 5 ++---
.../hidden/PropertyLayoutHiddenVm_returnsChildren.java | 3 +--
.../hidden/child/PropertyLayoutHiddenChildVm.java | 5 ++---
.../labelPosition/PropertyLayoutLabelPositionVm.java | 3 +--
.../PropertyLayout/multiLine/PropertyLayoutMultiLineVm.java | 3 +--
.../PropertyLayout/named/PropertyLayoutNamedVm.java | 3 +--
.../properties/PropertyLayout/navigable/FileNodeVm.java | 3 +--
.../repainting/PropertyLayoutRepaintingVm.java | 3 +--
.../typicalLength/PropertyLayoutTypicalLengthVm.java | 3 +--
.../dom/featured/customui/geocoding/GeoapifyClient.java | 6 +++---
.../java/demoapp/dom/featured/customui/vm/BoundingBox.java | 3 +--
.../dom/featured/customui/vm/WhereInTheWorldMenu.java | 3 +--
.../demoapp/dom/featured/customui/vm/WhereInTheWorldVm.java | 5 ++---
.../dom/featured/layout/describedAs/DescribedAsMenu.java | 3 +--
.../dom/featured/layout/describedAs/DescribedAsVm.java | 5 ++---
.../main/java/demoapp/dom/featured/layout/tabs/TabDemo.java | 3 +--
.../main/java/demoapp/dom/services/core/ServicesMenu.java | 5 ++---
.../dom/services/core/errorreportingservice/EmailTicket.java | 5 +++--
.../dom/services/core/eventbusservice/EventLogEntryJdo.java | 3 +--
.../core/eventbusservice/EventLogEntryJdoRepository.java | 3 +--
.../dom/services/core/eventbusservice/EventLogEntryJpa.java | 3 +--
.../core/eventbusservice/EventLogEntryJpaRepository.java | 3 +--
.../core/eventbusservice/EventLogEntryRepository.java | 3 +--
.../eventbusservice/EventSubscriberDemoImplementation.java | 7 +++----
.../services/core/wrapperFactory/jdo/WrapperFactoryJdo.java | 5 ++---
.../services/core/wrapperFactory/jpa/WrapperFactoryJpa.java | 5 ++---
.../core/xmlSnapshotService/XmlSnapshotParentVm.java | 7 +++----
.../core/xmlSnapshotService/child/XmlSnapshotChildVm.java | 3 +--
.../core/xmlSnapshotService/peer/XmlSnapshotPeerVm.java | 5 ++---
.../peer/child/XmlSnapshotPeerChildVm.java | 3 +--
.../apptenancy/ApplicationTenancyEvaluatorForDemo.java | 3 +--
.../extensions/secman/apptenancy/jdo/TenantedJdo.java | 3 +--
.../extensions/secman/apptenancy/jpa/TenantedJpa.java | 3 +--
.../extensions/secman/appuser/seed/AppUserSeeding.java | 2 +-
.../holder/CausewayBlobHolder_actionReturningCollection.java | 3 +--
...CausewayBlobHolder_updateReadOnlyPropertyWithChoices.java | 3 +--
.../dom/types/causeway/blobs/jdo/CausewayBlobJdo.java | 3 +--
.../dom/types/causeway/blobs/jpa/CausewayBlobJpa.java | 3 +--
.../types/causeway/blobs/samples/CausewayBlobsSamples.java | 9 ++++-----
.../demoapp/dom/types/causeway/blobs/vm/CausewayBlobVm.java | 5 ++---
.../holder/CausewayClobHolder_actionReturningCollection.java | 3 +--
...CausewayClobHolder_updateReadOnlyPropertyWithChoices.java | 3 +--
.../dom/types/causeway/clobs/jdo/CausewayClobJdo.java | 3 +--
.../dom/types/causeway/clobs/jpa/CausewayClobJpa.java | 3 +--
.../types/causeway/clobs/samples/CausewayClobsSamples.java | 7 +++----
.../demoapp/dom/types/causeway/clobs/vm/CausewayClobVm.java | 5 ++---
...wayLocalResourcePathHolder_actionReturningCollection.java | 3 +--
...ResourcePathHolder_updateReadOnlyPropertyWithChoices.java | 3 +--
.../localresourcepaths/jdo/CausewayLocalResourcePathJdo.java | 3 +--
.../localresourcepaths/jpa/CausewayLocalResourcePathJpa.java | 3 +--
.../localresourcepaths/vm/CausewayLocalResourcePathVm.java | 5 ++---
.../CausewayPasswordHolder_actionReturningCollection.java | 3 +--
...ewayPasswordHolder_updateReadOnlyPropertyWithChoices.java | 3 +--
.../types/causeway/passwords/jdo/CausewayPasswordJdo.java | 3 +--
.../types/causeway/passwords/jpa/CausewayPasswordJpa.java | 3 +--
.../dom/types/causeway/passwords/vm/CausewayPasswordVm.java | 5 ++---
...ausewayCalendarEventHolder_actionReturningCollection.java | 3 +--
...alendarEventHolder_updateReadOnlyPropertyWithChoices.java | 3 +--
.../types/causewayext/cal/jdo/CausewayCalendarEventJdo.java | 3 +--
.../types/causewayext/cal/jpa/CausewayCalendarEventJpa.java | 3 +--
.../types/causewayext/cal/vm/CausewayCalendarEventVm.java | 5 ++---
.../demoapp/dom/types/causewayext/sse/AsyncActionDemo.java | 3 +--
.../java/demoapp/dom/types/causewayext/sse/DemoTask.java | 3 +--
...JavaAwtBufferedImageHolder_actionReturningCollection.java | 3 +--
...ufferedImageHolder_updateReadOnlyPropertyWithChoices.java | 3 +--
.../types/javaawt/images/jdo/JavaAwtBufferedImageJdo.java | 3 +--
.../types/javaawt/images/jpa/JavaAwtBufferedImageJpa.java | 3 +--
.../javaawt/images/samples/JavaAwtBufferedImagesSamples.java | 6 +++---
.../dom/types/javaawt/images/vm/JavaAwtBufferedImageVm.java | 3 +--
.../JavaMathBigDecimalHolder_actionReturningCollection.java | 3 +--
...thBigDecimalHolder_updateReadOnlyPropertyWithChoices.java | 3 +--
.../javamath/bigdecimals/jdo/JavaMathBigDecimalJdo.java | 3 +--
.../javamath/bigdecimals/jpa/JavaMathBigDecimalJpa.java | 3 +--
.../types/javamath/bigdecimals/vm/JavaMathBigDecimalVm.java | 5 ++---
.../JavaMathBigIntegerHolder_actionReturningCollection.java | 3 +--
...thBigIntegerHolder_updateReadOnlyPropertyWithChoices.java | 3 +--
.../javamath/bigintegers/jdo/JavaMathBigIntegerJdo.java | 3 +--
.../javamath/bigintegers/jpa/JavaMathBigIntegerJpa.java | 3 +--
.../types/javamath/bigintegers/vm/JavaMathBigIntegerVm.java | 5 ++---
.../holder/JavaNetUrlHolder_actionReturningCollection.java | 3 +--
.../JavaNetUrlHolder_updateReadOnlyPropertyWithChoices.java | 3 +--
.../demoapp/dom/types/javanet/urls/jdo/JavaNetUrlJdo.java | 3 +--
.../demoapp/dom/types/javanet/urls/jpa/JavaNetUrlJpa.java | 3 +--
.../dom/types/javanet/urls/samples/JavaNetUrlSamples.java | 3 +--
.../java/demoapp/dom/types/javanet/urls/vm/JavaNetUrlVm.java | 5 ++---
.../holder/JavaSqlDateHolder_actionReturningCollection.java | 3 +--
.../JavaSqlDateHolder_updateReadOnlyPropertyWithChoices.java | 3 +--
.../dom/types/javasql/javasqldate/jdo/JavaSqlDateJdo.java | 3 +--
.../dom/types/javasql/javasqldate/jpa/JavaSqlDateJpa.java | 3 +--
.../dom/types/javasql/javasqldate/vm/JavaSqlDateVm.java | 5 ++---
.../JavaSqlTimestampHolder_actionReturningCollection.java | 3 +--
...SqlTimestampHolder_updateReadOnlyPropertyWithChoices.java | 3 +--
.../javasql/javasqltimestamp/jdo/JavaSqlTimestampJdo.java | 3 +--
.../javasql/javasqltimestamp/jpa/JavaSqlTimestampJpa.java | 3 +--
.../javasql/javasqltimestamp/vm/JavaSqlTimestampVm.java | 5 ++---
.../JavaTimeLocalDateHolder_actionReturningCollection.java | 3 +--
...imeLocalDateHolder_updateReadOnlyPropertyWithChoices.java | 3 +--
.../javatime/javatimelocaldate/jdo/JavaTimeLocalDateJdo.java | 3 +--
.../javatime/javatimelocaldate/jpa/JavaTimeLocalDateJpa.java | 3 +--
.../javatime/javatimelocaldate/vm/JavaTimeLocalDateVm.java | 5 ++---
...avaTimeLocalDateTimeHolder_actionReturningCollection.java | 3 +--
...ocalDateTimeHolder_updateReadOnlyPropertyWithChoices.java | 3 +--
.../javatimelocaldatetime/jdo/JavaTimeLocalDateTimeJdo.java | 3 +--
.../javatimelocaldatetime/jpa/JavaTimeLocalDateTimeJpa.java | 3 +--
.../javatimelocaldatetime/vm/JavaTimeLocalDateTimeVm.java | 5 ++---
.../javatime/javatimelocaltime/jdo/JavaTimeLocalTimeJdo.java | 3 +--
.../javatime/javatimelocaltime/jpa/JavaTimeLocalTimeJpa.java | 3 +--
.../javatime/javatimelocaltime/vm/JavaTimeLocalTimeVm.java | 5 ++---
...vaTimeOffsetDateTimeHolder_actionReturningCollection.java | 3 +--
...fsetDateTimeHolder_updateReadOnlyPropertyWithChoices.java | 3 +--
.../jdo/JavaTimeOffsetDateTimeJdo.java | 3 +--
.../jpa/JavaTimeOffsetDateTimeJpa.java | 3 +--
.../javatimeoffsetdatetime/vm/JavaTimeOffsetDateTimeVm.java | 5 ++---
.../JavaTimeOffsetTimeHolder_actionReturningCollection.java | 3 +--
...meOffsetTimeHolder_updateReadOnlyPropertyWithChoices.java | 3 +--
.../javatimeoffsettime/jdo/JavaTimeOffsetTimeJdo.java | 3 +--
.../javatimeoffsettime/jpa/JavaTimeOffsetTimeJpa.java | 3 +--
.../javatime/javatimeoffsettime/vm/JavaTimeOffsetTimeVm.java | 5 ++---
...avaTimeZonedDateTimeHolder_actionReturningCollection.java | 3 +--
...onedDateTimeHolder_updateReadOnlyPropertyWithChoices.java | 3 +--
.../javatimezoneddatetime/jdo/JavaTimeZonedDateTimeJdo.java | 3 +--
.../javatimezoneddatetime/jpa/JavaTimeZonedDateTimeJpa.java | 3 +--
.../javatimezoneddatetime/vm/JavaTimeZonedDateTimeVm.java | 5 ++---
.../holder/JavaUtilDateHolder_actionReturningCollection.java | 3 +--
...JavaUtilDateHolder_updateReadOnlyPropertyWithChoices.java | 3 +--
.../dom/types/javautil/javautildate/jdo/JavaUtilDateJdo.java | 3 +--
.../dom/types/javautil/javautildate/jpa/JavaUtilDateJpa.java | 3 +--
.../dom/types/javautil/javautildate/vm/JavaUtilDateVm.java | 5 ++---
.../holder/JodaDateTimeHolder_actionReturningCollection.java | 3 +--
...JodaDateTimeHolder_updateReadOnlyPropertyWithChoices.java | 3 +--
.../dom/types/jodatime/jodadatetime/jdo/JodaDateTimeJdo.java | 3 +--
.../dom/types/jodatime/jodadatetime/vm/JodaDateTimeVm.java | 5 ++---
.../JodaLocalDateHolder_actionReturningCollection.java | 3 +--
...odaLocalDateHolder_updateReadOnlyPropertyWithChoices.java | 3 +--
.../types/jodatime/jodalocaldate/jdo/JodaLocalDateJdo.java | 3 +--
.../dom/types/jodatime/jodalocaldate/vm/JodaLocalDateVm.java | 5 ++---
.../JodaLocalDateTimeHolder_actionReturningCollection.java | 3 +--
...ocalDateTimeHolder_updateReadOnlyPropertyWithChoices.java | 3 +--
.../jodatime/jodalocaldatetime/jdo/JodaLocalDateTimeJdo.java | 3 +--
.../jodatime/jodalocaldatetime/vm/JodaLocalDateTimeVm.java | 5 ++---
.../JodaLocalTimeHolder_actionReturningCollection.java | 3 +--
...odaLocalTimeHolder_updateReadOnlyPropertyWithChoices.java | 3 +--
.../types/jodatime/jodalocaltime/jdo/JodaLocalTimeJdo.java | 3 +--
.../dom/types/jodatime/jodalocaltime/vm/JodaLocalTimeVm.java | 5 ++---
.../dom/featured/customui/GeocodeResponseUtilsTest.java | 3 +--
.../javafx/src/main/java/demoapp/javafx/DemoAppJavaFx.java | 7 ++++---
.../java/demoapp/javafx/integtest/DemoFxTestAbstract.java | 5 +++--
.../demoapp/javafx/integtest/DemoFxTestConfig_usingJdo.java | 6 +++---
.../web/src/main/java/demoapp/web/DemoAppManifestCommon.java | 5 ++---
.../web/src/main/java/demoapp/web/DemoAppManifestJdo.java | 6 +++---
.../web/src/main/java/demoapp/web/DemoAppManifestJpa.java | 6 +++---
.../webapp/wicket/common/ui/custom/WhereInTheWorldPanel.java | 5 ++---
.../wicket/common/ui/custom/WhereInTheWorldPanelFactory.java | 1 +
.../java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java | 2 +-
.../java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java | 2 +-
.../java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java | 2 +-
252 files changed, 354 insertions(+), 585 deletions(-)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java
index 58f0742973..516202512a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java
@@ -18,13 +18,14 @@
*/
package demoapp.dom;
-import org.apache.causeway.extensions.commandlog.jpa.CausewayModuleExtCommandLogPersistenceJpa;
-import org.apache.causeway.persistence.jpa.eclipselink.CausewayModulePersistenceJpaEclipselink;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.Profile;
+import org.apache.causeway.extensions.commandlog.jpa.CausewayModuleExtCommandLogPersistenceJpa;
+import org.apache.causeway.persistence.jpa.eclipselink.CausewayModulePersistenceJpaEclipselink;
+
import demoapp.dom.domain.actions.Action.commandPublishing.jpa.ActionCommandPublishingJpa;
import demoapp.dom.domain.actions.Action.executionPublishing.jpa.ActionExecutionPublishingJpa;
import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.disabled.jpa.DomainObjectEntityChangePublishingDisabledJpa;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/_infra/LibraryPreloadingService.java b/examples/demo/domain/src/main/java/demoapp/dom/_infra/LibraryPreloadingService.java
index e7090ea769..b9071a5af8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/_infra/LibraryPreloadingService.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/_infra/LibraryPreloadingService.java
@@ -21,10 +21,10 @@ package demoapp.dom._infra;
import javax.annotation.PostConstruct;
import javax.inject.Named;
-import org.apache.causeway.commons.internal.concurrent._ConcurrentContext;
-import org.apache.causeway.commons.internal.concurrent._ConcurrentTaskList;
import org.springframework.stereotype.Service;
+import org.apache.causeway.commons.internal.concurrent._ConcurrentContext;
+import org.apache.causeway.commons.internal.concurrent._ConcurrentTaskList;
import org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc;
import lombok.val;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/_infra/asciidocdesc/HasAsciiDocDescription_description.java b/examples/demo/domain/src/main/java/demoapp/dom/_infra/asciidocdesc/HasAsciiDocDescription_description.java
index 5ffa6043d4..f14f3c02f6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/_infra/asciidocdesc/HasAsciiDocDescription_description.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/_infra/asciidocdesc/HasAsciiDocDescription_description.java
@@ -28,9 +28,8 @@ import org.apache.causeway.applib.annotation.ValueSemantics;
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom._infra.resources.AsciiDocReaderService;
+import lombok.RequiredArgsConstructor;
@Property(snapshot = Snapshot.EXCLUDED)
@ValueSemantics(provider = "demo-adoc-pre-processor")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/_infra/asciidocdesc/HasAsciiDocDescription_sources.java b/examples/demo/domain/src/main/java/demoapp/dom/_infra/asciidocdesc/HasAsciiDocDescription_sources.java
index 30df7cd92f..4ab1a23318 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/_infra/asciidocdesc/HasAsciiDocDescription_sources.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/_infra/asciidocdesc/HasAsciiDocDescription_sources.java
@@ -27,11 +27,10 @@ import org.apache.causeway.applib.annotation.Snapshot;
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc;
+import demoapp.dom._infra.resources.MarkupVariableResolverService;
import lombok.RequiredArgsConstructor;
import lombok.val;
-import demoapp.dom._infra.resources.MarkupVariableResolverService;
-
@Property(snapshot = Snapshot.EXCLUDED)
@RequiredArgsConstructor
public class HasAsciiDocDescription_sources {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/_infra/resources/AsciiDocReaderService.java b/examples/demo/domain/src/main/java/demoapp/dom/_infra/resources/AsciiDocReaderService.java
index 54139564ce..4cc1789195 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/_infra/resources/AsciiDocReaderService.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/_infra/resources/AsciiDocReaderService.java
@@ -20,10 +20,10 @@ package demoapp.dom._infra.resources;
import javax.inject.Named;
-import org.apache.causeway.commons.internal.base._Refs;
-import org.apache.causeway.commons.internal.base._Refs.StringReference;
import org.springframework.stereotype.Service;
+import org.apache.causeway.commons.internal.base._Refs;
+import org.apache.causeway.commons.internal.base._Refs.StringReference;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/_infra/resources/MarkupVariableResolverService.java b/examples/demo/domain/src/main/java/demoapp/dom/_infra/resources/MarkupVariableResolverService.java
index 1a500b3a37..4eb1ea432b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/_infra/resources/MarkupVariableResolverService.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/_infra/resources/MarkupVariableResolverService.java
@@ -24,10 +24,10 @@ import java.util.Optional;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.causeway.commons.internal.base._Refs;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.springframework.stereotype.Service;
+import org.apache.causeway.commons.internal.base._Refs;
+import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.core.config.CausewayConfiguration;
import lombok.val;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/EnumSamples.java b/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/EnumSamples.java
index 316bff56e0..a3d596c64c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/EnumSamples.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/EnumSamples.java
@@ -22,9 +22,8 @@ import java.util.stream.Stream;
import org.springframework.stereotype.Service;
-import lombok.SneakyThrows;
-
import demoapp.dom.types.Samples;
+import lombok.SneakyThrows;
@Service
public class EnumSamples implements Samples<DemoEnum> {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/NameSamples.java b/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/NameSamples.java
index 7e4a400603..55bef55272 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/NameSamples.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/NameSamples.java
@@ -24,9 +24,8 @@ import java.util.stream.Stream;
import org.springframework.stereotype.Service;
-import lombok.val;
-
import demoapp.dom.types.Samples;
+import lombok.val;
@Service
public class NameSamples implements Samples<String> {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/_infra/seed/SeedServiceAbstract.java b/examples/demo/domain/src/main/java/demoapp/dom/_infra/seed/SeedServiceAbstract.java
index 751839a9bd..4bc4b34a3d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/_infra/seed/SeedServiceAbstract.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/_infra/seed/SeedServiceAbstract.java
@@ -26,11 +26,10 @@ import org.apache.causeway.applib.events.metamodel.MetamodelListener;
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScripts;
-import lombok.NonNull;
-
import demoapp.dom._infra.values.ValueHolder;
import demoapp.dom._infra.values.ValueHolderFixtureFactory;
import demoapp.dom._infra.values.ValueHolderRepository;
+import lombok.NonNull;
public abstract class SeedServiceAbstract
implements
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/_infra/urlencoding/UrlEncodingServiceNaiveInMemory.java b/examples/demo/domain/src/main/java/demoapp/dom/_infra/urlencoding/UrlEncodingServiceNaiveInMemory.java
index 929b6ade2b..3ffb0ba8b6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/_infra/urlencoding/UrlEncodingServiceNaiveInMemory.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/_infra/urlencoding/UrlEncodingServiceNaiveInMemory.java
@@ -26,18 +26,18 @@ import javax.annotation.Priority;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.causeway.commons.internal.base._Bytes;
-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.hash._Hashes;
-import org.apache.causeway.commons.internal.hash._Hashes.Algorithm;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.exceptions.UnrecoverableException;
import org.apache.causeway.applib.services.urlencoding.UrlEncodingService;
+import org.apache.causeway.commons.internal.base._Bytes;
+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.hash._Hashes;
+import org.apache.causeway.commons.internal.hash._Hashes.Algorithm;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/_infra/values/ValueHolderRepository.java b/examples/demo/domain/src/main/java/demoapp/dom/_infra/values/ValueHolderRepository.java
index e636809204..1404af6011 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/_infra/values/ValueHolderRepository.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/_infra/values/ValueHolderRepository.java
@@ -27,12 +27,11 @@ import javax.inject.Inject;
import org.apache.causeway.applib.services.repository.RepositoryService;
+import demoapp.dom.types.Samples;
import lombok.AccessLevel;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
-import demoapp.dom.types.Samples;
-
@RequiredArgsConstructor(access = AccessLevel.PROTECTED)
public abstract class ValueHolderRepository<T, E extends ValueHolder<T>> {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/_changes/ExposeCapturedChanges_recentChanges.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/_changes/ExposeCapturedChanges_recentChanges.java
index 1822f83691..8d6f7f8d72 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/_changes/ExposeCapturedChanges_recentChanges.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/_changes/ExposeCapturedChanges_recentChanges.java
@@ -25,8 +25,6 @@ import javax.inject.Inject;
import org.apache.causeway.applib.annotation.Collection;
import org.apache.causeway.applib.annotation.MemberSupport;
-import org.apache.causeway.applib.annotation.ValueSemantics;
-import org.apache.causeway.schema.chg.v2.ChangesDto;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/ActionMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/ActionMenu.java
index 595933b6a3..f819244df8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/ActionMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/ActionMenu.java
@@ -28,9 +28,6 @@ import org.apache.causeway.applib.annotation.NatureOfService;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-import lombok.val;
-
import demoapp.dom._infra.samples.NameSamples;
import demoapp.dom._infra.values.ValueHolderRepository;
import demoapp.dom.domain.actions.Action.associateWith.ActionAssociateWithVm;
@@ -43,6 +40,8 @@ import demoapp.dom.domain.actions.Action.restrictTo.ActionRestrictToVm;
import demoapp.dom.domain.actions.Action.semantics.ActionSemanticsVm;
import demoapp.dom.domain.actions.Action.typeOf.ActionTypeOfVm;
import demoapp.dom.domain.actions.Action.typeOf.child.ActionTypeOfChildVm;
+import lombok.RequiredArgsConstructor;
+import lombok.val;
@Named("demo.ActionMenu")
@DomainService(nature=NatureOfService.VIEW)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/ActionAssociateWithVm_makeFavorite.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/ActionAssociateWithVm_makeFavorite.java
index 2a8b211b64..5d6f5172ee 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/ActionAssociateWithVm_makeFavorite.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/ActionAssociateWithVm_makeFavorite.java
@@ -25,9 +25,8 @@ import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
import org.apache.causeway.applib.annotation.MemberSupport;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.domain.actions.Action.associateWith.child.ActionAssociateWithChildVm;
+import lombok.RequiredArgsConstructor;
//tag::class[]
@Action
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/child/ActionAssociateWithChildVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/child/ActionAssociateWithChildVm.java
index e40f0d75ed..139df6b9f5 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/child/ActionAssociateWithChildVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/child/ActionAssociateWithChildVm.java
@@ -31,12 +31,11 @@ import org.apache.causeway.applib.annotation.ObjectSupport;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
//tag::class[]
@XmlRootElement(name = "child")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jdo/ActionCommandPublishingJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jdo/ActionCommandPublishingJdo.java
index 0dcfed8dc5..a991c0a271 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jdo/ActionCommandPublishingJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jdo/ActionCommandPublishingJdo.java
@@ -38,12 +38,11 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Publishing;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.Getter;
-import lombok.Setter;
-
import demoapp.dom.domain.actions.Action.commandPublishing.ActionCommandPublishingDisabledMetaAnnotation;
import demoapp.dom.domain.actions.Action.commandPublishing.ActionCommandPublishingEnabledMetaAnnotation;
import demoapp.dom.domain.actions.Action.commandPublishing.ActionCommandPublishingEntity;
+import lombok.Getter;
+import lombok.Setter;
@Profile("demo-jdo")
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jpa/ActionCommandPublishingJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jpa/ActionCommandPublishingJpa.java
index db216b0ddc..4efbfea040 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jpa/ActionCommandPublishingJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jpa/ActionCommandPublishingJpa.java
@@ -39,13 +39,12 @@ import org.apache.causeway.applib.annotation.Publishing;
import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
import demoapp.dom.domain.actions.Action.commandPublishing.ActionCommandPublishingDisabledMetaAnnotation;
import demoapp.dom.domain.actions.Action.commandPublishing.ActionCommandPublishingEnabledMetaAnnotation;
import demoapp.dom.domain.actions.Action.commandPublishing.ActionCommandPublishingEntity;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
@Profile("demo-jpa")
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventVm.java
index 30e1362dbd..f3e80d9baa 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventVm.java
@@ -36,12 +36,11 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.events.domain.ActionDomainEvent;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
@XmlRootElement(name = "root")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/subscribers/ActionDomainEventControlService.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/subscribers/ActionDomainEventControlService.java
index ca70875a52..964419567d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/subscribers/ActionDomainEventControlService.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/subscribers/ActionDomainEventControlService.java
@@ -25,10 +25,9 @@ import org.springframework.stereotype.Service;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.domain.actions.Action.domainEvent.ActionDomainEventVm;
import demoapp.dom.domain.actions.Action.domainEvent.ActionDomainEventVm_mixinUpdateText;
+import lombok.RequiredArgsConstructor;
// tag::class[]
@Service
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/subscribers/ActionDomainEventVm_controlUpdateText.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/subscribers/ActionDomainEventVm_controlUpdateText.java
index fbc5ed788f..09dd4dc948 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/subscribers/ActionDomainEventVm_controlUpdateText.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/subscribers/ActionDomainEventVm_controlUpdateText.java
@@ -23,9 +23,8 @@ import javax.inject.Inject;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.domain.actions.Action.domainEvent.ActionDomainEventVm;
+import lombok.RequiredArgsConstructor;
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/subscribers/ActionDomainEventVm_controlUpdateTextInvocation.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/subscribers/ActionDomainEventVm_controlUpdateTextInvocation.java
index a36d971939..a19f5e7230 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/subscribers/ActionDomainEventVm_controlUpdateTextInvocation.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/subscribers/ActionDomainEventVm_controlUpdateTextInvocation.java
@@ -26,9 +26,8 @@ import org.apache.causeway.applib.annotation.MemberSupport;
import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.domain.actions.Action.domainEvent.ActionDomainEventVm;
+import lombok.RequiredArgsConstructor;
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jdo/ActionExecutionPublishingJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jdo/ActionExecutionPublishingJdo.java
index 9ff3e5f3b7..19f9302b07 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jdo/ActionExecutionPublishingJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jdo/ActionExecutionPublishingJdo.java
@@ -38,12 +38,11 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Publishing;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.Getter;
-import lombok.Setter;
-
import demoapp.dom.domain.actions.Action.executionPublishing.ActionExecutionPublishingDisabledMetaAnnotation;
import demoapp.dom.domain.actions.Action.executionPublishing.ActionExecutionPublishingEnabledMetaAnnotation;
import demoapp.dom.domain.actions.Action.executionPublishing.ActionExecutionPublishingEntity;
+import lombok.Getter;
+import lombok.Setter;
@Profile("demo-jdo")
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jpa/ActionExecutionPublishingJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jpa/ActionExecutionPublishingJpa.java
index 268b4b9030..eb5b50ab51 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jpa/ActionExecutionPublishingJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jpa/ActionExecutionPublishingJpa.java
@@ -39,13 +39,12 @@ import org.apache.causeway.applib.annotation.Publishing;
import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
import demoapp.dom.domain.actions.Action.executionPublishing.ActionExecutionPublishingDisabledMetaAnnotation;
import demoapp.dom.domain.actions.Action.executionPublishing.ActionExecutionPublishingEnabledMetaAnnotation;
import demoapp.dom.domain.actions.Action.executionPublishing.ActionExecutionPublishingEntity;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
@Profile("demo-jpa")
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/hidden/ActionHiddenVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/hidden/ActionHiddenVm.java
index 4eed92d27f..ba6b8e6ceb 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/hidden/ActionHiddenVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/hidden/ActionHiddenVm.java
@@ -36,12 +36,11 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.annotation.Where;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
@XmlRootElement(name = "root")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/restrictTo/ActionRestrictToVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/restrictTo/ActionRestrictToVm.java
index 9776d5af59..a9a33dffde 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/restrictTo/ActionRestrictToVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/restrictTo/ActionRestrictToVm.java
@@ -36,12 +36,11 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.RestrictTo;
import org.apache.causeway.applib.annotation.SemanticsOf;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
@XmlRootElement(name = "root")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/semantics/ActionSemanticsVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/semantics/ActionSemanticsVm.java
index 68739e41a4..4edb61386b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/semantics/ActionSemanticsVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/semantics/ActionSemanticsVm.java
@@ -42,12 +42,11 @@ import org.apache.causeway.applib.services.wrapper.WrapperFactory;
import static org.apache.causeway.applib.services.wrapper.control.SyncControl.control;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
@XmlRootElement(name = "root")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/ActionTypeOfVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/ActionTypeOfVm.java
index 16acdc7bb1..de6e22cb0b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/ActionTypeOfVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/ActionTypeOfVm.java
@@ -37,11 +37,10 @@ import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.ObjectSupport;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom.domain.actions.Action.typeOf.child.ActionTypeOfChildVm;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/child/ActionTypeOfChildVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/child/ActionTypeOfChildVm.java
index b053984acc..18b27b14ca 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/child/ActionTypeOfChildVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/child/ActionTypeOfChildVm.java
@@ -31,12 +31,11 @@ import org.apache.causeway.applib.annotation.ObjectSupport;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
//tag::class[]
@XmlRootElement(name = "child")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/position/ActionLayoutPositionVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/position/ActionLayoutPositionVm.java
index bcf916be6b..195315e534 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/position/ActionLayoutPositionVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/position/ActionLayoutPositionVm.java
@@ -32,11 +32,10 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/promptStyle/ActionLayoutPromptStyleVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/promptStyle/ActionLayoutPromptStyleVm.java
index 6af919b69a..f087595f4b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/promptStyle/ActionLayoutPromptStyleVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/promptStyle/ActionLayoutPromptStyleVm.java
@@ -33,11 +33,10 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionDemo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionDemo.java
index 2af1993470..0f0a67fe54 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionDemo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionDemo.java
@@ -38,12 +38,11 @@ import org.apache.causeway.applib.annotation.ObjectSupport;
import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.applib.services.message.MessageService;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.val;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
@XmlRootElement(name = "Demo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo.java
index 0208c606f4..3042946053 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo.java
@@ -38,11 +38,10 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.value.Markup;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
@XmlRootElement(name = "Demo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_bulkAction.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_bulkAction.java
index 6ba86c13fc..5b26619d3d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_bulkAction.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_bulkAction.java
@@ -23,9 +23,6 @@ import java.util.Set;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.commons.internal.debug._Probe;
-
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
import org.apache.causeway.applib.annotation.MemberSupport;
@@ -33,6 +30,8 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Parameter;
import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.applib.services.message.MessageService;
+import org.apache.causeway.commons.internal.collections._Lists;
+import org.apache.causeway.commons.internal.debug._Probe;
import lombok.RequiredArgsConstructor;
import lombok.Value;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useAutoComplete.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useAutoComplete.java
index 3054de84b5..34c76236ed 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useAutoComplete.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useAutoComplete.java
@@ -23,8 +23,6 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
import org.apache.causeway.applib.annotation.MemberSupport;
@@ -33,6 +31,7 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Parameter;
import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.applib.services.message.MessageService;
+import org.apache.causeway.commons.internal.base._Strings;
import lombok.RequiredArgsConstructor;
import lombok.Value;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useAutoComplete2.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useAutoComplete2.java
index 03ce93eebc..97f9681954 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useAutoComplete2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useAutoComplete2.java
@@ -24,10 +24,6 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.collections._Lists;
-
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
import org.apache.causeway.applib.annotation.MemberSupport;
@@ -36,6 +32,9 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Parameter;
import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.applib.services.message.MessageService;
+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 lombok.RequiredArgsConstructor;
import lombok.Value;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useChoices2.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useChoices2.java
index c8fc411fe6..fe451bbe11 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useChoices2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useChoices2.java
@@ -24,9 +24,6 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.collections._Lists;
-
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
import org.apache.causeway.applib.annotation.MemberSupport;
@@ -35,6 +32,8 @@ import org.apache.causeway.applib.annotation.Parameter;
import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.services.message.MessageService;
+import org.apache.causeway.commons.internal.base._NullSafe;
+import org.apache.causeway.commons.internal.collections._Lists;
import lombok.RequiredArgsConstructor;
import lombok.Value;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/CollectionMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/CollectionMenu.java
index af9f500d75..4b5a4d09d0 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/CollectionMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/CollectionMenu.java
@@ -30,11 +30,10 @@ import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.services.factory.FactoryService;
-import lombok.RequiredArgsConstructor;
-import lombok.val;
-
import demoapp.dom.domain.collections.Collection.domainEvent.CollectionDomainEventVm;
import demoapp.dom.domain.collections.Collection.domainEvent.CollectionDomainEventVm_addChild;
+import lombok.RequiredArgsConstructor;
+import lombok.val;
@Named("demo.CollectionMenu")
@DomainService(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventVm.java
index a865fb6838..bf80dc281d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventVm.java
@@ -37,11 +37,10 @@ import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.ObjectSupport;
import org.apache.causeway.applib.events.domain.CollectionDomainEvent;
-import lombok.Getter;
-import lombok.Setter;
-
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom.domain.collections.Collection.domainEvent.child.CollectionDomainEventChildVm;
+import lombok.Getter;
+import lombok.Setter;
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventVm_addChild.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventVm_addChild.java
index fc981bea0f..02b17c311c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventVm_addChild.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventVm_addChild.java
@@ -22,11 +22,10 @@ import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-import lombok.val;
-
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom.domain.collections.Collection.domainEvent.child.CollectionDomainEventChildVm;
+import lombok.RequiredArgsConstructor;
+import lombok.val;
//tag::class[]
@Action(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventVm_removeChild.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventVm_removeChild.java
index 0974e9826f..c51a8cdc28 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventVm_removeChild.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventVm_removeChild.java
@@ -26,10 +26,9 @@ import org.apache.causeway.applib.annotation.ActionLayout;
import org.apache.causeway.applib.annotation.MemberSupport;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom.domain.collections.Collection.domainEvent.child.CollectionDomainEventChildVm;
+import lombok.RequiredArgsConstructor;
//tag::class[]
@Action(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/child/CollectionDomainEventChildVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/child/CollectionDomainEventChildVm.java
index c72daf2145..214021f40b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/child/CollectionDomainEventChildVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/child/CollectionDomainEventChildVm.java
@@ -31,12 +31,11 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
//tag::class[]
@XmlRootElement(name = "child")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/subscribers/CollectionDomainEventControlService.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/subscribers/CollectionDomainEventControlService.java
index 8d365b2df0..03337995d1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/subscribers/CollectionDomainEventControlService.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/subscribers/CollectionDomainEventControlService.java
@@ -26,9 +26,8 @@ import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.domain.collections.Collection.domainEvent.CollectionDomainEventVm;
+import lombok.RequiredArgsConstructor;
// tag::class[]
@Service
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/subscribers/CollectionDomainEventVm_controlChildren.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/subscribers/CollectionDomainEventVm_controlChildren.java
index 0e86b170af..3c34282b09 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/subscribers/CollectionDomainEventVm_controlChildren.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/subscribers/CollectionDomainEventVm_controlChildren.java
@@ -23,9 +23,8 @@ import javax.inject.Inject;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.domain.collections.Collection.domainEvent.CollectionDomainEventVm;
+import lombok.RequiredArgsConstructor;
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/subscribers/CollectionDomainEventVm_controlChildrenVisibility.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/subscribers/CollectionDomainEventVm_controlChildrenVisibility.java
index c9a7214082..8f514aad7f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/subscribers/CollectionDomainEventVm_controlChildrenVisibility.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/subscribers/CollectionDomainEventVm_controlChildrenVisibility.java
@@ -27,9 +27,8 @@ import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.applib.annotation.Redirect;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.domain.collections.Collection.domainEvent.CollectionDomainEventVm;
+import lombok.RequiredArgsConstructor;
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/DomainObjectMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/DomainObjectMenu.java
index d79d9c1155..963d0df266 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/DomainObjectMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/DomainObjectMenu.java
@@ -29,12 +29,11 @@ import org.apache.causeway.applib.annotation.NatureOfService;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-import lombok.val;
-
import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.DomainObjectEntityChangePublishingVm;
import demoapp.dom.domain.objects.DomainObject.nature.viewmodels.jaxbrefentity.StatefulVmJaxbRefsEntity;
import demoapp.dom.domain.objects.DomainObject.nature.viewmodels.usingjaxb.StatefulVmUsingJaxb;
+import lombok.RequiredArgsConstructor;
+import lombok.val;
@Named("demo.DomainObjectMenu")
@DomainService(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingVm_updateAll.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingVm_updateAll.java
index 2ee2d7f08c..f96dd0275f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingVm_updateAll.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingVm_updateAll.java
@@ -28,13 +28,12 @@ import org.apache.causeway.applib.annotation.ActionLayout;
import org.apache.causeway.applib.annotation.MemberSupport;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom._infra.values.ValueHolderRepository;
import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.disabled.DomainObjectEntityChangePublishingDisabledEntity;
import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.enabled.DomainObjectEntityChangePublishingEnabledEntity;
import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnot.enabled.DomainObjectEntityChangePublishingEnabledMetaAnnotatedEntity;
import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnotOverridden.enabled.DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenEntity;
+import lombok.RequiredArgsConstructor;
//tag::class[]
@Action(semantics = SemanticsOf.IDEMPOTENT)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/disabled/DomainObjectEntityChangePublishingVm_publishingDisabledAnnotatedEntities.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/disabled/DomainObjectEntityChangePublishingVm_publishingDisabledAnnotatedEntities.java
index 752e58ca6d..20ab76fc7c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/disabled/DomainObjectEntityChangePublishingVm_publishingDisabledAnnotatedEntities.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/disabled/DomainObjectEntityChangePublishingVm_publishingDisabledAnnotatedEntities.java
@@ -24,10 +24,9 @@ import javax.inject.Inject;
import org.apache.causeway.applib.annotation.Collection;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom._infra.values.ValueHolderRepository;
import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.DomainObjectEntityChangePublishingVm;
+import lombok.RequiredArgsConstructor;
@Collection()
@RequiredArgsConstructor
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/disabled/jdo/DomainObjectEntityChangePublishingDisabledJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/disabled/jdo/DomainObjectEntityChangePublishingDisabledJdo.java
index f163e19bfa..3405ee6e52 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/disabled/jdo/DomainObjectEntityChangePublishingDisabledJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/disabled/jdo/DomainObjectEntityChangePublishingDisabledJdo.java
@@ -33,11 +33,10 @@ import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.Publishing;
import org.apache.causeway.applib.annotation.Title;
+import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.disabled.DomainObjectEntityChangePublishingDisabledEntity;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.disabled.DomainObjectEntityChangePublishingDisabledEntity;
-
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/disabled/jpa/DomainObjectEntityChangePublishingDisabledJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/disabled/jpa/DomainObjectEntityChangePublishingDisabledJpa.java
index 53949de4d9..a6d7b2e68e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/disabled/jpa/DomainObjectEntityChangePublishingDisabledJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/disabled/jpa/DomainObjectEntityChangePublishingDisabledJpa.java
@@ -35,12 +35,11 @@ import org.apache.causeway.applib.annotation.Publishing;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
+import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.disabled.DomainObjectEntityChangePublishingDisabledEntity;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.disabled.DomainObjectEntityChangePublishingDisabledEntity;
-
@Profile("demo-jpa")
//tag::class[]
@Entity
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/enabled/DomainObjectEntityChangePublishingVm_publishingEnabledAnnotatedEntities.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/enabled/DomainObjectEntityChangePublishingVm_publishingEnabledAnnotatedEntities.java
index 79d52bd225..35ce275bc8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/enabled/DomainObjectEntityChangePublishingVm_publishingEnabledAnnotatedEntities.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/enabled/DomainObjectEntityChangePublishingVm_publishingEnabledAnnotatedEntities.java
@@ -24,12 +24,10 @@ import javax.inject.Inject;
import org.apache.causeway.applib.annotation.Collection;
import org.apache.causeway.applib.annotation.MemberSupport;
-import org.apache.causeway.applib.annotation.ValueSemantics;
-
-import lombok.RequiredArgsConstructor;
import demoapp.dom._infra.values.ValueHolderRepository;
import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.DomainObjectEntityChangePublishingVm;
+import lombok.RequiredArgsConstructor;
@Collection()
@RequiredArgsConstructor
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/enabled/jdo/DomainObjectEntityChangePublishingEnabledJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/enabled/jdo/DomainObjectEntityChangePublishingEnabledJdo.java
index 9fb4cc5da2..dafe9cbe73 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/enabled/jdo/DomainObjectEntityChangePublishingEnabledJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/enabled/jdo/DomainObjectEntityChangePublishingEnabledJdo.java
@@ -33,11 +33,10 @@ import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.Publishing;
import org.apache.causeway.applib.annotation.Title;
+import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.enabled.DomainObjectEntityChangePublishingEnabledEntity;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.enabled.DomainObjectEntityChangePublishingEnabledEntity;
-
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/enabled/jpa/DomainObjectEntityChangePublishingEnabledJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/enabled/jpa/DomainObjectEntityChangePublishingEnabledJpa.java
index a82cba6d04..e4b8c77a1f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/enabled/jpa/DomainObjectEntityChangePublishingEnabledJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/enabled/jpa/DomainObjectEntityChangePublishingEnabledJpa.java
@@ -35,12 +35,11 @@ import org.apache.causeway.applib.annotation.Publishing;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
+import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.enabled.DomainObjectEntityChangePublishingEnabledEntity;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.enabled.DomainObjectEntityChangePublishingEnabledEntity;
-
@Profile("demo-jpa")
//tag::class[]
@Entity
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnot/enabled/DomainObjectEntityChangePublishingVm_publishingEnabledMetaAnnotatedEntities.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnot/enabled/DomainObjectEntityChangePublishingVm_publishingEnabledMetaAnnotatedEntities.java
index 8caabb878a..273080ecd3 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnot/enabled/DomainObjectEntityChangePublishingVm_publishingEnabledMetaAnnotatedEntities.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnot/enabled/DomainObjectEntityChangePublishingVm_publishingEnabledMetaAnnotatedEntities.java
@@ -24,10 +24,9 @@ import javax.inject.Inject;
import org.apache.causeway.applib.annotation.Collection;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom._infra.values.ValueHolderRepository;
import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.DomainObjectEntityChangePublishingVm;
+import lombok.RequiredArgsConstructor;
@Collection()
@RequiredArgsConstructor
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnot/enabled/jdo/DomainObjectEntityChangePublishingEnabledMetaAnnotatedJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnot/enabled/jdo/DomainObjectEntityChangePublishingEnabledMetaAnnotatedJdo.java
index f06aefb622..d3119401fe 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnot/enabled/jdo/DomainObjectEntityChangePublishingEnabledMetaAnnotatedJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnot/enabled/jdo/DomainObjectEntityChangePublishingEnabledMetaAnnotatedJdo.java
@@ -32,11 +32,10 @@ import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.Title;
-import lombok.Getter;
-import lombok.Setter;
-
import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnot.DomainObjectEntityChangePublishingEnabledMetaAnnotation;
import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnot.enabled.DomainObjectEntityChangePublishingEnabledMetaAnnotatedEntity;
+import lombok.Getter;
+import lombok.Setter;
@Profile("demo-jdo")
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnot/enabled/jpa/DomainObjectEntityChangePublishingEnabledMetaAnnotatedJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnot/enabled/jpa/DomainObjectEntityChangePublishingEnabledMetaAnnotatedJpa.java
index 83877b6e55..1e9a1bd9dd 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnot/enabled/jpa/DomainObjectEntityChangePublishingEnabledMetaAnnotatedJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnot/enabled/jpa/DomainObjectEntityChangePublishingEnabledMetaAnnotatedJpa.java
@@ -34,13 +34,12 @@ import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
+import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnot.DomainObjectEntityChangePublishingEnabledMetaAnnotation;
+import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnot.enabled.DomainObjectEntityChangePublishingEnabledMetaAnnotatedEntity;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnot.DomainObjectEntityChangePublishingEnabledMetaAnnotation;
-import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnot.enabled.DomainObjectEntityChangePublishingEnabledMetaAnnotatedEntity;
-
@Profile("demo-jpa")
//tag::class[]
@Entity
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnotOverridden/enabled/DomainObjectEntityChangePublishingVm_publishingEnabledMetaAnnotOverriddenEntities.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnotOverridden/enabled/DomainObjectEntityChangePublishingVm_publishingEnabledMetaAnnotOverriddenEntities.java
index 14cca1ed57..952de3ca1c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnotOverridden/enabled/DomainObjectEntityChangePublishingVm_publishingEnabledMetaAnnotOverriddenEntities.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnotOverridden/enabled/DomainObjectEntityChangePublishingVm_publishingEnabledMetaAnnotOverriddenEntities.java
@@ -24,10 +24,9 @@ import javax.inject.Inject;
import org.apache.causeway.applib.annotation.Collection;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom._infra.values.ValueHolderRepository;
import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.DomainObjectEntityChangePublishingVm;
+import lombok.RequiredArgsConstructor;
@Collection()
@RequiredArgsConstructor
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnotOverridden/enabled/jdo/DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnotOverridden/enabled/jdo/DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJdo.java
index 1edcc485a2..db29129d02 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnotOverridden/enabled/jdo/DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnotOverridden/enabled/jdo/DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJdo.java
@@ -33,11 +33,10 @@ import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.Publishing;
import org.apache.causeway.applib.annotation.Title;
-import lombok.Getter;
-import lombok.Setter;
-
import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnotOverridden.DomainObjectEntityChangePublishingDisabledMetaAnnotation;
import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnotOverridden.enabled.DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenEntity;
+import lombok.Getter;
+import lombok.Setter;
@Profile("demo-jdo")
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnotOverridden/enabled/jpa/DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnotOverridden/enabled/jpa/DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJpa.java
index 9ce323f904..8f69beea30 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnotOverridden/enabled/jpa/DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnotOverridden/enabled/jpa/DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJpa.java
@@ -35,13 +35,12 @@ import org.apache.causeway.applib.annotation.Publishing;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
+import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnotOverridden.DomainObjectEntityChangePublishingDisabledMetaAnnotation;
+import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnotOverridden.enabled.DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenEntity;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnotOverridden.DomainObjectEntityChangePublishingDisabledMetaAnnotation;
-import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnotOverridden.enabled.DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenEntity;
-
@Profile("demo-jpa")
//tag::class[]
@Entity
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/StatefulVmJaxbRefsEntity.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/StatefulVmJaxbRefsEntity.java
index 4383fd8e1c..a9afd879f0 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/StatefulVmJaxbRefsEntity.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/StatefulVmJaxbRefsEntity.java
@@ -46,13 +46,12 @@ import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.jaxb.PersistentEntitiesAdapter;
import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom._infra.values.ValueHolderRepository;
import lombok.Getter;
import lombok.Setter;
import lombok.val;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom._infra.values.ValueHolderRepository;
-
//tag::class[]
@XmlRootElement(name = "root")
@XmlType(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/jdo/JaxbRefJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/jdo/JaxbRefJdo.java
index 53762c3f2b..57b6526871 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/jdo/JaxbRefJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/jdo/JaxbRefJdo.java
@@ -30,11 +30,10 @@ import org.springframework.context.annotation.Profile;
import org.apache.causeway.applib.annotation.Bounding;
import org.apache.causeway.applib.annotation.DomainObject;
+import demoapp.dom.domain.objects.DomainObject.nature.viewmodels.jaxbrefentity.JaxbRefEntity;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom.domain.objects.DomainObject.nature.viewmodels.jaxbrefentity.JaxbRefEntity;
-
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo" )
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/jpa/JaxbRefJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/jpa/JaxbRefJpa.java
index 604c1b5f31..b32439f6d4 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/jpa/JaxbRefJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/jpa/JaxbRefJpa.java
@@ -32,12 +32,11 @@ import org.apache.causeway.applib.annotation.Bounding;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
+import demoapp.dom.domain.objects.DomainObject.nature.viewmodels.jaxbrefentity.JaxbRefEntity;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom.domain.objects.DomainObject.nature.viewmodels.jaxbrefentity.JaxbRefEntity;
-
@Profile("demo-jpa")
//tag::class[]
@Entity
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/usingjaxb/StatefulVmUsingJaxb.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/usingjaxb/StatefulVmUsingJaxb.java
index 33c320737d..be5537bed9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/usingjaxb/StatefulVmUsingJaxb.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/usingjaxb/StatefulVmUsingJaxb.java
@@ -41,13 +41,12 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.annotation.Title;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
import lombok.val;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
//tag::class[]
@XmlRootElement(name = "root") // <.>
@XmlType // <.>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/ComplexNumberJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/ComplexNumberJdo.java
index 50807b2821..6734514cc0 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/ComplexNumberJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/ComplexNumberJdo.java
@@ -25,11 +25,10 @@ import java.util.regex.Pattern;
import org.apache.causeway.applib.annotation.ObjectSupport;
import org.apache.causeway.applib.annotation.Value;
+import demoapp.dom.domain.objects.other.embedded.ComplexNumber;
import lombok.AccessLevel;
import lombok.val;
-import demoapp.dom.domain.objects.other.embedded.ComplexNumber;
-
// tag::class[]
@javax.jdo.annotations.PersistenceCapable // <.>
@javax.jdo.annotations.EmbeddedOnly // <.>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdo.java
index f1e5724287..08d2b13808 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdo.java
@@ -33,11 +33,10 @@ import org.apache.causeway.applib.annotation.Editing;
import org.apache.causeway.applib.annotation.ObjectSupport;
import org.apache.causeway.applib.annotation.Property;
-import lombok.Getter;
-import lombok.Setter;
-
import demoapp.dom.domain.objects.other.embedded.ComplexNumber;
import demoapp.dom.domain.objects.other.embedded.persistence.NumberConstantEntity;
+import lombok.Getter;
+import lombok.Setter;
@Profile("demo-jdo")
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdoRepository.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdoRepository.java
index d7eef8c4d8..c6a1fe26bf 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdoRepository.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdoRepository.java
@@ -21,10 +21,9 @@ package demoapp.dom.domain.objects.other.embedded.jdo;
import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Service;
-import lombok.val;
-
import demoapp.dom._infra.values.ValueHolderRepository;
import demoapp.dom.domain.objects.other.embedded.ComplexNumber;
+import lombok.val;
@Profile("demo-jdo")
@Service
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/ComplexNumberJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/ComplexNumberJpa.java
index 0c04d08ba9..c7f370abe1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/ComplexNumberJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/ComplexNumberJpa.java
@@ -25,11 +25,10 @@ import java.util.regex.Pattern;
import org.apache.causeway.applib.annotation.ObjectSupport;
import org.apache.causeway.applib.annotation.Value;
+import demoapp.dom.domain.objects.other.embedded.ComplexNumber;
import lombok.AccessLevel;
import lombok.val;
-import demoapp.dom.domain.objects.other.embedded.ComplexNumber;
-
// tag::class[]
//@Entity // <.>
@javax.persistence.Embeddable // <.>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa.java
index f09776a437..334da57e97 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa.java
@@ -33,13 +33,12 @@ import org.apache.causeway.applib.annotation.ObjectSupport;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
+import demoapp.dom.domain.objects.other.embedded.ComplexNumber;
+import demoapp.dom.domain.objects.other.embedded.persistence.NumberConstantEntity;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom.domain.objects.other.embedded.ComplexNumber;
-import demoapp.dom.domain.objects.other.embedded.persistence.NumberConstantEntity;
-
@Profile("demo-jpa")
//tag::class[]
@Entity
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpaRepository.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpaRepository.java
index 00048b77ec..09397636c8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpaRepository.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpaRepository.java
@@ -21,10 +21,9 @@ package demoapp.dom.domain.objects.other.embedded.jpa;
import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Service;
-import lombok.val;
-
import demoapp.dom._infra.values.ValueHolderRepository;
import demoapp.dom.domain.objects.other.embedded.ComplexNumber;
+import lombok.val;
@Profile("demo-jpa")
@Service
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/MixinVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/MixinVm.java
index b9513509e0..75a8812fcd 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/MixinVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/MixinVm.java
@@ -30,11 +30,10 @@ import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.ObjectSupport;
import org.apache.causeway.applib.annotation.Property;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
//tag::class[]
@XmlRootElement(name = "Demo")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/PropertyMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/PropertyMenu.java
index 2318cb0856..fbc7bda572 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/PropertyMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/PropertyMenu.java
@@ -32,9 +32,6 @@ import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.applib.value.Clob;
-import lombok.RequiredArgsConstructor;
-import lombok.val;
-
import demoapp.dom._infra.values.ValueHolderRepository;
import demoapp.dom.domain.properties.Property.commandPublishing.PropertyCommandPublishingEntity;
import demoapp.dom.domain.properties.Property.domainEvent.PropertyDomainEventVm;
@@ -52,6 +49,8 @@ import demoapp.dom.domain.properties.Property.projecting.persistence.PropertyPro
import demoapp.dom.domain.properties.Property.regexPattern.PropertyRegexPatternVm;
import demoapp.dom.domain.properties.Property.snapshot.PropertySnapshotVm;
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
+import lombok.val;
@Named("demo.PropertyMenu")
@DomainService(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jdo/PropertyCommandPublishingJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jdo/PropertyCommandPublishingJdo.java
index 8a2e044834..65ad1eeb24 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jdo/PropertyCommandPublishingJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jdo/PropertyCommandPublishingJdo.java
@@ -34,12 +34,11 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Publishing;
-import lombok.Getter;
-import lombok.Setter;
-
import demoapp.dom.domain.properties.Property.commandPublishing.PropertyCommandPublishingDisabledMetaAnnotation;
import demoapp.dom.domain.properties.Property.commandPublishing.PropertyCommandPublishingEnabledMetaAnnotation;
import demoapp.dom.domain.properties.Property.commandPublishing.PropertyCommandPublishingEntity;
+import lombok.Getter;
+import lombok.Setter;
@Profile("demo-jdo")
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jpa/PropertyCommandPublishingJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jpa/PropertyCommandPublishingJpa.java
index da8ab3d901..af1f23a863 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jpa/PropertyCommandPublishingJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jpa/PropertyCommandPublishingJpa.java
@@ -35,13 +35,12 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Publishing;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
import demoapp.dom.domain.properties.Property.commandPublishing.PropertyCommandPublishingDisabledMetaAnnotation;
import demoapp.dom.domain.properties.Property.commandPublishing.PropertyCommandPublishingEnabledMetaAnnotation;
import demoapp.dom.domain.properties.Property.commandPublishing.PropertyCommandPublishingEntity;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
@Profile("demo-jpa")
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventVm.java
index a57e3bf22e..a6df16ac82 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventVm.java
@@ -33,12 +33,11 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.events.domain.PropertyDomainEvent;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
@XmlRootElement(name = "root")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/subscribers/PropertyDomainEventControlService.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/subscribers/PropertyDomainEventControlService.java
index 3e8ac13560..8293107e7b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/subscribers/PropertyDomainEventControlService.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/subscribers/PropertyDomainEventControlService.java
@@ -26,9 +26,8 @@ import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.domain.properties.Property.domainEvent.PropertyDomainEventVm;
+import lombok.RequiredArgsConstructor;
// tag::class[]
@Service
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/subscribers/PropertyDomainEventVm_controlText.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/subscribers/PropertyDomainEventVm_controlText.java
index ed3ee842c2..3fde90dbc0 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/subscribers/PropertyDomainEventVm_controlText.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/subscribers/PropertyDomainEventVm_controlText.java
@@ -23,9 +23,8 @@ import javax.inject.Inject;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.domain.properties.Property.domainEvent.PropertyDomainEventVm;
+import lombok.RequiredArgsConstructor;
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/subscribers/PropertyDomainEventVm_controlTextEditing.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/subscribers/PropertyDomainEventVm_controlTextEditing.java
index 7a408e0030..6cfd77d8b2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/subscribers/PropertyDomainEventVm_controlTextEditing.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/subscribers/PropertyDomainEventVm_controlTextEditing.java
@@ -27,9 +27,8 @@ import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.applib.annotation.Redirect;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.domain.properties.Property.domainEvent.PropertyDomainEventVm;
+import lombok.RequiredArgsConstructor;
//tag::class[]
@Action(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingVm.java
index 3ddffd1110..ef23de68f2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingVm.java
@@ -32,11 +32,10 @@ import org.apache.causeway.applib.annotation.ObjectSupport;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jdo/PropertyExecutionPublishingJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jdo/PropertyExecutionPublishingJdo.java
index e876491fec..ff3437412f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jdo/PropertyExecutionPublishingJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jdo/PropertyExecutionPublishingJdo.java
@@ -35,12 +35,11 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Publishing;
-import lombok.Getter;
-import lombok.Setter;
-
import demoapp.dom.domain.properties.Property.executionPublishing.PropertyExecutionPublishingDisabledMetaAnnotation;
import demoapp.dom.domain.properties.Property.executionPublishing.PropertyExecutionPublishingEnabledMetaAnnotation;
import demoapp.dom.domain.properties.Property.executionPublishing.PropertyExecutionPublishingEntity;
+import lombok.Getter;
+import lombok.Setter;
@Profile("demo-jdo")
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jpa/PropertyExecutionPublishingJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jpa/PropertyExecutionPublishingJpa.java
index c57d0c21a2..c7ebd44a80 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jpa/PropertyExecutionPublishingJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jpa/PropertyExecutionPublishingJpa.java
@@ -36,13 +36,12 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Publishing;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
import demoapp.dom.domain.properties.Property.executionPublishing.PropertyExecutionPublishingDisabledMetaAnnotation;
import demoapp.dom.domain.properties.Property.executionPublishing.PropertyExecutionPublishingEnabledMetaAnnotation;
import demoapp.dom.domain.properties.Property.executionPublishing.PropertyExecutionPublishingEntity;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
@Profile("demo-jpa")
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/fileAccept/PropertyFileAcceptVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/fileAccept/PropertyFileAcceptVm.java
index aa2b0aca10..d9f179fee9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/fileAccept/PropertyFileAcceptVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/fileAccept/PropertyFileAcceptVm.java
@@ -34,11 +34,10 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.applib.value.Clob;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/PropertyHiddenVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/PropertyHiddenVm.java
index fa23a98b1c..73c175c300 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/PropertyHiddenVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/PropertyHiddenVm.java
@@ -38,13 +38,12 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Where;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.domain.properties.Property.hidden.child.PropertyHiddenChildVm;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.domain.properties.Property.hidden.child.PropertyHiddenChildVm;
-
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/PropertyHiddenVm_returnsChildren.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/PropertyHiddenVm_returnsChildren.java
index 1e9f8a9497..6b10c35d4c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/PropertyHiddenVm_returnsChildren.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/PropertyHiddenVm_returnsChildren.java
@@ -24,9 +24,8 @@ import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.MemberSupport;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.domain.properties.Property.hidden.child.PropertyHiddenChildVm;
+import lombok.RequiredArgsConstructor;
@Action(
semantics = SemanticsOf.SAFE
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/child/PropertyHiddenChildVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/child/PropertyHiddenChildVm.java
index 0849fc5d1b..af7ca1c465 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/child/PropertyHiddenChildVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/child/PropertyHiddenChildVm.java
@@ -33,13 +33,12 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Where;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.domain.properties.Property.hidden.PropertyHiddenVm;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.domain.properties.Property.hidden.PropertyHiddenVm;
-
//tag::class[]
@XmlRootElement(name = "child")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/maxLength/PropertyMaxLengthVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/maxLength/PropertyMaxLengthVm.java
index 065b8281ab..e3ed897ed8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/maxLength/PropertyMaxLengthVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/maxLength/PropertyMaxLengthVm.java
@@ -32,11 +32,10 @@ import org.apache.causeway.applib.annotation.ObjectSupport;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/mustSatisfy/PropertyMustSatisfyVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/mustSatisfy/PropertyMustSatisfyVm.java
index 800157fc92..0ef451f364 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/mustSatisfy/PropertyMustSatisfyVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/mustSatisfy/PropertyMustSatisfyVm.java
@@ -32,11 +32,10 @@ import org.apache.causeway.applib.annotation.ObjectSupport;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityVm.java
index 63589a35ee..ebe95ca261 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityVm.java
@@ -33,11 +33,10 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingVm.java
index 49f745889b..93a317a9bd 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingVm.java
@@ -36,13 +36,12 @@ import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.ObjectSupport;
import org.apache.causeway.applib.annotation.PropertyLayout;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.domain.properties.Property.projecting.child.PropertyProjectingChildVm;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.domain.properties.Property.projecting.child.PropertyProjectingChildVm;
-
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingVm_returnsChildren.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingVm_returnsChildren.java
index fa09479b03..3357da95a4 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingVm_returnsChildren.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingVm_returnsChildren.java
@@ -23,9 +23,8 @@ import java.util.List;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.domain.properties.Property.projecting.child.PropertyProjectingChildVm;
+import lombok.RequiredArgsConstructor;
@Action(
semantics = SemanticsOf.SAFE
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/child/PropertyProjectingChildVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/child/PropertyProjectingChildVm.java
index a67f7cdf68..4569181f25 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/child/PropertyProjectingChildVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/child/PropertyProjectingChildVm.java
@@ -34,14 +34,13 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.applib.annotation.Where;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom.domain.properties.Property.projecting.jdo.PropertyProjectingChildJdo;
import demoapp.dom.domain.properties.Property.projecting.jpa.PropertyProjectingChildJpa;
import demoapp.dom.domain.properties.Property.projecting.persistence.PropertyProjectingChildEntity;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
//tag::class[]
@XmlRootElement(name = "child")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jdo/PropertyProjectingChildJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jdo/PropertyProjectingChildJdo.java
index f58301f48f..d3e4198427 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jdo/PropertyProjectingChildJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jdo/PropertyProjectingChildJdo.java
@@ -34,11 +34,10 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
+import demoapp.dom.domain.properties.Property.projecting.persistence.PropertyProjectingChildEntity;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom.domain.properties.Property.projecting.persistence.PropertyProjectingChildEntity;
-
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jpa/PropertyProjectingChildJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jpa/PropertyProjectingChildJpa.java
index 856a848a2a..0e53a4fb03 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jpa/PropertyProjectingChildJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jpa/PropertyProjectingChildJpa.java
@@ -35,12 +35,11 @@ import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
+import demoapp.dom.domain.properties.Property.projecting.persistence.PropertyProjectingChildEntity;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom.domain.properties.Property.projecting.persistence.PropertyProjectingChildEntity;
-
@Profile("demo-jpa")
//tag::class[]
@Entity
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/regexPattern/PropertyRegexPatternVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/regexPattern/PropertyRegexPatternVm.java
index f999cfc4fd..dadb02125a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/regexPattern/PropertyRegexPatternVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/regexPattern/PropertyRegexPatternVm.java
@@ -34,11 +34,10 @@ import org.apache.causeway.applib.annotation.ObjectSupport;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotVm.java
index 5b56db7e11..3770e1e7c4 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotVm.java
@@ -33,12 +33,11 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Snapshot;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
@XmlRootElement(name = "root")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/PropertyLayoutMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/PropertyLayoutMenu.java
index 21d4583f47..db954420a8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/PropertyLayoutMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/PropertyLayoutMenu.java
@@ -33,9 +33,6 @@ import org.apache.causeway.applib.services.clock.ClockService;
import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.applib.value.NamedWithMimeType.CommonMimeType;
-import lombok.RequiredArgsConstructor;
-import lombok.val;
-
import demoapp.dom.domain.properties.PropertyLayout.cssClass.PropertyLayoutCssClassVm;
import demoapp.dom.domain.properties.PropertyLayout.describedAs.PropertyLayoutDescribedAsVm;
import demoapp.dom.domain.properties.PropertyLayout.hidden.PropertyLayoutHiddenVm;
@@ -48,6 +45,8 @@ import demoapp.dom.domain.properties.PropertyLayout.renderDay.PropertyLayoutRend
import demoapp.dom.domain.properties.PropertyLayout.repainting.PropertyLayoutRepaintingVm;
import demoapp.dom.domain.properties.PropertyLayout.typicalLength.PropertyLayoutTypicalLengthVm;
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
+import lombok.val;
@Named("demo.PropertyLayoutMenu")
@DomainService(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/cssClass/PropertyLayoutCssClassVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/cssClass/PropertyLayoutCssClassVm.java
index 1b9f43a29b..a73c34f7a8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/cssClass/PropertyLayoutCssClassVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/cssClass/PropertyLayoutCssClassVm.java
@@ -33,11 +33,10 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/describedAs/PropertyLayoutDescribedAsVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/describedAs/PropertyLayoutDescribedAsVm.java
index 1e9095af6f..7f8763980c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/describedAs/PropertyLayoutDescribedAsVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/describedAs/PropertyLayoutDescribedAsVm.java
@@ -33,11 +33,10 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenVm.java
index 227b8daf99..f640513a13 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenVm.java
@@ -39,13 +39,12 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Where;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.domain.properties.PropertyLayout.hidden.child.PropertyLayoutHiddenChildVm;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.domain.properties.PropertyLayout.hidden.child.PropertyLayoutHiddenChildVm;
-
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenVm_returnsChildren.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenVm_returnsChildren.java
index d0a9895ddf..b8bbe7013f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenVm_returnsChildren.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenVm_returnsChildren.java
@@ -24,9 +24,8 @@ import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.MemberSupport;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.domain.properties.PropertyLayout.hidden.child.PropertyLayoutHiddenChildVm;
+import lombok.RequiredArgsConstructor;
@Action(
semantics = SemanticsOf.SAFE
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/child/PropertyLayoutHiddenChildVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/child/PropertyLayoutHiddenChildVm.java
index 5e7e7873c4..6c72dc002b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/child/PropertyLayoutHiddenChildVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/child/PropertyLayoutHiddenChildVm.java
@@ -34,13 +34,12 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Where;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.domain.properties.PropertyLayout.hidden.PropertyLayoutHiddenVm;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.domain.properties.PropertyLayout.hidden.PropertyLayoutHiddenVm;
-
//tag::class[]
@XmlRootElement(name = "child")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionVm.java
index b49d68a907..4db825640f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionVm.java
@@ -34,11 +34,10 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/multiLine/PropertyLayoutMultiLineVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/multiLine/PropertyLayoutMultiLineVm.java
index 0cde15f22b..2c7e9f0155 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/multiLine/PropertyLayoutMultiLineVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/multiLine/PropertyLayoutMultiLineVm.java
@@ -33,11 +33,10 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/named/PropertyLayoutNamedVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/named/PropertyLayoutNamedVm.java
index 6ef6fbcedf..d7e308a024 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/named/PropertyLayoutNamedVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/named/PropertyLayoutNamedVm.java
@@ -33,11 +33,10 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileNodeVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileNodeVm.java
index 14c1801511..26d9329f61 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileNodeVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileNodeVm.java
@@ -34,14 +34,13 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.graph.tree.TreeNode;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import lombok.val;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
@XmlRootElement(name="FileNode")
@Named("demo.FileNode")
@DomainObject(nature=Nature.VIEW_MODEL)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingVm.java
index 4d3701881a..7d597122da 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingVm.java
@@ -36,11 +36,10 @@ import org.apache.causeway.applib.annotation.Repainting;
import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.extensions.pdfjs.applib.annotations.PdfJsViewer;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/typicalLength/PropertyLayoutTypicalLengthVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/typicalLength/PropertyLayoutTypicalLengthVm.java
index 77e850d4bf..6c1c74cb66 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/typicalLength/PropertyLayoutTypicalLengthVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/typicalLength/PropertyLayoutTypicalLengthVm.java
@@ -33,11 +33,10 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/featured/customui/geocoding/GeoapifyClient.java b/examples/demo/domain/src/main/java/demoapp/dom/featured/customui/geocoding/GeoapifyClient.java
index 1c7d01cbe4..d5790cdec9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/featured/customui/geocoding/GeoapifyClient.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/featured/customui/geocoding/GeoapifyClient.java
@@ -30,17 +30,17 @@ import javax.inject.Inject;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.causeway.commons.internal.base._Bytes;
import org.springframework.stereotype.Service;
+import org.apache.causeway.commons.internal.base._Bytes;
+
+import demoapp.dom.AppConfiguration;
import lombok.Builder;
import lombok.Data;
import lombok.Getter;
import lombok.SneakyThrows;
import lombok.val;
-import demoapp.dom.AppConfiguration;
-
//tag::class[]
@Service
public class GeoapifyClient implements Serializable {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/featured/customui/vm/BoundingBox.java b/examples/demo/domain/src/main/java/demoapp/dom/featured/customui/vm/BoundingBox.java
index c9ffe65a46..2d9031946c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/featured/customui/vm/BoundingBox.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/featured/customui/vm/BoundingBox.java
@@ -18,11 +18,10 @@
*/
package demoapp.dom.featured.customui.vm;
+import demoapp.dom.featured.customui.latlng.LatLng;
import lombok.Data;
import lombok.Getter;
-import demoapp.dom.featured.customui.latlng.LatLng;
-
@Data
public class BoundingBox {
@Getter
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/featured/customui/vm/WhereInTheWorldMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/featured/customui/vm/WhereInTheWorldMenu.java
index 2de3accd56..4d5bb646d2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/featured/customui/vm/WhereInTheWorldMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/featured/customui/vm/WhereInTheWorldMenu.java
@@ -32,10 +32,9 @@ import org.apache.causeway.applib.annotation.NatureOfService;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.val;
-
import demoapp.dom.featured.customui.geocoding.GeoapifyClient;
import demoapp.dom.featured.customui.latlng.Zoom;
+import lombok.val;
@Named("demo.WhereInTheWorldMenu")
@DomainService(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/featured/customui/vm/WhereInTheWorldVm.java b/examples/demo/domain/src/main/java/demoapp/dom/featured/customui/vm/WhereInTheWorldVm.java
index 85249231f1..3e1edcf42b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/featured/customui/vm/WhereInTheWorldVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/featured/customui/vm/WhereInTheWorldVm.java
@@ -30,13 +30,12 @@ import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.Title;
-import lombok.Getter;
-import lombok.Setter;
-
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom.featured.customui.latlng.Latitude;
import demoapp.dom.featured.customui.latlng.Longitude;
import demoapp.dom.featured.customui.latlng.Zoom;
+import lombok.Getter;
+import lombok.Setter;
//tag::class[]
@XmlRootElement(name = "demo.CustomUiVm")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/describedAs/DescribedAsMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/describedAs/DescribedAsMenu.java
index 5b3def1d8f..72608ebbe9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/describedAs/DescribedAsMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/describedAs/DescribedAsMenu.java
@@ -29,11 +29,10 @@ import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.services.factory.FactoryService;
+import demoapp.dom.domain.actions.progmodel.assoc.DemoItem;
import lombok.RequiredArgsConstructor;
import lombok.val;
-import demoapp.dom.domain.actions.progmodel.assoc.DemoItem;
-
@Named("demo.DescribedAsMenu")
@DomainService(
nature=NatureOfService.VIEW
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/describedAs/DescribedAsVm.java b/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/describedAs/DescribedAsVm.java
index 21011c59ea..279a702288 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/describedAs/DescribedAsVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/describedAs/DescribedAsVm.java
@@ -49,11 +49,10 @@ import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.services.message.MessageService;
import org.apache.causeway.applib.value.Markup;
-import lombok.Getter;
-import lombok.Setter;
-
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom.domain.actions.progmodel.assoc.DemoItem;
+import lombok.Getter;
+import lombok.Setter;
@XmlRootElement(name = "Demo")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/tabs/TabDemo.java b/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/tabs/TabDemo.java
index 237de64ef2..836a0b46d9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/tabs/TabDemo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/tabs/TabDemo.java
@@ -32,11 +32,10 @@ import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.ObjectSupport;
import org.apache.causeway.applib.annotation.Property;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
@XmlRootElement(name = "Demo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/ServicesMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/ServicesMenu.java
index fc0243600c..6b124a2ab8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/ServicesMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/ServicesMenu.java
@@ -29,9 +29,6 @@ import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.services.factory.FactoryService;
-import lombok.RequiredArgsConstructor;
-import lombok.val;
-
import demoapp.dom._infra.values.ValueHolderRepository;
import demoapp.dom.services.core.errorreportingservice.ErrorReportingServiceDemoVm;
import demoapp.dom.services.core.eventbusservice.EventBusServiceDemoVm;
@@ -39,6 +36,8 @@ import demoapp.dom.services.core.messageservice.MessageServiceDemoVm;
import demoapp.dom.services.core.wrapperFactory.WrapperFactoryEntity;
import demoapp.dom.services.core.xmlSnapshotService.XmlSnapshotParentVm;
import demoapp.dom.services.core.xmlSnapshotService.peer.XmlSnapshotPeerVm;
+import lombok.RequiredArgsConstructor;
+import lombok.val;
@Named("demo.ServicesMenu")
@DomainService(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/errorreportingservice/EmailTicket.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/errorreportingservice/EmailTicket.java
index 414c52b911..6621e9410c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/errorreportingservice/EmailTicket.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/errorreportingservice/EmailTicket.java
@@ -22,11 +22,12 @@ import java.io.Serializable;
import java.util.List;
import java.util.stream.Collectors;
-import static org.apache.causeway.commons.internal.base._NullSafe.stream;
-
import org.apache.causeway.applib.services.error.ErrorDetails;
import org.apache.causeway.applib.services.error.ErrorReportingService;
import org.apache.causeway.applib.services.error.SimpleTicket;
+import org.apache.causeway.applib.services.error.Ticket.StackTracePolicy;
+
+import static org.apache.causeway.commons.internal.base._NullSafe.stream;
import lombok.Builder;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJdo.java
index 883c8e60d3..9db4cec492 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJdo.java
@@ -35,12 +35,11 @@ import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Editing;
import org.apache.causeway.applib.annotation.Property;
+import demoapp.dom.services.core.eventbusservice.EventBusServiceDemoVm.UiButtonEvent;
import lombok.Getter;
import lombok.Setter;
import lombok.val;
-import demoapp.dom.services.core.eventbusservice.EventBusServiceDemoVm.UiButtonEvent;
-
@Profile("demo-jdo")
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo" )
@DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJdoRepository.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJdoRepository.java
index 25bd789459..79f4928378 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJdoRepository.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJdoRepository.java
@@ -28,9 +28,8 @@ import org.springframework.stereotype.Repository;
import org.apache.causeway.applib.services.repository.RepositoryService;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.services.core.eventbusservice.EventBusServiceDemoVm.UiButtonEvent;
+import lombok.RequiredArgsConstructor;
@Profile("demo-jdo")
@Repository
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJpa.java
index 8bb3a18ae0..ff3ee93b25 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJpa.java
@@ -34,12 +34,11 @@ import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Editing;
import org.apache.causeway.applib.annotation.Property;
+import demoapp.dom.services.core.eventbusservice.EventBusServiceDemoVm.UiButtonEvent;
import lombok.Getter;
import lombok.Setter;
import lombok.val;
-import demoapp.dom.services.core.eventbusservice.EventBusServiceDemoVm.UiButtonEvent;
-
@Profile("demo-jpa")
@Entity
@Named("demo.EventLogEntry")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJpaRepository.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJpaRepository.java
index 4674fcc7e2..c72cae38c8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJpaRepository.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJpaRepository.java
@@ -28,9 +28,8 @@ import org.springframework.stereotype.Repository;
import org.apache.causeway.applib.services.repository.RepositoryService;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.services.core.eventbusservice.EventBusServiceDemoVm.UiButtonEvent;
+import lombok.RequiredArgsConstructor;
@Profile("demo-jpa")
@Repository
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryRepository.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryRepository.java
index 7e65297fe6..698680ee10 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryRepository.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryRepository.java
@@ -20,9 +20,8 @@ package demoapp.dom.services.core.eventbusservice;
import java.util.List;
-import lombok.val;
-
import demoapp.dom.services.core.eventbusservice.EventBusServiceDemoVm.UiButtonEvent;
+import lombok.val;
public interface EventLogEntryRepository<T extends EventLogEntry> {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventSubscriberDemoImplementation.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventSubscriberDemoImplementation.java
index c79c1fb9ce..16ceb61849 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventSubscriberDemoImplementation.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventSubscriberDemoImplementation.java
@@ -18,6 +18,8 @@
*/
package demoapp.dom.services.core.eventbusservice;
+import static demoapp.dom._infra.utils.LogUtils.emphasize;
+
import javax.inject.Inject;
import javax.inject.Named;
@@ -32,14 +34,11 @@ import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.services.wrapper.WrapperFactory;
import org.apache.causeway.applib.services.wrapper.control.AsyncControl;
+import demoapp.dom.services.core.eventbusservice.EventBusServiceDemoVm.UiButtonEvent;
import lombok.RequiredArgsConstructor;
import lombok.val;
import lombok.extern.log4j.Log4j2;
-import demoapp.dom.services.core.eventbusservice.EventBusServiceDemoVm.UiButtonEvent;
-
-import static demoapp.dom._infra.utils.LogUtils.emphasize;
-
@Service
@Named("demo.eventSubscriber")
@Qualifier("demo")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jdo/WrapperFactoryJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jdo/WrapperFactoryJdo.java
index 5063a80727..d931a59ab1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jdo/WrapperFactoryJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jdo/WrapperFactoryJdo.java
@@ -41,13 +41,12 @@ import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.services.wrapper.WrapperFactory;
import org.apache.causeway.applib.services.wrapper.control.AsyncControl;
+import demoapp.dom.services.core.wrapperFactory.WrapperFactoryEntity;
+import demoapp.dom.services.core.wrapperFactory.WrapperFactoryEntity_updatePropertyAsyncMixin;
import lombok.Getter;
import lombok.Setter;
import lombok.val;
-import demoapp.dom.services.core.wrapperFactory.WrapperFactoryEntity;
-import demoapp.dom.services.core.wrapperFactory.WrapperFactoryEntity_updatePropertyAsyncMixin;
-
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jpa/WrapperFactoryJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jpa/WrapperFactoryJpa.java
index eb94bdeefc..65264d474a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jpa/WrapperFactoryJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jpa/WrapperFactoryJpa.java
@@ -43,14 +43,13 @@ import org.apache.causeway.applib.services.wrapper.WrapperFactory;
import org.apache.causeway.applib.services.wrapper.control.AsyncControl;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
+import demoapp.dom.services.core.wrapperFactory.WrapperFactoryEntity;
+import demoapp.dom.services.core.wrapperFactory.WrapperFactoryEntity_updatePropertyAsyncMixin;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.val;
-import demoapp.dom.services.core.wrapperFactory.WrapperFactoryEntity;
-import demoapp.dom.services.core.wrapperFactory.WrapperFactoryEntity_updatePropertyAsyncMixin;
-
@Profile("demo-jpa")
//tag::class[]
@Entity
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/XmlSnapshotParentVm.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/XmlSnapshotParentVm.java
index 2ac4af2a4b..d9f6bbacc1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/XmlSnapshotParentVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/XmlSnapshotParentVm.java
@@ -37,15 +37,14 @@ import org.apache.causeway.applib.annotation.ObjectSupport;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.services.core.xmlSnapshotService.child.XmlSnapshotChildVm;
+import demoapp.dom.services.core.xmlSnapshotService.peer.XmlSnapshotPeerVm;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.val;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.services.core.xmlSnapshotService.child.XmlSnapshotChildVm;
-import demoapp.dom.services.core.xmlSnapshotService.peer.XmlSnapshotPeerVm;
-
@XmlRootElement(name = "root")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/child/XmlSnapshotChildVm.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/child/XmlSnapshotChildVm.java
index d882b57bb2..a27472ee11 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/child/XmlSnapshotChildVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/child/XmlSnapshotChildVm.java
@@ -31,12 +31,11 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
//tag::class[]
@XmlRootElement(name = "child")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/peer/XmlSnapshotPeerVm.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/peer/XmlSnapshotPeerVm.java
index 131cf3526f..041c94eccc 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/peer/XmlSnapshotPeerVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/peer/XmlSnapshotPeerVm.java
@@ -36,14 +36,13 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.services.core.xmlSnapshotService.peer.child.XmlSnapshotPeerChildVm;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.val;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.services.core.xmlSnapshotService.peer.child.XmlSnapshotPeerChildVm;
-
//tag::class[]
@XmlRootElement(name = "peer")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/peer/child/XmlSnapshotPeerChildVm.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/peer/child/XmlSnapshotPeerChildVm.java
index 14164e908c..84b2c51676 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/peer/child/XmlSnapshotPeerChildVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/peer/child/XmlSnapshotPeerChildVm.java
@@ -31,12 +31,11 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
//tag::class[]
@XmlRootElement(name = "child")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/ApplicationTenancyEvaluatorForDemo.java b/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/ApplicationTenancyEvaluatorForDemo.java
index c3efcb9746..0b035e3a37 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/ApplicationTenancyEvaluatorForDemo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/ApplicationTenancyEvaluatorForDemo.java
@@ -25,11 +25,10 @@ import org.springframework.stereotype.Service;
import org.apache.causeway.extensions.secman.applib.tenancy.spi.ApplicationTenancyEvaluator;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser;
+import demoapp.dom.services.extensions.secman.apptenancy.persistence.TenantedEntity;
import lombok.Getter;
import lombok.val;
-import demoapp.dom.services.extensions.secman.apptenancy.persistence.TenantedEntity;
-
//tag::class[]
@Service
public class ApplicationTenancyEvaluatorForDemo
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/jdo/TenantedJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/jdo/TenantedJdo.java
index 5958e69928..3d79eed41e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/jdo/TenantedJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/jdo/TenantedJdo.java
@@ -36,11 +36,10 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.annotation.Title;
+import demoapp.dom.services.extensions.secman.apptenancy.persistence.TenantedEntity;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom.services.extensions.secman.apptenancy.persistence.TenantedEntity;
-
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo" )
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/jpa/TenantedJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/jpa/TenantedJpa.java
index ef56baad77..56c1cf7599 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/jpa/TenantedJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/jpa/TenantedJpa.java
@@ -38,12 +38,11 @@ import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
+import demoapp.dom.services.extensions.secman.apptenancy.persistence.TenantedEntity;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom.services.extensions.secman.apptenancy.persistence.TenantedEntity;
-
@Profile("demo-jpa")
//tag::class[]
@Entity
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/appuser/seed/AppUserSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/appuser/seed/AppUserSeeding.java
index 9becb17899..e65eefc126 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/appuser/seed/AppUserSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/appuser/seed/AppUserSeeding.java
@@ -21,10 +21,10 @@ package demoapp.dom.services.extensions.secman.appuser.seed;
import java.util.Locale;
import java.util.function.Consumer;
-import org.apache.causeway.commons.collections.Can;
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.extensions.secman.applib.role.fixtures.AbstractRoleAndPermissionsFixtureScript;
import org.apache.causeway.extensions.secman.applib.user.dom.AccountType;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/CausewayBlobHolder_actionReturningCollection.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/CausewayBlobHolder_actionReturningCollection.java
index 460828a2d3..f615a57e1e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/CausewayBlobHolder_actionReturningCollection.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/CausewayBlobHolder_actionReturningCollection.java
@@ -27,9 +27,8 @@ import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.value.Blob;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/CausewayBlobHolder_updateReadOnlyPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/CausewayBlobHolder_updateReadOnlyPropertyWithChoices.java
index 3a27f0e89a..d05bbeafec 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/CausewayBlobHolder_updateReadOnlyPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/CausewayBlobHolder_updateReadOnlyPropertyWithChoices.java
@@ -30,9 +30,8 @@ import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.value.Blob;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
@Action(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/jdo/CausewayBlobJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/jdo/CausewayBlobJdo.java
index d836a074ea..714411341e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/jdo/CausewayBlobJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/jdo/CausewayBlobJdo.java
@@ -36,11 +36,10 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.applib.value.Blob;
+import demoapp.dom.types.causeway.blobs.persistence.CausewayBlobEntity;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom.types.causeway.blobs.persistence.CausewayBlobEntity;
-
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/jpa/CausewayBlobJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/jpa/CausewayBlobJpa.java
index f1c63159c5..8d17fedcdd 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/jpa/CausewayBlobJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/jpa/CausewayBlobJpa.java
@@ -41,9 +41,8 @@ import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import org.apache.causeway.persistence.jpa.applib.types.BlobJpaEmbeddable;
-import lombok.NoArgsConstructor;
-
import demoapp.dom.types.causeway.blobs.persistence.CausewayBlobEntity;
+import lombok.NoArgsConstructor;
@Profile("demo-jpa")
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/samples/CausewayBlobsSamples.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/samples/CausewayBlobsSamples.java
index e86f4ba4fb..d57f9545e4 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/samples/CausewayBlobsSamples.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/samples/CausewayBlobsSamples.java
@@ -20,20 +20,19 @@ package demoapp.dom.types.causeway.blobs.samples;
import java.util.stream.Stream;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.base._Bytes;
-import org.apache.causeway.commons.internal.resources._Resources;
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.applib.value.NamedWithMimeType;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.base._Bytes;
+import org.apache.causeway.commons.internal.resources._Resources;
+import demoapp.dom.types.Samples;
import lombok.Getter;
import lombok.SneakyThrows;
import lombok.val;
-import demoapp.dom.types.Samples;
-
@Service
public class CausewayBlobsSamples implements Samples<Blob> {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/vm/CausewayBlobVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/vm/CausewayBlobVm.java
index 8ec780a8cf..2ac1345e8b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/vm/CausewayBlobVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/vm/CausewayBlobVm.java
@@ -34,11 +34,10 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.value.Blob;
-import lombok.Getter;
-import lombok.Setter;
-
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom.types.causeway.blobs.holder.CausewayBlobHolder2;
+import lombok.Getter;
+import lombok.Setter;
//tag::class[]
@XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/CausewayClobHolder_actionReturningCollection.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/CausewayClobHolder_actionReturningCollection.java
index 13282d8093..6413b8d823 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/CausewayClobHolder_actionReturningCollection.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/CausewayClobHolder_actionReturningCollection.java
@@ -27,9 +27,8 @@ import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.value.Clob;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/CausewayClobHolder_updateReadOnlyPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/CausewayClobHolder_updateReadOnlyPropertyWithChoices.java
index 0aa42d0e88..cb12edc207 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/CausewayClobHolder_updateReadOnlyPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/CausewayClobHolder_updateReadOnlyPropertyWithChoices.java
@@ -30,9 +30,8 @@ import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.value.Clob;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
@Action(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/jdo/CausewayClobJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/jdo/CausewayClobJdo.java
index 3cd73900a1..81eca0e610 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/jdo/CausewayClobJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/jdo/CausewayClobJdo.java
@@ -36,11 +36,10 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.applib.value.Clob;
+import demoapp.dom.types.causeway.clobs.persistence.CausewayClobEntity;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom.types.causeway.clobs.persistence.CausewayClobEntity;
-
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/jpa/CausewayClobJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/jpa/CausewayClobJpa.java
index 8d6ec96ad8..3b84dec965 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/jpa/CausewayClobJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/jpa/CausewayClobJpa.java
@@ -41,9 +41,8 @@ import org.apache.causeway.applib.value.Clob;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import org.apache.causeway.persistence.jpa.applib.types.ClobJpaEmbeddable;
-import lombok.NoArgsConstructor;
-
import demoapp.dom.types.causeway.clobs.persistence.CausewayClobEntity;
+import lombok.NoArgsConstructor;
@Profile("demo-jpa")
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/samples/CausewayClobsSamples.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/samples/CausewayClobsSamples.java
index 99c7fe95ba..e0ca166256 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/samples/CausewayClobsSamples.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/samples/CausewayClobsSamples.java
@@ -21,18 +21,17 @@ package demoapp.dom.types.causeway.clobs.samples;
import java.nio.charset.StandardCharsets;
import java.util.stream.Stream;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.resources._Resources;
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.value.Clob;
import org.apache.causeway.applib.value.NamedWithMimeType;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.resources._Resources;
+import demoapp.dom.types.Samples;
import lombok.SneakyThrows;
import lombok.val;
-import demoapp.dom.types.Samples;
-
@Service
public class CausewayClobsSamples implements Samples<Clob> {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/vm/CausewayClobVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/vm/CausewayClobVm.java
index 6b64600021..355a4b322e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/vm/CausewayClobVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/vm/CausewayClobVm.java
@@ -34,11 +34,10 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.applib.value.Clob;
-import lombok.Getter;
-import lombok.Setter;
-
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom.types.causeway.clobs.holder.CausewayClobHolder2;
+import lombok.Getter;
+import lombok.Setter;
//tag::class[]
@XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/CausewayLocalResourcePathHolder_actionReturningCollection.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/CausewayLocalResourcePathHolder_actionReturningCollection.java
index a24acc1fb0..666d697c27 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/CausewayLocalResourcePathHolder_actionReturningCollection.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/CausewayLocalResourcePathHolder_actionReturningCollection.java
@@ -27,9 +27,8 @@ import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.value.LocalResourcePath;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/CausewayLocalResourcePathHolder_updateReadOnlyPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/CausewayLocalResourcePathHolder_updateReadOnlyPropertyWithChoices.java
index 34ca12c942..33bc86e515 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/CausewayLocalResourcePathHolder_updateReadOnlyPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/CausewayLocalResourcePathHolder_updateReadOnlyPropertyWithChoices.java
@@ -30,9 +30,8 @@ import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.value.LocalResourcePath;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
@Action(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jdo/CausewayLocalResourcePathJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jdo/CausewayLocalResourcePathJdo.java
index 73a286f7d4..969090a347 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jdo/CausewayLocalResourcePathJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jdo/CausewayLocalResourcePathJdo.java
@@ -36,11 +36,10 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.applib.value.LocalResourcePath;
+import demoapp.dom.types.causeway.localresourcepaths.persistence.CausewayLocalResourcePathEntity;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom.types.causeway.localresourcepaths.persistence.CausewayLocalResourcePathEntity;
-
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jpa/CausewayLocalResourcePathJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jpa/CausewayLocalResourcePathJpa.java
index 131a4ba57d..2f168353f6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jpa/CausewayLocalResourcePathJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jpa/CausewayLocalResourcePathJpa.java
@@ -37,12 +37,11 @@ import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.applib.value.LocalResourcePath;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
+import demoapp.dom.types.causeway.localresourcepaths.persistence.CausewayLocalResourcePathEntity;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom.types.causeway.localresourcepaths.persistence.CausewayLocalResourcePathEntity;
-
@Profile("demo-jpa")
//tag::class[]
@Entity
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/vm/CausewayLocalResourcePathVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/vm/CausewayLocalResourcePathVm.java
index c6269f0b1b..41863bc1d0 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/vm/CausewayLocalResourcePathVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/vm/CausewayLocalResourcePathVm.java
@@ -34,11 +34,10 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.applib.value.LocalResourcePath;
-import lombok.Getter;
-import lombok.Setter;
-
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom.types.causeway.localresourcepaths.holder.CausewayLocalResourcePathHolder2;
+import lombok.Getter;
+import lombok.Setter;
//tag::class[]
@XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/CausewayPasswordHolder_actionReturningCollection.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/CausewayPasswordHolder_actionReturningCollection.java
index e42244ec20..8c16d8c24b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/CausewayPasswordHolder_actionReturningCollection.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/CausewayPasswordHolder_actionReturningCollection.java
@@ -27,9 +27,8 @@ import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.value.Password;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/CausewayPasswordHolder_updateReadOnlyPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/CausewayPasswordHolder_updateReadOnlyPropertyWithChoices.java
index b971665383..a71bbdc5a8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/CausewayPasswordHolder_updateReadOnlyPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/CausewayPasswordHolder_updateReadOnlyPropertyWithChoices.java
@@ -30,9 +30,8 @@ import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.value.Password;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
@Action(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/jdo/CausewayPasswordJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/jdo/CausewayPasswordJdo.java
index 38608e5de9..ed98f59811 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/jdo/CausewayPasswordJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/jdo/CausewayPasswordJdo.java
@@ -35,11 +35,10 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.applib.value.Password;
+import demoapp.dom.types.causeway.passwords.persistence.CausewayPasswordEntity;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom.types.causeway.passwords.persistence.CausewayPasswordEntity;
-
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/jpa/CausewayPasswordJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/jpa/CausewayPasswordJpa.java
index f9096cc347..3ad95f54c7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/jpa/CausewayPasswordJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/jpa/CausewayPasswordJpa.java
@@ -37,12 +37,11 @@ import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.applib.value.Password;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
+import demoapp.dom.types.causeway.passwords.persistence.CausewayPasswordEntity;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom.types.causeway.passwords.persistence.CausewayPasswordEntity;
-
@Profile("demo-jpa")
//tag::class[]
@Entity
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/vm/CausewayPasswordVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/vm/CausewayPasswordVm.java
index 2daa85b32e..058dd00209 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/vm/CausewayPasswordVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/vm/CausewayPasswordVm.java
@@ -34,11 +34,10 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.applib.value.Password;
-import lombok.Getter;
-import lombok.Setter;
-
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom.types.causeway.passwords.holder.CausewayPasswordHolder2;
+import lombok.Getter;
+import lombok.Setter;
//tag::class[]
@XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/holder/CausewayCalendarEventHolder_actionReturningCollection.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/holder/CausewayCalendarEventHolder_actionReturningCollection.java
index b6e2809034..0e068640bf 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/holder/CausewayCalendarEventHolder_actionReturningCollection.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/holder/CausewayCalendarEventHolder_actionReturningCollection.java
@@ -27,9 +27,8 @@ import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.extensions.fullcalendar.applib.value.CalendarEvent;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/holder/CausewayCalendarEventHolder_updateReadOnlyPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/holder/CausewayCalendarEventHolder_updateReadOnlyPropertyWithChoices.java
index 1de7e5f5af..aaf179be6a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/holder/CausewayCalendarEventHolder_updateReadOnlyPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/holder/CausewayCalendarEventHolder_updateReadOnlyPropertyWithChoices.java
@@ -30,9 +30,8 @@ import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.extensions.fullcalendar.applib.value.CalendarEvent;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
@Action(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/jdo/CausewayCalendarEventJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/jdo/CausewayCalendarEventJdo.java
index 25ded17774..3a995e4241 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/jdo/CausewayCalendarEventJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/jdo/CausewayCalendarEventJdo.java
@@ -35,11 +35,10 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.extensions.fullcalendar.applib.value.CalendarEvent;
+import demoapp.dom.types.causewayext.cal.persistence.CausewayCalendarEventEntity;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom.types.causewayext.cal.persistence.CausewayCalendarEventEntity;
-
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/jpa/CausewayCalendarEventJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/jpa/CausewayCalendarEventJpa.java
index 22e255da86..24108baab1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/jpa/CausewayCalendarEventJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/jpa/CausewayCalendarEventJpa.java
@@ -37,12 +37,11 @@ import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.extensions.fullcalendar.applib.value.CalendarEvent;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
+import demoapp.dom.types.causewayext.cal.persistence.CausewayCalendarEventEntity;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom.types.causewayext.cal.persistence.CausewayCalendarEventEntity;
-
@Profile("demo-jpa")
//tag::class[]
@Entity
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/vm/CausewayCalendarEventVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/vm/CausewayCalendarEventVm.java
index d1da95aa2b..24a10324a9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/vm/CausewayCalendarEventVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/vm/CausewayCalendarEventVm.java
@@ -34,11 +34,10 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.extensions.fullcalendar.applib.value.CalendarEvent;
-import lombok.Getter;
-import lombok.Setter;
-
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom.types.causewayext.cal.holder.CausewayCalendarEventHolder2;
+import lombok.Getter;
+import lombok.Setter;
//tag::class[]
@XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/sse/AsyncActionDemo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/sse/AsyncActionDemo.java
index 0ffbecb547..8e24f492c6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/sse/AsyncActionDemo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/sse/AsyncActionDemo.java
@@ -38,12 +38,11 @@ import org.apache.causeway.extensions.sse.applib.annotations.ServerSentEvents;
import org.apache.causeway.extensions.sse.applib.service.SseService;
import org.apache.causeway.extensions.sse.applib.service.SseService.ExecutionBehavior;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Getter;
import lombok.Setter;
import lombok.val;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
@XmlRootElement(name = "Demo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/sse/DemoTask.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/sse/DemoTask.java
index 31f7c73361..b2f613c958 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/sse/DemoTask.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/sse/DemoTask.java
@@ -22,12 +22,11 @@ import java.util.concurrent.atomic.LongAdder;
import javax.inject.Named;
-import org.apache.causeway.commons.internal.concurrent._ThreadSleep;
-
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Editing;
import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.ObjectSupport;
+import org.apache.causeway.commons.internal.concurrent._ThreadSleep;
import org.apache.causeway.extensions.sse.applib.annotations.SseSource;
import org.apache.causeway.extensions.sse.applib.service.SseChannel;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_actionReturningCollection.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_actionReturningCollection.java
index 312e52e40c..c8a3375142 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_actionReturningCollection.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_actionReturningCollection.java
@@ -28,9 +28,8 @@ import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.annotation.Where;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_updateReadOnlyPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_updateReadOnlyPropertyWithChoices.java
index 5007230575..4a8433c397 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_updateReadOnlyPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_updateReadOnlyPropertyWithChoices.java
@@ -31,9 +31,8 @@ import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.annotation.Where;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
@Action(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/JavaAwtBufferedImageJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/JavaAwtBufferedImageJdo.java
index 6f54a783c6..63243ef4ef 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/JavaAwtBufferedImageJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/JavaAwtBufferedImageJdo.java
@@ -35,11 +35,10 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
+import demoapp.dom.types.javaawt.images.persistence.JavaAwtBufferedImageEntity;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom.types.javaawt.images.persistence.JavaAwtBufferedImageEntity;
-
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/JavaAwtBufferedImageJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/JavaAwtBufferedImageJpa.java
index 572d6b8332..2f8927a713 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/JavaAwtBufferedImageJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/JavaAwtBufferedImageJpa.java
@@ -39,12 +39,11 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import org.apache.causeway.persistence.jpa.integration.typeconverters.java.awt.JavaAwtBufferedImageByteArrayConverter;
+import demoapp.dom.types.javaawt.images.persistence.JavaAwtBufferedImageEntity;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom.types.javaawt.images.persistence.JavaAwtBufferedImageEntity;
-
@Profile("demo-jpa")
//tag::class[]
@Entity
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/samples/JavaAwtBufferedImagesSamples.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/samples/JavaAwtBufferedImagesSamples.java
index c7fec7dc78..d404c199f4 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/samples/JavaAwtBufferedImagesSamples.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/samples/JavaAwtBufferedImagesSamples.java
@@ -23,15 +23,15 @@ import java.util.stream.Stream;
import javax.inject.Inject;
+import org.springframework.stereotype.Service;
+
import org.apache.causeway.commons.internal.base._Bytes;
import org.apache.causeway.commons.internal.resources._Resources;
-import org.springframework.stereotype.Service;
+import demoapp.dom.types.Samples;
import lombok.SneakyThrows;
import lombok.val;
-import demoapp.dom.types.Samples;
-
@Service
public class JavaAwtBufferedImagesSamples implements Samples<BufferedImage> {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/JavaAwtBufferedImageVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/JavaAwtBufferedImageVm.java
index 5d8bb5dd41..c1ae203eb0 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/JavaAwtBufferedImageVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/JavaAwtBufferedImageVm.java
@@ -34,11 +34,10 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/holder/JavaMathBigDecimalHolder_actionReturningCollection.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/holder/JavaMathBigDecimalHolder_actionReturningCollection.java
index e684ea5fd8..f1220a5204 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/holder/JavaMathBigDecimalHolder_actionReturningCollection.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/holder/JavaMathBigDecimalHolder_actionReturningCollection.java
@@ -27,9 +27,8 @@ import javax.inject.Inject;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/holder/JavaMathBigDecimalHolder_updateReadOnlyPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/holder/JavaMathBigDecimalHolder_updateReadOnlyPropertyWithChoices.java
index b78da9b3f0..c4088ad3da 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/holder/JavaMathBigDecimalHolder_updateReadOnlyPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/holder/JavaMathBigDecimalHolder_updateReadOnlyPropertyWithChoices.java
@@ -30,9 +30,8 @@ import org.apache.causeway.applib.annotation.MemberSupport;
import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
@Action(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/jdo/JavaMathBigDecimalJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/jdo/JavaMathBigDecimalJdo.java
index cc4b6bf04b..9b11483991 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/jdo/JavaMathBigDecimalJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/jdo/JavaMathBigDecimalJdo.java
@@ -35,11 +35,10 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.applib.annotation.ValueSemantics;
+import demoapp.dom.types.javamath.bigdecimals.persistence.JavaMathBigDecimalEntity;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom.types.javamath.bigdecimals.persistence.JavaMathBigDecimalEntity;
-
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/jpa/JavaMathBigDecimalJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/jpa/JavaMathBigDecimalJpa.java
index 18f599d7a7..461eeccc7c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/jpa/JavaMathBigDecimalJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/jpa/JavaMathBigDecimalJpa.java
@@ -37,12 +37,11 @@ import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.applib.annotation.ValueSemantics;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
+import demoapp.dom.types.javamath.bigdecimals.persistence.JavaMathBigDecimalEntity;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom.types.javamath.bigdecimals.persistence.JavaMathBigDecimalEntity;
-
@Profile("demo-jpa")
//tag::class[]
@Entity
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/vm/JavaMathBigDecimalVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/vm/JavaMathBigDecimalVm.java
index eb7068e8cc..2f780a7bc0 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/vm/JavaMathBigDecimalVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/vm/JavaMathBigDecimalVm.java
@@ -33,13 +33,12 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.types.javamath.bigdecimals.holder.JavaMathBigDecimalHolder2;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.javamath.bigdecimals.holder.JavaMathBigDecimalHolder2;
-
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/holder/JavaMathBigIntegerHolder_actionReturningCollection.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/holder/JavaMathBigIntegerHolder_actionReturningCollection.java
index e05b7f95df..5e7ad682f2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/holder/JavaMathBigIntegerHolder_actionReturningCollection.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/holder/JavaMathBigIntegerHolder_actionReturningCollection.java
@@ -27,9 +27,8 @@ import javax.inject.Inject;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/holder/JavaMathBigIntegerHolder_updateReadOnlyPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/holder/JavaMathBigIntegerHolder_updateReadOnlyPropertyWithChoices.java
index 0fe1495106..e07157b7dd 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/holder/JavaMathBigIntegerHolder_updateReadOnlyPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/holder/JavaMathBigIntegerHolder_updateReadOnlyPropertyWithChoices.java
@@ -30,9 +30,8 @@ import org.apache.causeway.applib.annotation.MemberSupport;
import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
@Action(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/jdo/JavaMathBigIntegerJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/jdo/JavaMathBigIntegerJdo.java
index fe8c5bf0d9..58f7c726cb 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/jdo/JavaMathBigIntegerJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/jdo/JavaMathBigIntegerJdo.java
@@ -34,11 +34,10 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
+import demoapp.dom.types.javamath.bigintegers.persistence.JavaMathBigIntegerEntity;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom.types.javamath.bigintegers.persistence.JavaMathBigIntegerEntity;
-
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/jpa/JavaMathBigIntegerJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/jpa/JavaMathBigIntegerJpa.java
index 81757a916f..07daf063a9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/jpa/JavaMathBigIntegerJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/jpa/JavaMathBigIntegerJpa.java
@@ -36,12 +36,11 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
+import demoapp.dom.types.javamath.bigintegers.persistence.JavaMathBigIntegerEntity;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom.types.javamath.bigintegers.persistence.JavaMathBigIntegerEntity;
-
@Profile("demo-jpa")
//tag::class[]
@Entity
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/vm/JavaMathBigIntegerVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/vm/JavaMathBigIntegerVm.java
index baa9a6d434..1143302834 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/vm/JavaMathBigIntegerVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/vm/JavaMathBigIntegerVm.java
@@ -33,11 +33,10 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
-import lombok.Getter;
-import lombok.Setter;
-
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom.types.javamath.bigintegers.holder.JavaMathBigIntegerHolder2;
+import lombok.Getter;
+import lombok.Setter;
//tag::class[]
@XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/holder/JavaNetUrlHolder_actionReturningCollection.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/holder/JavaNetUrlHolder_actionReturningCollection.java
index 2aa9b417d6..0874e272bc 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/holder/JavaNetUrlHolder_actionReturningCollection.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/holder/JavaNetUrlHolder_actionReturningCollection.java
@@ -27,9 +27,8 @@ import javax.inject.Inject;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/holder/JavaNetUrlHolder_updateReadOnlyPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/holder/JavaNetUrlHolder_updateReadOnlyPropertyWithChoices.java
index b13b2de980..bdde0d1877 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/holder/JavaNetUrlHolder_updateReadOnlyPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/holder/JavaNetUrlHolder_updateReadOnlyPropertyWithChoices.java
@@ -30,9 +30,8 @@ import org.apache.causeway.applib.annotation.MemberSupport;
import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
@Action(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/jdo/JavaNetUrlJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/jdo/JavaNetUrlJdo.java
index aacfe89223..94f41c4cfa 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/jdo/JavaNetUrlJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/jdo/JavaNetUrlJdo.java
@@ -34,11 +34,10 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
+import demoapp.dom.types.javanet.urls.persistence.JavaNetUrlEntity;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom.types.javanet.urls.persistence.JavaNetUrlEntity;
-
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/jpa/JavaNetUrlJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/jpa/JavaNetUrlJpa.java
index 89ca2fe30d..bc93fd7057 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/jpa/JavaNetUrlJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/jpa/JavaNetUrlJpa.java
@@ -36,12 +36,11 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
+import demoapp.dom.types.javanet.urls.persistence.JavaNetUrlEntity;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom.types.javanet.urls.persistence.JavaNetUrlEntity;
-
@Profile("demo-jpa")
//tag::class[]
@Entity
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/samples/JavaNetUrlSamples.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/samples/JavaNetUrlSamples.java
index a493f99add..379c8707b5 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/samples/JavaNetUrlSamples.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/samples/JavaNetUrlSamples.java
@@ -23,9 +23,8 @@ import java.util.stream.Stream;
import org.springframework.stereotype.Service;
-import lombok.SneakyThrows;
-
import demoapp.dom.types.Samples;
+import lombok.SneakyThrows;
@Service
public class JavaNetUrlSamples implements Samples<URL> {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/vm/JavaNetUrlVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/vm/JavaNetUrlVm.java
index 8bfc8c8e02..b9c1fd6401 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/vm/JavaNetUrlVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/vm/JavaNetUrlVm.java
@@ -33,11 +33,10 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
-import lombok.Getter;
-import lombok.Setter;
-
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom.types.javanet.urls.holder.JavaNetUrlHolder2;
+import lombok.Getter;
+import lombok.Setter;
//tag::class[]
@XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/holder/JavaSqlDateHolder_actionReturningCollection.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/holder/JavaSqlDateHolder_actionReturningCollection.java
index 2288ed342b..f5a22d6be9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/holder/JavaSqlDateHolder_actionReturningCollection.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/holder/JavaSqlDateHolder_actionReturningCollection.java
@@ -26,9 +26,8 @@ import javax.inject.Inject;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/holder/JavaSqlDateHolder_updateReadOnlyPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/holder/JavaSqlDateHolder_updateReadOnlyPropertyWithChoices.java
index 0c3061d853..39ed3268bc 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/holder/JavaSqlDateHolder_updateReadOnlyPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/holder/JavaSqlDateHolder_updateReadOnlyPropertyWithChoices.java
@@ -30,9 +30,8 @@ import org.apache.causeway.applib.annotation.MemberSupport;
import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
@Action(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/jdo/JavaSqlDateJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/jdo/JavaSqlDateJdo.java
index 4a1eacff76..0307e8ddb7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/jdo/JavaSqlDateJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/jdo/JavaSqlDateJdo.java
@@ -34,11 +34,10 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
+import demoapp.dom.types.javasql.javasqldate.persistence.JavaSqlDateEntity;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom.types.javasql.javasqldate.persistence.JavaSqlDateEntity;
-
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/jpa/JavaSqlDateJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/jpa/JavaSqlDateJpa.java
index e76423cc28..7d0571882d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/jpa/JavaSqlDateJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/jpa/JavaSqlDateJpa.java
@@ -36,12 +36,11 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
+import demoapp.dom.types.javasql.javasqldate.persistence.JavaSqlDateEntity;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom.types.javasql.javasqldate.persistence.JavaSqlDateEntity;
-
@Profile("demo-jpa")
//tag::class[]
@Entity
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/vm/JavaSqlDateVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/vm/JavaSqlDateVm.java
index 98750871b5..4f003d3a29 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/vm/JavaSqlDateVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/vm/JavaSqlDateVm.java
@@ -35,11 +35,10 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.applib.jaxb.JavaSqlJaxbAdapters;
-import lombok.Getter;
-import lombok.Setter;
-
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom.types.javasql.javasqldate.holder.JavaSqlDateHolder3;
+import lombok.Getter;
+import lombok.Setter;
//tag::class[]
@XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/holder/JavaSqlTimestampHolder_actionReturningCollection.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/holder/JavaSqlTimestampHolder_actionReturningCollection.java
index 4f0a7fbc9e..b78965e2c6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/holder/JavaSqlTimestampHolder_actionReturningCollection.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/holder/JavaSqlTimestampHolder_actionReturningCollection.java
@@ -27,9 +27,8 @@ import javax.inject.Inject;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/holder/JavaSqlTimestampHolder_updateReadOnlyPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/holder/JavaSqlTimestampHolder_updateReadOnlyPropertyWithChoices.java
index b03159b35b..ae50dac6a6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/holder/JavaSqlTimestampHolder_updateReadOnlyPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/holder/JavaSqlTimestampHolder_updateReadOnlyPropertyWithChoices.java
@@ -30,9 +30,8 @@ import org.apache.causeway.applib.annotation.MemberSupport;
import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
@Action(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/jdo/JavaSqlTimestampJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/jdo/JavaSqlTimestampJdo.java
index aa9759c3e0..664426d829 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/jdo/JavaSqlTimestampJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/jdo/JavaSqlTimestampJdo.java
@@ -34,11 +34,10 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
+import demoapp.dom.types.javasql.javasqltimestamp.persistence.JavaSqlTimestampEntity;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom.types.javasql.javasqltimestamp.persistence.JavaSqlTimestampEntity;
-
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/jpa/JavaSqlTimestampJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/jpa/JavaSqlTimestampJpa.java
index 28a36fd27a..8721731850 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/jpa/JavaSqlTimestampJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/jpa/JavaSqlTimestampJpa.java
@@ -36,12 +36,11 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
+import demoapp.dom.types.javasql.javasqltimestamp.persistence.JavaSqlTimestampEntity;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom.types.javasql.javasqltimestamp.persistence.JavaSqlTimestampEntity;
-
@Profile("demo-jpa")
//tag::class[]
@Entity
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/vm/JavaSqlTimestampVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/vm/JavaSqlTimestampVm.java
index fa29682d6b..a145281486 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/vm/JavaSqlTimestampVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/vm/JavaSqlTimestampVm.java
@@ -35,11 +35,10 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.applib.jaxb.JavaSqlJaxbAdapters;
-import lombok.Getter;
-import lombok.Setter;
-
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom.types.javasql.javasqltimestamp.holder.JavaSqlTimestampHolder3;
+import lombok.Getter;
+import lombok.Setter;
//tag::class[]
@XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/holder/JavaTimeLocalDateHolder_actionReturningCollection.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/holder/JavaTimeLocalDateHolder_actionReturningCollection.java
index a5bdeb5b2e..64697eb9a7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/holder/JavaTimeLocalDateHolder_actionReturningCollection.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/holder/JavaTimeLocalDateHolder_actionReturningCollection.java
@@ -27,9 +27,8 @@ import javax.inject.Inject;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/holder/JavaTimeLocalDateHolder_updateReadOnlyPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/holder/JavaTimeLocalDateHolder_updateReadOnlyPropertyWithChoices.java
index 7915d7fe14..fea724ed49 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/holder/JavaTimeLocalDateHolder_updateReadOnlyPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/holder/JavaTimeLocalDateHolder_updateReadOnlyPropertyWithChoices.java
@@ -30,9 +30,8 @@ import org.apache.causeway.applib.annotation.MemberSupport;
import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
@Action(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/jdo/JavaTimeLocalDateJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/jdo/JavaTimeLocalDateJdo.java
index a02d982f39..13f5ca790f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/jdo/JavaTimeLocalDateJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/jdo/JavaTimeLocalDateJdo.java
@@ -34,11 +34,10 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
+import demoapp.dom.types.javatime.javatimelocaldate.persistence.JavaTimeLocalDateEntity;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom.types.javatime.javatimelocaldate.persistence.JavaTimeLocalDateEntity;
-
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/jpa/JavaTimeLocalDateJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/jpa/JavaTimeLocalDateJpa.java
index e5885e9447..48020336ca 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/jpa/JavaTimeLocalDateJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/jpa/JavaTimeLocalDateJpa.java
@@ -36,12 +36,11 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
+import demoapp.dom.types.javatime.javatimelocaldate.persistence.JavaTimeLocalDateEntity;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom.types.javatime.javatimelocaldate.persistence.JavaTimeLocalDateEntity;
-
@Profile("demo-jpa")
//tag::class[]
@Entity
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/vm/JavaTimeLocalDateVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/vm/JavaTimeLocalDateVm.java
index c02a12546b..c0fb81df05 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/vm/JavaTimeLocalDateVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/vm/JavaTimeLocalDateVm.java
@@ -35,11 +35,10 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.applib.jaxb.JavaTimeJaxbAdapters;
-import lombok.Getter;
-import lombok.Setter;
-
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom.types.javatime.javatimelocaldate.holder.JavaTimeLocalDateHolder3;
+import lombok.Getter;
+import lombok.Setter;
//tag::class[]
@XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/holder/JavaTimeLocalDateTimeHolder_actionReturningCollection.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/holder/JavaTimeLocalDateTimeHolder_actionReturningCollection.java
index 253b7b7d94..f5b00e258d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/holder/JavaTimeLocalDateTimeHolder_actionReturningCollection.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/holder/JavaTimeLocalDateTimeHolder_actionReturningCollection.java
@@ -27,9 +27,8 @@ import javax.inject.Inject;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/holder/JavaTimeLocalDateTimeHolder_updateReadOnlyPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/holder/JavaTimeLocalDateTimeHolder_updateReadOnlyPropertyWithChoices.java
index 3cf9ddc238..319776f83b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/holder/JavaTimeLocalDateTimeHolder_updateReadOnlyPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/holder/JavaTimeLocalDateTimeHolder_updateReadOnlyPropertyWithChoices.java
@@ -30,9 +30,8 @@ import org.apache.causeway.applib.annotation.MemberSupport;
import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
@Action(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/jdo/JavaTimeLocalDateTimeJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/jdo/JavaTimeLocalDateTimeJdo.java
index eae4c768a4..57524a73b5 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/jdo/JavaTimeLocalDateTimeJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/jdo/JavaTimeLocalDateTimeJdo.java
@@ -34,11 +34,10 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
+import demoapp.dom.types.javatime.javatimelocaldatetime.persistence.JavaTimeLocalDateTimeEntity;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom.types.javatime.javatimelocaldatetime.persistence.JavaTimeLocalDateTimeEntity;
-
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/jpa/JavaTimeLocalDateTimeJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/jpa/JavaTimeLocalDateTimeJpa.java
index a9e494081e..afa2a10025 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/jpa/JavaTimeLocalDateTimeJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/jpa/JavaTimeLocalDateTimeJpa.java
@@ -36,12 +36,11 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
+import demoapp.dom.types.javatime.javatimelocaldatetime.persistence.JavaTimeLocalDateTimeEntity;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom.types.javatime.javatimelocaldatetime.persistence.JavaTimeLocalDateTimeEntity;
-
@Profile("demo-jpa")
//tag::class[]
@Entity
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/vm/JavaTimeLocalDateTimeVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/vm/JavaTimeLocalDateTimeVm.java
index 156d0ee1da..8877ded362 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/vm/JavaTimeLocalDateTimeVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/vm/JavaTimeLocalDateTimeVm.java
@@ -35,11 +35,10 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.applib.jaxb.JavaTimeJaxbAdapters;
-import lombok.Getter;
-import lombok.Setter;
-
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom.types.javatime.javatimelocaldatetime.holder.JavaTimeLocalDateTimeHolder3;
+import lombok.Getter;
+import lombok.Setter;
//tag::class[]
@XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/jdo/JavaTimeLocalTimeJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/jdo/JavaTimeLocalTimeJdo.java
index bf40efa94d..c3af8875aa 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/jdo/JavaTimeLocalTimeJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/jdo/JavaTimeLocalTimeJdo.java
@@ -34,11 +34,10 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
+import demoapp.dom.types.javatime.javatimelocaltime.persistence.JavaTimeLocalTimeEntity;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom.types.javatime.javatimelocaltime.persistence.JavaTimeLocalTimeEntity;
-
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/jpa/JavaTimeLocalTimeJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/jpa/JavaTimeLocalTimeJpa.java
index 8dd6ea072b..ae1063988a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/jpa/JavaTimeLocalTimeJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/jpa/JavaTimeLocalTimeJpa.java
@@ -36,12 +36,11 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
+import demoapp.dom.types.javatime.javatimelocaltime.persistence.JavaTimeLocalTimeEntity;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom.types.javatime.javatimelocaltime.persistence.JavaTimeLocalTimeEntity;
-
@Profile("demo-jpa")
//tag::class[]
@Entity
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/vm/JavaTimeLocalTimeVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/vm/JavaTimeLocalTimeVm.java
index a8fa9253a8..7514eeea74 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/vm/JavaTimeLocalTimeVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/vm/JavaTimeLocalTimeVm.java
@@ -35,11 +35,10 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.applib.jaxb.JavaTimeJaxbAdapters;
-import lombok.Getter;
-import lombok.Setter;
-
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom.types.javatime.javatimelocaltime.holder.JavaTimeLocalTimeHolder3;
+import lombok.Getter;
+import lombok.Setter;
//tag::class[]
@XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/holder/JavaTimeOffsetDateTimeHolder_actionReturningCollection.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/holder/JavaTimeOffsetDateTimeHolder_actionReturningCollection.java
index b81f0c6b94..01e8ccc28a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/holder/JavaTimeOffsetDateTimeHolder_actionReturningCollection.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/holder/JavaTimeOffsetDateTimeHolder_actionReturningCollection.java
@@ -27,9 +27,8 @@ import javax.inject.Inject;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/holder/JavaTimeOffsetDateTimeHolder_updateReadOnlyPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/holder/JavaTimeOffsetDateTimeHolder_updateReadOnlyPropertyWithChoices.java
index f62c31536b..ebcab7f8c7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/holder/JavaTimeOffsetDateTimeHolder_updateReadOnlyPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/holder/JavaTimeOffsetDateTimeHolder_updateReadOnlyPropertyWithChoices.java
@@ -30,9 +30,8 @@ import org.apache.causeway.applib.annotation.MemberSupport;
import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
@Action(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/jdo/JavaTimeOffsetDateTimeJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/jdo/JavaTimeOffsetDateTimeJdo.java
index a1cb3ca4d6..35ffdd3c4d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/jdo/JavaTimeOffsetDateTimeJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/jdo/JavaTimeOffsetDateTimeJdo.java
@@ -34,11 +34,10 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
+import demoapp.dom.types.javatime.javatimeoffsetdatetime.persistence.JavaTimeOffsetDateTimeEntity;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom.types.javatime.javatimeoffsetdatetime.persistence.JavaTimeOffsetDateTimeEntity;
-
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/jpa/JavaTimeOffsetDateTimeJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/jpa/JavaTimeOffsetDateTimeJpa.java
index 68d05b2069..a222e62d4f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/jpa/JavaTimeOffsetDateTimeJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/jpa/JavaTimeOffsetDateTimeJpa.java
@@ -36,12 +36,11 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
+import demoapp.dom.types.javatime.javatimeoffsetdatetime.persistence.JavaTimeOffsetDateTimeEntity;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom.types.javatime.javatimeoffsetdatetime.persistence.JavaTimeOffsetDateTimeEntity;
-
@Profile("demo-jpa")
//tag::class[]
@Entity
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/vm/JavaTimeOffsetDateTimeVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/vm/JavaTimeOffsetDateTimeVm.java
index b026a19563..bc996f6847 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/vm/JavaTimeOffsetDateTimeVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/vm/JavaTimeOffsetDateTimeVm.java
@@ -35,11 +35,10 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.applib.jaxb.JavaTimeJaxbAdapters;
-import lombok.Getter;
-import lombok.Setter;
-
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom.types.javatime.javatimeoffsetdatetime.holder.JavaTimeOffsetDateTimeHolder4;
+import lombok.Getter;
+import lombok.Setter;
//tag::class[]
@XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/holder/JavaTimeOffsetTimeHolder_actionReturningCollection.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/holder/JavaTimeOffsetTimeHolder_actionReturningCollection.java
index e633129057..175a58578e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/holder/JavaTimeOffsetTimeHolder_actionReturningCollection.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/holder/JavaTimeOffsetTimeHolder_actionReturningCollection.java
@@ -27,9 +27,8 @@ import javax.inject.Inject;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/holder/JavaTimeOffsetTimeHolder_updateReadOnlyPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/holder/JavaTimeOffsetTimeHolder_updateReadOnlyPropertyWithChoices.java
index ea5b62a2a3..8bdaf28946 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/holder/JavaTimeOffsetTimeHolder_updateReadOnlyPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/holder/JavaTimeOffsetTimeHolder_updateReadOnlyPropertyWithChoices.java
@@ -30,9 +30,8 @@ import org.apache.causeway.applib.annotation.MemberSupport;
import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
@Action(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/jdo/JavaTimeOffsetTimeJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/jdo/JavaTimeOffsetTimeJdo.java
index 17b567a0e4..c2b9e4b761 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/jdo/JavaTimeOffsetTimeJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/jdo/JavaTimeOffsetTimeJdo.java
@@ -34,11 +34,10 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
+import demoapp.dom.types.javatime.javatimeoffsettime.persistence.JavaTimeOffsetTimeEntity;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom.types.javatime.javatimeoffsettime.persistence.JavaTimeOffsetTimeEntity;
-
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/jpa/JavaTimeOffsetTimeJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/jpa/JavaTimeOffsetTimeJpa.java
index 602be32e94..c0a0a093fc 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/jpa/JavaTimeOffsetTimeJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/jpa/JavaTimeOffsetTimeJpa.java
@@ -36,12 +36,11 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
+import demoapp.dom.types.javatime.javatimeoffsettime.persistence.JavaTimeOffsetTimeEntity;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom.types.javatime.javatimeoffsettime.persistence.JavaTimeOffsetTimeEntity;
-
@Profile("demo-jpa")
//tag::class[]
@Entity
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/vm/JavaTimeOffsetTimeVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/vm/JavaTimeOffsetTimeVm.java
index fdef8c370b..bbd89cf557 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/vm/JavaTimeOffsetTimeVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/vm/JavaTimeOffsetTimeVm.java
@@ -35,11 +35,10 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.applib.jaxb.JavaTimeJaxbAdapters;
-import lombok.Getter;
-import lombok.Setter;
-
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom.types.javatime.javatimeoffsettime.holder.JavaTimeOffsetTimeHolder4;
+import lombok.Getter;
+import lombok.Setter;
//tag::class[]
@XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/holder/JavaTimeZonedDateTimeHolder_actionReturningCollection.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/holder/JavaTimeZonedDateTimeHolder_actionReturningCollection.java
index 2f1f4a8b92..e2cb742266 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/holder/JavaTimeZonedDateTimeHolder_actionReturningCollection.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/holder/JavaTimeZonedDateTimeHolder_actionReturningCollection.java
@@ -27,9 +27,8 @@ import javax.inject.Inject;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/holder/JavaTimeZonedDateTimeHolder_updateReadOnlyPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/holder/JavaTimeZonedDateTimeHolder_updateReadOnlyPropertyWithChoices.java
index 392b15f8cd..4e2efd81a8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/holder/JavaTimeZonedDateTimeHolder_updateReadOnlyPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/holder/JavaTimeZonedDateTimeHolder_updateReadOnlyPropertyWithChoices.java
@@ -30,9 +30,8 @@ import org.apache.causeway.applib.annotation.MemberSupport;
import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
@Action(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/jdo/JavaTimeZonedDateTimeJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/jdo/JavaTimeZonedDateTimeJdo.java
index 4cded27a80..50ca605af9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/jdo/JavaTimeZonedDateTimeJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/jdo/JavaTimeZonedDateTimeJdo.java
@@ -36,11 +36,10 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
+import demoapp.dom.types.javatime.javatimezoneddatetime.persistence.JavaTimeZonedDateTimeEntity;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom.types.javatime.javatimezoneddatetime.persistence.JavaTimeZonedDateTimeEntity;
-
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/jpa/JavaTimeZonedDateTimeJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/jpa/JavaTimeZonedDateTimeJpa.java
index 85cfa75d22..039dfa087c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/jpa/JavaTimeZonedDateTimeJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/jpa/JavaTimeZonedDateTimeJpa.java
@@ -38,12 +38,11 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
+import demoapp.dom.types.javatime.javatimezoneddatetime.persistence.JavaTimeZonedDateTimeEntity;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom.types.javatime.javatimezoneddatetime.persistence.JavaTimeZonedDateTimeEntity;
-
@Profile("demo-jpa")
//tag::class[]
@Entity
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/vm/JavaTimeZonedDateTimeVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/vm/JavaTimeZonedDateTimeVm.java
index 4dd28416af..0fb657027e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/vm/JavaTimeZonedDateTimeVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/vm/JavaTimeZonedDateTimeVm.java
@@ -37,11 +37,10 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.applib.jaxb.JavaTimeJaxbAdapters;
-import lombok.Getter;
-import lombok.Setter;
-
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom.types.javatime.javatimezoneddatetime.holder.JavaTimeZonedDateTimeHolder4;
+import lombok.Getter;
+import lombok.Setter;
//tag::class[]
@XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/holder/JavaUtilDateHolder_actionReturningCollection.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/holder/JavaUtilDateHolder_actionReturningCollection.java
index 190ff3d32e..2c2bcc0673 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/holder/JavaUtilDateHolder_actionReturningCollection.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/holder/JavaUtilDateHolder_actionReturningCollection.java
@@ -27,9 +27,8 @@ import javax.inject.Inject;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/holder/JavaUtilDateHolder_updateReadOnlyPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/holder/JavaUtilDateHolder_updateReadOnlyPropertyWithChoices.java
index e8a5c717d3..588576c201 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/holder/JavaUtilDateHolder_updateReadOnlyPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/holder/JavaUtilDateHolder_updateReadOnlyPropertyWithChoices.java
@@ -30,9 +30,8 @@ import org.apache.causeway.applib.annotation.MemberSupport;
import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
@Action(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/jdo/JavaUtilDateJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/jdo/JavaUtilDateJdo.java
index 60c08042df..9e9683f44b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/jdo/JavaUtilDateJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/jdo/JavaUtilDateJdo.java
@@ -34,11 +34,10 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
+import demoapp.dom.types.javautil.javautildate.persistence.JavaUtilDateEntity;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom.types.javautil.javautildate.persistence.JavaUtilDateEntity;
-
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/jpa/JavaUtilDateJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/jpa/JavaUtilDateJpa.java
index 985cee6518..75b4f3084f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/jpa/JavaUtilDateJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/jpa/JavaUtilDateJpa.java
@@ -36,12 +36,11 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
+import demoapp.dom.types.javautil.javautildate.persistence.JavaUtilDateEntity;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom.types.javautil.javautildate.persistence.JavaUtilDateEntity;
-
@Profile("demo-jpa")
//tag::class[]
@Entity
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/vm/JavaUtilDateVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/vm/JavaUtilDateVm.java
index c57f9624b6..996e324d85 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/vm/JavaUtilDateVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/vm/JavaUtilDateVm.java
@@ -35,11 +35,10 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.applib.jaxb.JavaUtilJaxbAdapters;
-import lombok.Getter;
-import lombok.Setter;
-
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom.types.javautil.javautildate.holder.JavaUtilDateHolder3;
+import lombok.Getter;
+import lombok.Setter;
//tag::class[]
@XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/holder/JodaDateTimeHolder_actionReturningCollection.java b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/holder/JodaDateTimeHolder_actionReturningCollection.java
index d2bc5f96c4..2b215c7c95 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/holder/JodaDateTimeHolder_actionReturningCollection.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/holder/JodaDateTimeHolder_actionReturningCollection.java
@@ -28,9 +28,8 @@ import org.joda.time.DateTime;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/holder/JodaDateTimeHolder_updateReadOnlyPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/holder/JodaDateTimeHolder_updateReadOnlyPropertyWithChoices.java
index aa41cd8f74..e477f972f7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/holder/JodaDateTimeHolder_updateReadOnlyPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/holder/JodaDateTimeHolder_updateReadOnlyPropertyWithChoices.java
@@ -31,9 +31,8 @@ import org.apache.causeway.applib.annotation.MemberSupport;
import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
@Action(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/jdo/JodaDateTimeJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/jdo/JodaDateTimeJdo.java
index b2063352d2..729c926df5 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/jdo/JodaDateTimeJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/jdo/JodaDateTimeJdo.java
@@ -34,11 +34,10 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
+import demoapp.dom.types.jodatime.jodadatetime.persistence.JodaDateTimeEntity;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom.types.jodatime.jodadatetime.persistence.JodaDateTimeEntity;
-
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/vm/JodaDateTimeVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/vm/JodaDateTimeVm.java
index 734f404978..bfcbbd2183 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/vm/JodaDateTimeVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/vm/JodaDateTimeVm.java
@@ -35,11 +35,10 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.valuetypes.jodatime.applib.jaxb.JodaTimeJaxbAdapters;
-import lombok.Getter;
-import lombok.Setter;
-
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom.types.jodatime.jodadatetime.holder.JodaDateTimeHolder3;
+import lombok.Getter;
+import lombok.Setter;
//tag::class[]
@XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/holder/JodaLocalDateHolder_actionReturningCollection.java b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/holder/JodaLocalDateHolder_actionReturningCollection.java
index 1fe065d9a1..2e9147f105 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/holder/JodaLocalDateHolder_actionReturningCollection.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/holder/JodaLocalDateHolder_actionReturningCollection.java
@@ -28,9 +28,8 @@ import org.joda.time.LocalDate;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/holder/JodaLocalDateHolder_updateReadOnlyPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/holder/JodaLocalDateHolder_updateReadOnlyPropertyWithChoices.java
index 9575c70150..624bcbd2bb 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/holder/JodaLocalDateHolder_updateReadOnlyPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/holder/JodaLocalDateHolder_updateReadOnlyPropertyWithChoices.java
@@ -31,9 +31,8 @@ import org.apache.causeway.applib.annotation.MemberSupport;
import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
@Action(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/jdo/JodaLocalDateJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/jdo/JodaLocalDateJdo.java
index dcd1b8fe53..f2e82b8880 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/jdo/JodaLocalDateJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/jdo/JodaLocalDateJdo.java
@@ -34,11 +34,10 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
+import demoapp.dom.types.jodatime.jodalocaldate.persistence.JodaLocalDateEntity;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom.types.jodatime.jodalocaldate.persistence.JodaLocalDateEntity;
-
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/vm/JodaLocalDateVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/vm/JodaLocalDateVm.java
index 065d10db94..c28fbd75b3 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/vm/JodaLocalDateVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/vm/JodaLocalDateVm.java
@@ -35,11 +35,10 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.valuetypes.jodatime.applib.jaxb.JodaTimeJaxbAdapters;
-import lombok.Getter;
-import lombok.Setter;
-
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom.types.jodatime.jodalocaldate.holder.JodaLocalDateHolder3;
+import lombok.Getter;
+import lombok.Setter;
//tag::class[]
@XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/holder/JodaLocalDateTimeHolder_actionReturningCollection.java b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/holder/JodaLocalDateTimeHolder_actionReturningCollection.java
index d77c075fe3..ddb77744c5 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/holder/JodaLocalDateTimeHolder_actionReturningCollection.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/holder/JodaLocalDateTimeHolder_actionReturningCollection.java
@@ -28,9 +28,8 @@ import org.joda.time.LocalDateTime;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/holder/JodaLocalDateTimeHolder_updateReadOnlyPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/holder/JodaLocalDateTimeHolder_updateReadOnlyPropertyWithChoices.java
index 44325ce13b..8108af7703 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/holder/JodaLocalDateTimeHolder_updateReadOnlyPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/holder/JodaLocalDateTimeHolder_updateReadOnlyPropertyWithChoices.java
@@ -31,9 +31,8 @@ import org.apache.causeway.applib.annotation.MemberSupport;
import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
@Action(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/jdo/JodaLocalDateTimeJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/jdo/JodaLocalDateTimeJdo.java
index 7a1e14833c..c57c27f4b6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/jdo/JodaLocalDateTimeJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/jdo/JodaLocalDateTimeJdo.java
@@ -34,11 +34,10 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
+import demoapp.dom.types.jodatime.jodalocaldatetime.persistence.JodaLocalDateTimeEntity;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom.types.jodatime.jodalocaldatetime.persistence.JodaLocalDateTimeEntity;
-
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/vm/JodaLocalDateTimeVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/vm/JodaLocalDateTimeVm.java
index c650931b9c..fbd66ced1e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/vm/JodaLocalDateTimeVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/vm/JodaLocalDateTimeVm.java
@@ -35,11 +35,10 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.valuetypes.jodatime.applib.jaxb.JodaTimeJaxbAdapters;
-import lombok.Getter;
-import lombok.Setter;
-
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom.types.jodatime.jodalocaldatetime.holder.JodaLocalDateTimeHolder3;
+import lombok.Getter;
+import lombok.Setter;
//tag::class[]
@XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaltime/holder/JodaLocalTimeHolder_actionReturningCollection.java b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaltime/holder/JodaLocalTimeHolder_actionReturningCollection.java
index 4d0a967213..6b0b29190e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaltime/holder/JodaLocalTimeHolder_actionReturningCollection.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaltime/holder/JodaLocalTimeHolder_actionReturningCollection.java
@@ -28,9 +28,8 @@ import org.joda.time.LocalDateTime;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaltime/holder/JodaLocalTimeHolder_updateReadOnlyPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaltime/holder/JodaLocalTimeHolder_updateReadOnlyPropertyWithChoices.java
index a5101ee1bf..a960764f49 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaltime/holder/JodaLocalTimeHolder_updateReadOnlyPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaltime/holder/JodaLocalTimeHolder_updateReadOnlyPropertyWithChoices.java
@@ -31,9 +31,8 @@ import org.apache.causeway.applib.annotation.MemberSupport;
import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import lombok.RequiredArgsConstructor;
-
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
//tag::class[]
@Action(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaltime/jdo/JodaLocalTimeJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaltime/jdo/JodaLocalTimeJdo.java
index d74eb8957d..69a0480131 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaltime/jdo/JodaLocalTimeJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaltime/jdo/JodaLocalTimeJdo.java
@@ -34,11 +34,10 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
+import demoapp.dom.types.jodatime.jodalocaltime.persistence.JodaLocalTimeEntity;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom.types.jodatime.jodalocaltime.persistence.JodaLocalTimeEntity;
-
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaltime/vm/JodaLocalTimeVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaltime/vm/JodaLocalTimeVm.java
index b7697c562a..932e163708 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaltime/vm/JodaLocalTimeVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaltime/vm/JodaLocalTimeVm.java
@@ -35,11 +35,10 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.valuetypes.jodatime.applib.jaxb.JodaTimeJaxbAdapters;
-import lombok.Getter;
-import lombok.Setter;
-
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom.types.jodatime.jodalocaltime.holder.JodaLocalTimeHolder2;
+import lombok.Getter;
+import lombok.Setter;
//tag::class[]
@XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/test/java/demoapp/dom/featured/customui/GeocodeResponseUtilsTest.java b/examples/demo/domain/src/test/java/demoapp/dom/featured/customui/GeocodeResponseUtilsTest.java
index 864719da89..759ef23ef4 100644
--- a/examples/demo/domain/src/test/java/demoapp/dom/featured/customui/GeocodeResponseUtilsTest.java
+++ b/examples/demo/domain/src/test/java/demoapp/dom/featured/customui/GeocodeResponseUtilsTest.java
@@ -23,9 +23,8 @@ package demoapp.dom.featured.customui;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import lombok.val;
-
import demoapp.dom.featured.customui.latlng.LatLngUtils;
+import lombok.val;
class GeocodeResponseUtilsTest {
diff --git a/examples/demo/javafx/src/main/java/demoapp/javafx/DemoAppJavaFx.java b/examples/demo/javafx/src/main/java/demoapp/javafx/DemoAppJavaFx.java
index b79c2fc0b8..11a20e1092 100644
--- a/examples/demo/javafx/src/main/java/demoapp/javafx/DemoAppJavaFx.java
+++ b/examples/demo/javafx/src/main/java/demoapp/javafx/DemoAppJavaFx.java
@@ -18,6 +18,10 @@
*/
package demoapp.javafx;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Import;
+
import org.apache.causeway.commons.internal.debug._Probe;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.runtimeservices.session.InteractionServiceDefault;
@@ -26,9 +30,6 @@ import org.apache.causeway.incubator.viewer.javafx.model.util._fx;
import org.apache.causeway.incubator.viewer.javafx.viewer.CausewayModuleIncViewerJavaFxViewer;
import org.apache.causeway.incubator.viewer.javafx.viewer.JavafxViewer;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Import;
import demoapp.dom.DemoModuleJpa;
diff --git a/examples/demo/javafx/src/test/java/demoapp/javafx/integtest/DemoFxTestAbstract.java b/examples/demo/javafx/src/test/java/demoapp/javafx/integtest/DemoFxTestAbstract.java
index ee3a7b0e4c..2728459fd4 100644
--- a/examples/demo/javafx/src/test/java/demoapp/javafx/integtest/DemoFxTestAbstract.java
+++ b/examples/demo/javafx/src/test/java/demoapp/javafx/integtest/DemoFxTestAbstract.java
@@ -20,12 +20,13 @@ package demoapp.javafx.integtest;
import javax.inject.Inject;
+import org.junit.jupiter.api.BeforeAll;
+import org.springframework.boot.test.context.SpringBootTest;
+
import org.apache.causeway.incubator.viewer.javafx.model.context.UiContextFx;
import org.apache.causeway.incubator.viewer.javafx.viewer.CausewayModuleIncViewerJavaFxViewer;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
-import org.junit.jupiter.api.BeforeAll;
-import org.springframework.boot.test.context.SpringBootTest;
import demoapp.dom.DemoModuleJdo;
diff --git a/examples/demo/javafx/src/test/java/demoapp/javafx/integtest/DemoFxTestConfig_usingJdo.java b/examples/demo/javafx/src/test/java/demoapp/javafx/integtest/DemoFxTestConfig_usingJdo.java
index eff10a8d8d..0315804257 100644
--- a/examples/demo/javafx/src/test/java/demoapp/javafx/integtest/DemoFxTestConfig_usingJdo.java
+++ b/examples/demo/javafx/src/test/java/demoapp/javafx/integtest/DemoFxTestConfig_usingJdo.java
@@ -20,8 +20,6 @@ package demoapp.javafx.integtest;
import javax.sql.DataSource;
-import org.apache.causeway.core.config.presets.CausewayPresets;
-import org.apache.causeway.incubator.viewer.javafx.model.events.JavaFxViewerConfig;
import org.datanucleus.store.rdbms.datasource.dbcp2.BasicDataSource;
import org.springframework.boot.jdbc.DataSourceBuilder;
import org.springframework.context.annotation.Bean;
@@ -29,10 +27,12 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
-import lombok.val;
+import org.apache.causeway.core.config.presets.CausewayPresets;
+import org.apache.causeway.incubator.viewer.javafx.model.events.JavaFxViewerConfig;
import demoapp.javafx.DemoAppJavaFx;
import javafx.application.HostServices;
+import lombok.val;
@Configuration
@PropertySources({
diff --git a/examples/demo/web/src/main/java/demoapp/web/DemoAppManifestCommon.java b/examples/demo/web/src/main/java/demoapp/web/DemoAppManifestCommon.java
index faf53131fa..c31fce1e77 100644
--- a/examples/demo/web/src/main/java/demoapp/web/DemoAppManifestCommon.java
+++ b/examples/demo/web/src/main/java/demoapp/web/DemoAppManifestCommon.java
@@ -34,11 +34,10 @@ import org.apache.causeway.testing.h2console.ui.CausewayModuleTestingH2ConsoleUi
import org.apache.causeway.viewer.restfulobjects.jaxrsresteasy4.CausewayModuleViewerRestfulObjectsJaxrsResteasy4;
import org.apache.causeway.viewer.restfulobjects.viewer.CausewayModuleViewerRestfulObjectsViewer;
-import lombok.val;
-import lombok.extern.log4j.Log4j2;
-
import demoapp.dom._infra.fixtures.DemoFixtureScript;
import demoapp.web.security.PrototypeActionsVisibilityAdvisor;
+import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
* Makes the integral parts of the 'demo' web application.
diff --git a/examples/demo/web/src/main/java/demoapp/web/DemoAppManifestJdo.java b/examples/demo/web/src/main/java/demoapp/web/DemoAppManifestJdo.java
index 45b4d6c2e8..ffd478f9e3 100644
--- a/examples/demo/web/src/main/java/demoapp/web/DemoAppManifestJdo.java
+++ b/examples/demo/web/src/main/java/demoapp/web/DemoAppManifestJdo.java
@@ -19,6 +19,9 @@
package demoapp.web;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
import org.apache.causeway.extensions.audittrail.jdo.CausewayModuleExtAuditTrailPersistenceJdo;
import org.apache.causeway.extensions.commandlog.jdo.CausewayModuleExtCommandLogPersistenceJdo;
import org.apache.causeway.extensions.executionlog.jdo.CausewayModuleExtExecutionLogPersistenceJdo;
@@ -26,9 +29,6 @@ import org.apache.causeway.extensions.executionoutbox.jdo.CausewayModuleExtExecu
import org.apache.causeway.extensions.secman.jdo.CausewayModuleExtSecmanPersistenceJdo;
import org.apache.causeway.extensions.sessionlog.jdo.CausewayModuleExtSessionLogPersistenceJdo;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
import demoapp.dom.DemoModuleJdo;
/**
diff --git a/examples/demo/web/src/main/java/demoapp/web/DemoAppManifestJpa.java b/examples/demo/web/src/main/java/demoapp/web/DemoAppManifestJpa.java
index a94d1009d0..0a1ae9a0a1 100644
--- a/examples/demo/web/src/main/java/demoapp/web/DemoAppManifestJpa.java
+++ b/examples/demo/web/src/main/java/demoapp/web/DemoAppManifestJpa.java
@@ -18,6 +18,9 @@
*/
package demoapp.web;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
import org.apache.causeway.extensions.audittrail.jpa.CausewayModuleExtAuditTrailPersistenceJpa;
import org.apache.causeway.extensions.commandlog.jpa.CausewayModuleExtCommandLogPersistenceJpa;
import org.apache.causeway.extensions.executionlog.jpa.CausewayModuleExtExecutionLogPersistenceJpa;
@@ -25,9 +28,6 @@ import org.apache.causeway.extensions.executionoutbox.jpa.CausewayModuleExtExecu
import org.apache.causeway.extensions.secman.jpa.CausewayModuleExtSecmanPersistenceJpa;
import org.apache.causeway.extensions.sessionlog.jpa.CausewayModuleExtSessionLogPersistenceJpa;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
import demoapp.dom.DemoModuleJpa;
/**
diff --git a/examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/custom/WhereInTheWorldPanel.java b/examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/custom/WhereInTheWorldPanel.java
index 95cd27f986..366c93473c 100644
--- a/examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/custom/WhereInTheWorldPanel.java
+++ b/examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/custom/WhereInTheWorldPanel.java
@@ -31,11 +31,10 @@ import org.apache.causeway.viewer.wicket.model.hints.UiHintContainer;
import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
-import lombok.SneakyThrows;
-import lombok.val;
-
import demoapp.dom.featured.customui.geocoding.GeoapifyClient;
import demoapp.dom.featured.customui.vm.WhereInTheWorldVm;
+import lombok.SneakyThrows;
+import lombok.val;
//tag::class[]
public class WhereInTheWorldPanel
diff --git a/examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/custom/WhereInTheWorldPanelFactory.java b/examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/custom/WhereInTheWorldPanelFactory.java
index 0044681147..f55fe4795b 100644
--- a/examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/custom/WhereInTheWorldPanelFactory.java
+++ b/examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/custom/WhereInTheWorldPanelFactory.java
@@ -27,6 +27,7 @@ import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory.ApplicationAdvice;
import org.apache.causeway.viewer.wicket.ui.components.entity.EntityComponentFactoryAbstract;
import demoapp.dom.featured.customui.geocoding.GeoapifyClient;
diff --git a/examples/demo/wicket/jdo/src/main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java b/examples/demo/wicket/jdo/src/main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java
index 355df4338f..f6cd187c06 100644
--- a/examples/demo/wicket/jdo/src/main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java
+++ b/examples/demo/wicket/jdo/src/main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java
@@ -18,12 +18,12 @@
*/
package demoapp.webapp.wicket.jdo;
-import org.apache.causeway.commons.internal.os._OsUtil;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.commons.internal.os._OsUtil;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.config.util.SpringProfileUtil;
import org.apache.causeway.extensions.commandlog.applib.CausewayModuleExtCommandLogApplib;
diff --git a/examples/demo/wicket/jpa-and-graphql/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java b/examples/demo/wicket/jpa-and-graphql/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
index 14332fc9af..02f39217b4 100644
--- a/examples/demo/wicket/jpa-and-graphql/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
+++ b/examples/demo/wicket/jpa-and-graphql/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
@@ -18,12 +18,12 @@
*/
package demoapp.webapp.wicket.jpa;
-import org.apache.causeway.commons.internal.os._OsUtil;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.commons.internal.os._OsUtil;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.config.util.SpringProfileUtil;
import org.apache.causeway.extensions.commandlog.applib.CausewayModuleExtCommandLogApplib;
diff --git a/examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java b/examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
index 17bf347c5b..5c342b57d3 100644
--- a/examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
+++ b/examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
@@ -18,12 +18,12 @@
*/
package demoapp.webapp.wicket.jpa;
-import org.apache.causeway.commons.internal.os._OsUtil;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.commons.internal.os._OsUtil;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.config.util.SpringProfileUtil;
import org.apache.causeway.extensions.commandlog.applib.CausewayModuleExtCommandLogApplib;