You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2023/05/31 04:06:04 UTC

[causeway] branch master updated: CAUSEWAY-2297: remove unused imports; comment out unused methods

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/causeway.git


The following commit(s) were added to refs/heads/master by this push:
     new ecbfe3f8e5 CAUSEWAY-2297: remove unused imports; comment out unused methods
ecbfe3f8e5 is described below

commit ecbfe3f8e574bd00f5fba7af22b1951299b50db6
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed May 31 06:05:58 2023 +0200

    CAUSEWAY-2297: remove unused imports; comment out unused methods
---
 .../causeway/applib/services/command/Command.java  |  5 +--
 .../services/command/CommandExecutorService.java   |  1 -
 .../services/user/UserMemento_value_Test.java      |  7 ++--
 .../commons/internal/reflection/_Annotations.java  |  7 ++--
 .../publish/command/CommandPublishingFacet.java    |  4 --
 .../callbacks/CreatedCallbackFacetViaMethod.java   |  2 -
 .../valuesemantics/BigDecimalValueSemantics.java   |  1 -
 .../valuesemantics/OidDtoValueSemantics.java       |  3 +-
 .../CausewayModuleCoreRuntimeServices.java         |  3 +-
 .../publish/CommandPublisherDefault.java           |  5 +--
 .../session/InteractionIdGenerator.java            | 11 -----
 .../ActionChoicesFromEntityRepository.java         |  2 -
 .../jdo/ActionCommandPublishingEntityImpl.java     |  8 +---
 .../jdo/ActionExecutionPublishingEntityImpl.java   |  6 +--
 .../fieldSet/ActionLayoutFieldSetPage.java         |  5 +--
 .../promptStyle/ActionLayoutPromptStylePage.java   |  4 +-
 .../ActionLayoutRedirectPolicyEntity.java          | 15 +------
 .../ActionLayoutRedirectPolicyPage.java            | 15 -------
 .../ActionLayoutRedirectPolicyPage_objects.java    |  4 +-
 .../jdo/ActionLayoutRedirectPolicyEntityImpl.java  | 30 ++++++--------
 ...onLayoutRedirectPolicyEntityImplRepository.java | 12 +++---
 ...onLayoutRedirectPolicyEntityImplRepository.java | 13 +++---
 .../sequence/ActionLayoutSequencePage.java         |  8 +---
 .../ActionLayoutSequencePage_addChild.java         |  9 ++---
 .../ActionLayoutSequencePage_removeChild.java      |  7 +---
 .../collections/Collection/CollectionMenu.java     |  9 +----
 .../Collection/typeOf/CollectionTypeOfPage.java    | 12 +-----
 .../CollectionLayoutDescribedAsPage.java           |  8 +---
 .../hidden/CollectionLayoutHiddenPage.java         |  8 +---
 .../named/CollectionLayoutNamedPage.java           |  9 +----
 .../paged/CollectionLayoutPagedPage.java           |  9 +----
 .../sequence/CollectionLayoutSequencePage.java     |  8 +---
 ...inObjectXxxDomainEventPage_controlStrategy.java |  1 -
 .../Property/maxLength/PropertyMaxLengthPage.java  |  4 +-
 .../PropertyMaxLengthPage_updateName.java          |  1 -
 .../mustSatisfy/PropertyMustSatisfyPage.java       |  4 +-
 .../PropertyMustSatisfyPage_updateCustomerAge.java |  1 -
 .../optionality/PropertyOptionalityPage.java       |  7 +---
 .../PropertyOptionalityPage_updateMandatory.java   |  1 -
 .../PropertyOptionalityPage_updateNullable.java    |  5 ---
 .../PropertyOptionalityPage_updateOptional.java    |  1 -
 .../snapshot/jdo/PropertySnapshotEntityImpl.java   | 16 +++-----
 .../PropertyLayout/PropertyLayoutMenu.java         |  8 +---
 .../PropertyLayout/navigable/FileNodeVm.java       |  5 +--
 .../repainting/PropertyLayoutRepaintingPage.java   | 11 -----
 .../ValueSemanticsDateRenderAdjustDaysPage.java    |  9 ++---
 ...ticsDateRenderAdjustDaysPage_updateEndDate.java |  5 +--
 .../ValueSemanticsProviderPercentagePage.java      | 27 ++++++++-----
 .../dom/featured/causewayext/sse/SseDemoMenu.java  |  2 -
 .../dom/featured/causewayext/sse/SseDemoPage.java  |  4 +-
 .../dom/featured/causewayext/sse/TaskProgress.java |  1 -
 .../dom/featured/customui/GeoapifyClient.java      |  4 +-
 .../eventbusservice/EventBusServiceDemoPage.java   |  5 +--
 .../eventbusservice/EventSubscriberForDemo.java    | 17 +-------
 .../core/wrapperFactory/PrimeNumberGenerator.java  | 12 +++---
 .../core/wrapperFactory/PrimeNumberRepository.java |  8 ----
 .../wrapperFactory/WrapperFactoryDemoPage.java     | 10 +++--
 .../WrapperFactoryDemoPage_createPrimes.java       |  8 +---
 .../WrapperFactoryDemoPage_primeNumbers.java       |  5 +--
 .../jdo/PrimeNumberJdoFactoryAndRepository.java    |  6 +--
 .../types/causeway/blobs/vm/CausewayBlobVm.java    |  7 +---
 .../types/causeway/clobs/vm/CausewayClobVm.java    |  7 +---
 .../vm/CausewayLocalResourcePathVm.java            |  7 +---
 .../causeway/markups/vm/CausewayMarkupVm.java      |  7 +---
 .../CausewayPasswordEntity_checkPassword.java      |  1 -
 .../asciidocs/vm/CausewayAsciiDocVm.java           |  7 +---
 .../markdowns/vm/CausewayMarkdownVm.java           |  7 +---
 .../types/causewayval/vegas/vm/CausewayVegaVm.java |  7 +---
 .../types/javaawt/images/vm/BufferedImageVm.java   | 10 ++---
 .../javalang/booleans/vm/WrapperBooleanVm.java     |  8 +---
 .../dom/types/javalang/bytes/vm/WrapperByteVm.java |  8 +---
 .../javalang/characters/vm/WrapperCharacterVm.java |  8 +---
 .../types/javalang/doubles/vm/WrapperDoubleVm.java |  8 +---
 .../types/javalang/enums/vm/JavaLangEnumVm.java    |  7 +---
 .../types/javalang/floats/vm/WrapperFloatVm.java   |  8 +---
 .../javalang/integers/vm/WrapperIntegerVm.java     |  8 +---
 .../dom/types/javalang/longs/vm/WrapperLongVm.java |  8 +---
 .../types/javalang/shorts/vm/WrapperShortVm.java   |  8 +---
 .../javalang/strings/vm/JavaLangStringVm.java      |  8 +---
 .../dom/types/javalang/voids/JavaLangVoids.java    |  2 -
 .../javamath/bigdecimals/vm/BigDecimalVm.java      | 10 ++---
 .../javamath/bigintegers/vm/BigIntegerVm.java      | 10 ++---
 .../demoapp/dom/types/javanet/urls/vm/URLsVm.java  | 10 ++---
 .../javasql/javasqldate/vm/JavaSqlDateVm.java      | 10 ++---
 .../javautil/javautildate/vm/JavaUtilDateVm.java   | 10 ++---
 .../types/javautil/uuids/vm/JavaUtilUuidVm.java    | 10 ++---
 .../geocoding/GeoapifyClientTest_geocode.java      |  4 +-
 .../contributions/T_recentBackgroundCommands.java  |  5 +--
 .../commandlog/applib/dom/BackgroundService.java   | 47 ++++++++++++----------
 .../commandlog/applib/dom/CommandLogEntry.java     | 26 +++++++++---
 .../subscriber/CommandSubscriberForCommandLog.java |  9 ++---
 .../jdo/dom/CommandLogEntryRepository.java         |  1 +
 .../BulkUpdateManagerForDemoToDoItem.java          |  3 +-
 ...uleDemoToDoItemBulkUpdateManager_IntegTest.java |  5 ++-
 .../applib/app/ExecutionOutboxMenu.java            |  7 +---
 .../ui/viewer/CalendaredCollectionAbstract.java    |  4 +-
 .../pdfjs/metamodel/facet/PdfJsViewerFacet.java    |  1 -
 .../facet/PdfJsViewerFacetFromAnnotation.java      |  1 -
 .../PdfJsViewerFacetFromAnnotationFactory.java     |  3 +-
 ...iewer_MixinDomainWithPdfJsViewer_IntegTest.java |  5 ++-
 .../PdfjsViewer_PropDomain_IntegTest.java          |  5 ++-
 .../metamodel/domains/mixin/SomeViewModel_pdf.java |  7 ++--
 .../CmdExecAuditSessLog_IntegTestAbstract.java     |  4 +-
 .../CustomContextWithNoPermissionChecksTest.java   | 25 ++++--------
 .../integtest/Layout_Counter_IntegTest.java        | 14 ++-----
 .../integtest/Layout_SimpleObject_IntegTest.java   | 16 +++-----
 .../services/KeycloakOauth2UserService.java        |  1 -
 .../applib/modules/ModulesArchTests.java           |  5 ++-
 ...CausewayIntegrationGwtAbstractWithFixtures.java |  6 +--
 .../applib/fixturescripts/FixtureScripts.java      |  1 -
 .../tooling/cli/projdoc/ProjectDocModel.java       |  3 +-
 .../value/ValueTypeGenTemplateTest.java            |  8 ++--
 .../components/scalars/ScalarFragmentFactory.java  |  3 +-
 .../StandaloneCollectionPanel.java                 |  1 -
 .../viewer/wicket/ui/util/WktDecorators.java       |  1 -
 115 files changed, 283 insertions(+), 577 deletions(-)

diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/command/Command.java b/api/applib/src/main/java/org/apache/causeway/applib/services/command/Command.java
index 6cc808cc68..4fdb2aa11b 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/command/Command.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/command/Command.java
@@ -37,7 +37,6 @@ import org.apache.causeway.schema.cmd.v2.CommandDto;
 
 import lombok.Getter;
 import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
 import lombok.ToString;
 import lombok.val;
 import lombok.extern.log4j.Log4j2;
@@ -82,7 +81,7 @@ public class Command implements HasInteractionId, HasUsername, HasCommandDto {
 
     private UUID interactionId;
 
-    public Command(UUID interactionId) {
+    public Command(final UUID interactionId) {
         this.interactionId = interactionId;
     }
 
@@ -363,7 +362,7 @@ public class Command implements HasInteractionId, HasUsername, HasCommandDto {
         /**
          * <b>NOT API</b>: intended to be called only by the framework.
          */
-        public void setInteractionId(UUID interactionId) {
+        public void setInteractionId(final UUID interactionId) {
             Command.this.interactionId = interactionId;
         }
     };
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/command/CommandExecutorService.java b/api/applib/src/main/java/org/apache/causeway/applib/services/command/CommandExecutorService.java
index 12ec822027..981148cf19 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/command/CommandExecutorService.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/command/CommandExecutorService.java
@@ -26,7 +26,6 @@ import org.apache.causeway.applib.jaxb.JavaSqlXMLGregorianCalendarMarshalling;
 import org.apache.causeway.applib.services.bookmark.Bookmark;
 import org.apache.causeway.applib.services.iactn.Interaction;
 import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
 import org.apache.causeway.applib.services.user.UserMemento;
 import org.apache.causeway.commons.functional.Try;
 import org.apache.causeway.schema.cmd.v2.CommandDto;
diff --git a/api/applib/src/test/java/org/apache/causeway/applib/services/user/UserMemento_value_Test.java b/api/applib/src/test/java/org/apache/causeway/applib/services/user/UserMemento_value_Test.java
index 86b247fa06..ed04c3248a 100644
--- a/api/applib/src/test/java/org/apache/causeway/applib/services/user/UserMemento_value_Test.java
+++ b/api/applib/src/test/java/org/apache/causeway/applib/services/user/UserMemento_value_Test.java
@@ -18,9 +18,6 @@
  */
 package org.apache.causeway.applib.services.user;
 
-import lombok.SneakyThrows;
-
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Arrays;
 import java.util.List;
@@ -29,6 +26,8 @@ import java.util.Locale;
 import org.apache.causeway.commons.collections.Can;
 import org.apache.causeway.core.internaltestsupport.contract.ValueTypeContractTestAbstract;
 
+import lombok.SneakyThrows;
+
 class UserMemento_value_Test extends ValueTypeContractTestAbstract<UserMemento> {
 
     private UserMemento.UserMementoBuilder baseline() {
@@ -74,7 +73,7 @@ class UserMemento_value_Test extends ValueTypeContractTestAbstract<UserMemento>
     }
 
     @SneakyThrows
-    private static URL newURL(String s) {
+    private static URL newURL(final String s) {
         return new URL(s);
     }
 
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/reflection/_Annotations.java b/commons/src/main/java/org/apache/causeway/commons/internal/reflection/_Annotations.java
index c622caa097..6fa8d7fb55 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/reflection/_Annotations.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/reflection/_Annotations.java
@@ -166,13 +166,14 @@ public final class _Annotations {
 
     // -- HELPER
 
-    /**
+    /* XXX no longer used
+    / **
      * Optionally create a type-safe synthesized version of this annotation based on presence.
      * <p>
      * Also includes annotated fields, getter methods might be associated with.
      * If annotations from a getter method are competing with annotations from its corresponding field,
      * let the one win, that is 'nearer' to the <i>Class</i> that is subject to introspection.
-     */
+     * /
     private static <A extends Annotation> Optional<A> synthesize(
             final AnnotatedElement annotatedElement,
             final Class<A> annotationType,
@@ -187,7 +188,7 @@ public final class _Annotations {
 
         return _Annotations_SynthesizedMergedAnnotationInvocationHandler
                 .createProxy(collected, associated, annotationType);
-    }
+    }*/
 
     /**
      * @apiNote don't publicly expose Spring's {@link MergedAnnotations}
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/command/CommandPublishingFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/command/CommandPublishingFacet.java
index 58d58db465..1678c328f7 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/command/CommandPublishingFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/command/CommandPublishingFacet.java
@@ -19,15 +19,11 @@
 package org.apache.causeway.core.metamodel.facets.members.publish.command;
 
 import org.apache.causeway.applib.services.command.Command;
-import org.apache.causeway.applib.services.command.Command.CommandPublishingPhase;
 import org.apache.causeway.applib.services.commanddto.processor.CommandDtoProcessor;
 import org.apache.causeway.applib.services.publishing.spi.CommandSubscriber;
 import org.apache.causeway.core.metamodel.facetapi.Facet;
 import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
-import org.apache.causeway.core.metamodel.facets.actions.action.invocation.IdentifierUtil;
-import org.apache.causeway.core.metamodel.interactions.InteractionHead;
 import org.apache.causeway.core.metamodel.services.publishing.CommandPublisher;
-import org.apache.causeway.core.metamodel.spec.feature.ObjectMember;
 
 import lombok.NonNull;
 
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/CreatedCallbackFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/CreatedCallbackFacetViaMethod.java
index 781102bac1..b03e74eb77 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/CreatedCallbackFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/callbacks/CreatedCallbackFacetViaMethod.java
@@ -18,8 +18,6 @@
  */
 package org.apache.causeway.core.metamodel.facets.object.callbacks;
 
-import java.lang.reflect.Method;
-
 import org.apache.causeway.commons.collections.Can;
 import org.apache.causeway.commons.internal.reflection._MethodFacades.MethodFacade;
 import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BigDecimalValueSemantics.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BigDecimalValueSemantics.java
index 7a1e791ade..9c6b25a1ab 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BigDecimalValueSemantics.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BigDecimalValueSemantics.java
@@ -21,7 +21,6 @@ package org.apache.causeway.core.metamodel.valuesemantics;
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.util.function.UnaryOperator;
-import java.util.stream.Stream;
 
 import javax.annotation.Priority;
 import javax.inject.Inject;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/OidDtoValueSemantics.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/OidDtoValueSemantics.java
index f6e63ba8e5..d57aec6ca5 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/OidDtoValueSemantics.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/OidDtoValueSemantics.java
@@ -22,14 +22,13 @@ import javax.annotation.Priority;
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import org.apache.causeway.applib.CausewayModuleApplib;
-import org.apache.causeway.core.metamodel.CausewayModuleCoreMetamodel;
 import org.springframework.stereotype.Component;
 
 import org.apache.causeway.applib.annotation.PriorityPrecedence;
 import org.apache.causeway.applib.services.bookmark.Bookmark;
 import org.apache.causeway.applib.value.semantics.ValueSemanticsAbstract;
 import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.core.metamodel.CausewayModuleCoreMetamodel;
 import org.apache.causeway.core.metamodel.valuetypes.ValueSemanticsAdapter;
 import org.apache.causeway.schema.common.v2.OidDto;
 
diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/CausewayModuleCoreRuntimeServices.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/CausewayModuleCoreRuntimeServices.java
index 544b14118d..ab6295a4b6 100644
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/CausewayModuleCoreRuntimeServices.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/CausewayModuleCoreRuntimeServices.java
@@ -20,7 +20,6 @@ package org.apache.causeway.core.runtimeservices;
 
 import javax.inject.Singleton;
 
-import org.apache.causeway.core.runtimeservices.session.InteractionIdGeneratorDefault;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
@@ -62,7 +61,7 @@ import org.apache.causeway.core.runtimeservices.repository.RepositoryServiceDefa
 import org.apache.causeway.core.runtimeservices.routing.RoutingServiceDefault;
 import org.apache.causeway.core.runtimeservices.scratchpad.ScratchpadDefault;
 import org.apache.causeway.core.runtimeservices.serializing.SerializingAdapterDefault;
-import org.apache.causeway.core.runtimeservices.session.InteractionIdGenerator;
+import org.apache.causeway.core.runtimeservices.session.InteractionIdGeneratorDefault;
 import org.apache.causeway.core.runtimeservices.session.InteractionServiceDefault;
 import org.apache.causeway.core.runtimeservices.sitemap.SitemapServiceDefault;
 import org.apache.causeway.core.runtimeservices.spring.SpringBeansService;
diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/publish/CommandPublisherDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/publish/CommandPublisherDefault.java
index dd6fda041f..b29bc875d0 100644
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/publish/CommandPublisherDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/publish/CommandPublisherDefault.java
@@ -30,7 +30,6 @@ import org.springframework.stereotype.Service;
 
 import org.apache.causeway.applib.annotation.PriorityPrecedence;
 import org.apache.causeway.applib.services.command.Command;
-import org.apache.causeway.applib.services.command.Command.CommandPublishingPhase;
 import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker;
 import org.apache.causeway.applib.services.publishing.spi.CommandSubscriber;
 import org.apache.causeway.commons.collections.Can;
@@ -65,7 +64,7 @@ public class CommandPublisherDefault implements CommandPublisher {
     }
 
     @Override
-    public void ready(@NonNull Command command) {
+    public void ready(@NonNull final Command command) {
 
         val handle = _Xray.enterCommandReadyPublishing(
                 interactionServiceProvider.get(),
@@ -82,7 +81,7 @@ public class CommandPublisherDefault implements CommandPublisher {
     }
 
     @Override
-    public void start(@NonNull Command command) {
+    public void start(@NonNull final Command command) {
 
         val handle = _Xray.enterCommandStartedPublishing(
                 interactionServiceProvider.get(),
diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/session/InteractionIdGenerator.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/session/InteractionIdGenerator.java
index 3f8a59b0a8..f39c3be2f7 100644
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/session/InteractionIdGenerator.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/session/InteractionIdGenerator.java
@@ -20,19 +20,8 @@
 
 package org.apache.causeway.core.runtimeservices.session;
 
-import lombok.extern.log4j.Log4j2;
-
 import java.util.UUID;
 
-import javax.annotation.Priority;
-import javax.inject.Named;
-
-import org.apache.causeway.applib.annotation.PriorityPrecedence;
-import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
-
 public interface InteractionIdGenerator {
 
     UUID interactionId();
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/ActionChoicesFromEntityRepository.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/ActionChoicesFromEntityRepository.java
index 9af4a38e4e..2e4d7d5dd7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/ActionChoicesFromEntityRepository.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/ActionChoicesFromEntityRepository.java
@@ -18,8 +18,6 @@
  */
 package demoapp.dom.domain.actions.Action.choicesFrom;
 
-import java.util.List;
-
 public interface ActionChoicesFromEntityRepository {
 
 }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jdo/ActionCommandPublishingEntityImpl.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jdo/ActionCommandPublishingEntityImpl.java
index eea80cc8c5..2596240d34 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jdo/ActionCommandPublishingEntityImpl.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jdo/ActionCommandPublishingEntityImpl.java
@@ -23,20 +23,16 @@ import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
 import javax.jdo.annotations.PersistenceCapable;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
 
 import org.springframework.context.annotation.Profile;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
 
+import demoapp.dom.domain.actions.Action.commandPublishing.ActionCommandPublishingEntity;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import demoapp.dom.domain.actions.Action.commandPublishing.ActionCommandPublishingEntity;
-
 @Profile("demo-jdo")
 @PersistenceCapable(
         identityType = IdentityType.DATASTORE,
@@ -52,7 +48,7 @@ public class ActionCommandPublishingEntityImpl extends ActionCommandPublishingEn
     // ...
 //end::class[]
 
-    public ActionCommandPublishingEntityImpl(String value) {
+    public ActionCommandPublishingEntityImpl(final String value) {
         setName(value);
     }
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jdo/ActionExecutionPublishingEntityImpl.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jdo/ActionExecutionPublishingEntityImpl.java
index a98fc9b6e8..8b5e99019c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jdo/ActionExecutionPublishingEntityImpl.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jdo/ActionExecutionPublishingEntityImpl.java
@@ -29,12 +29,10 @@ import org.springframework.context.annotation.Profile;
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
 
+import demoapp.dom.domain.actions.Action.executionPublishing.ActionExecutionPublishingEntity;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import demoapp.dom.domain.actions.Action.executionPublishing.ActionExecutionPublishingEntity;
-
 @Profile("demo-jdo")
 @PersistenceCapable(
     identityType = IdentityType.DATASTORE,
@@ -50,7 +48,7 @@ public class ActionExecutionPublishingEntityImpl extends ActionExecutionPublishi
     // ...
 //end::class[]
 
-    public ActionExecutionPublishingEntityImpl(String value) {
+    public ActionExecutionPublishingEntityImpl(final String value) {
         setName(value);
     }
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/fieldSet/ActionLayoutFieldSetPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/fieldSet/ActionLayoutFieldSetPage.java
index 8f3758c744..d1193a3238 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/fieldSet/ActionLayoutFieldSetPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/fieldSet/ActionLayoutFieldSetPage.java
@@ -34,13 +34,10 @@ import org.apache.causeway.applib.annotation.ParameterLayout;
 import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
 
-import org.springframework.data.repository.query.Param;
-
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import lombok.Getter;
 import lombok.Setter;
 
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
 @DomainObject(
         nature=Nature.VIEW_MODEL)
 @Named("demo.ActionLayoutFieldSetVm")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/promptStyle/ActionLayoutPromptStylePage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/promptStyle/ActionLayoutPromptStylePage.java
index ce707ee524..35fa6adb4a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/promptStyle/ActionLayoutPromptStylePage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/promptStyle/ActionLayoutPromptStylePage.java
@@ -30,13 +30,11 @@ import org.apache.causeway.applib.annotation.Nature;
 import org.apache.causeway.applib.annotation.ObjectSupport;
 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/redirectPolicy/ActionLayoutRedirectPolicyEntity.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/ActionLayoutRedirectPolicyEntity.java
index b13f0d3bab..d1194fac99 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/ActionLayoutRedirectPolicyEntity.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/ActionLayoutRedirectPolicyEntity.java
@@ -18,25 +18,14 @@
  */
 package demoapp.dom.domain.actions.ActionLayout.redirectPolicy;
 
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom._infra.values.ValueHolder;
-
-import lombok.Getter;
-import lombok.Setter;
-import lombok.SneakyThrows;
-
-import org.apache.causeway.applib.annotation.Optionality;
 import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
 import org.apache.causeway.applib.annotation.Repainting;
-import org.apache.causeway.applib.services.clock.ClockService;
 import org.apache.causeway.applib.value.Blob;
 import org.apache.causeway.extensions.pdfjs.applib.annotations.PdfJsViewer;
-import org.apache.causeway.persistence.jpa.applib.types.BlobJpaEmbeddable;
 
-import javax.inject.Inject;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom._infra.values.ValueHolder;
 
 //tag::class[]
 public abstract class ActionLayoutRedirectPolicyEntity
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/ActionLayoutRedirectPolicyPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/ActionLayoutRedirectPolicyPage.java
index 791ddf5211..6781b2705b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/ActionLayoutRedirectPolicyPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/ActionLayoutRedirectPolicyPage.java
@@ -18,33 +18,18 @@
  */
 package demoapp.dom.domain.actions.ActionLayout.redirectPolicy;
 
-import javax.inject.Inject;
 import javax.inject.Named;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 
-import org.apache.causeway.applib.annotation.Action;
-import org.apache.causeway.applib.annotation.ActionLayout;
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
 import org.apache.causeway.applib.annotation.ObjectSupport;
-import org.apache.causeway.applib.annotation.Optionality;
-import org.apache.causeway.applib.annotation.Property;
-import org.apache.causeway.applib.annotation.PropertyLayout;
-import org.apache.causeway.applib.annotation.Redirect;
-import org.apache.causeway.applib.annotation.Repainting;
-import org.apache.causeway.applib.services.clock.ClockService;
 
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 
-import lombok.Getter;
-import lombok.Setter;
-import lombok.SneakyThrows;
-
 @DomainObject(nature=Nature.VIEW_MODEL)
 @Named("demo.ActionLayoutRedirectPolicyPage")
 @XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/ActionLayoutRedirectPolicyPage_objects.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/ActionLayoutRedirectPolicyPage_objects.java
index b33647a3d9..c8e32a1816 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/ActionLayoutRedirectPolicyPage_objects.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/ActionLayoutRedirectPolicyPage_objects.java
@@ -7,10 +7,8 @@ import javax.inject.Inject;
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.MemberSupport;
 
-import lombok.RequiredArgsConstructor;
-
 import demoapp.dom._infra.values.ValueHolderRepository;
-import demoapp.dom.domain.actions.ActionLayout.hidden.ActionLayoutHiddenPage;
+import lombok.RequiredArgsConstructor;
 
 //tag::class[]
 @Collection()
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/jdo/ActionLayoutRedirectPolicyEntityImpl.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/jdo/ActionLayoutRedirectPolicyEntityImpl.java
index 43da771593..243dbd0898 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/jdo/ActionLayoutRedirectPolicyEntityImpl.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/jdo/ActionLayoutRedirectPolicyEntityImpl.java
@@ -18,30 +18,26 @@
  */
 package demoapp.dom.domain.actions.ActionLayout.redirectPolicy.jdo;
 
-import demoapp.dom.domain.actions.ActionLayout.redirectPolicy.ActionLayoutRedirectPolicyEntity;
+import javax.inject.Named;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.DatastoreIdentity;
+import javax.jdo.annotations.IdGeneratorStrategy;
+import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.Persistent;
 
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
+import org.springframework.context.annotation.Profile;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
 import org.apache.causeway.applib.annotation.Optionality;
 import org.apache.causeway.applib.annotation.Property;
 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 org.springframework.context.annotation.Profile;
-
-import javax.inject.Named;
-import javax.jdo.annotations.Column;
-import javax.jdo.annotations.DatastoreIdentity;
-import javax.jdo.annotations.IdGeneratorStrategy;
-import javax.jdo.annotations.IdentityType;
-import javax.jdo.annotations.PersistenceCapable;
-import javax.jdo.annotations.Persistent;
-import javax.persistence.*;
+import demoapp.dom.domain.actions.ActionLayout.redirectPolicy.ActionLayoutRedirectPolicyEntity;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 @Profile("demo-jdo")
 @Named("demo.ActionLayoutRedirectPolicyEntity")
@@ -55,7 +51,7 @@ public class ActionLayoutRedirectPolicyEntityImpl extends ActionLayoutRedirectPo
     // ...
 //end::class[]
 
-    public ActionLayoutRedirectPolicyEntityImpl(String value) {
+    public ActionLayoutRedirectPolicyEntityImpl(final String value) {
         setName(value);
     }
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/jdo/ActionLayoutRedirectPolicyEntityImplRepository.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/jdo/ActionLayoutRedirectPolicyEntityImplRepository.java
index 1dc20b068c..0243e4caac 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/jdo/ActionLayoutRedirectPolicyEntityImplRepository.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/jdo/ActionLayoutRedirectPolicyEntityImplRepository.java
@@ -18,10 +18,13 @@
  */
 package demoapp.dom.domain.actions.ActionLayout.redirectPolicy.jdo;
 
+import java.util.List;
+import java.util.Random;
+import java.util.stream.Collectors;
+
 import javax.inject.Inject;
 
 import org.joda.time.DateTime;
-
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
 
@@ -32,11 +35,6 @@ import demoapp.dom._infra.values.ValueHolderRepository;
 import demoapp.dom.domain.actions.ActionLayout.redirectPolicy.ActionLayoutRedirectPolicyEntityRepository;
 import demoapp.dom.types.Samples;
 
-import java.util.List;
-import java.util.Random;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
 @Profile("demo-jdo")
 @Service
 public class ActionLayoutRedirectPolicyEntityImplRepository
@@ -52,7 +50,7 @@ extends ValueHolderRepository<String, ActionLayoutRedirectPolicyEntityImpl> impl
     }
 
     @Override
-    protected ActionLayoutRedirectPolicyEntityImpl newDetachedEntity(String value) {
+    protected ActionLayoutRedirectPolicyEntityImpl newDetachedEntity(final String value) {
         var entity = new ActionLayoutRedirectPolicyEntityImpl(value);
         entity.setBlob(randomBlob());
         return entity;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/jpa/ActionLayoutRedirectPolicyEntityImplRepository.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/jpa/ActionLayoutRedirectPolicyEntityImplRepository.java
index bcb1d29fa4..ce255a7f83 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/jpa/ActionLayoutRedirectPolicyEntityImplRepository.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/jpa/ActionLayoutRedirectPolicyEntityImplRepository.java
@@ -18,20 +18,17 @@
  */
 package demoapp.dom.domain.actions.ActionLayout.redirectPolicy.jpa;
 
-import demoapp.dom.types.Samples;
+import javax.inject.Inject;
 
-import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Service;
 
 import org.apache.causeway.applib.value.Blob;
 import org.apache.causeway.applib.value.NamedWithMimeType;
 
-import org.springframework.context.annotation.Profile;
-import org.springframework.stereotype.Service;
-
 import demoapp.dom._infra.values.ValueHolderRepository;
 import demoapp.dom.domain.actions.ActionLayout.redirectPolicy.ActionLayoutRedirectPolicyEntityRepository;
-
-import javax.inject.Inject;
+import demoapp.dom.types.Samples;
 
 @Profile("demo-jpa")
 @Service
@@ -45,7 +42,7 @@ extends ValueHolderRepository<String, ActionLayoutRedirectPolicyEntityImpl> impl
     }
 
     @Override
-    protected ActionLayoutRedirectPolicyEntityImpl newDetachedEntity(String value) {
+    protected ActionLayoutRedirectPolicyEntityImpl newDetachedEntity(final String value) {
         var entity = new ActionLayoutRedirectPolicyEntityImpl(value);
         blobSamples.stream()
                 .filter(x -> NamedWithMimeType.CommonMimeType.PDF.matches(x.getMimeType()))
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequencePage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequencePage.java
index 79b6c65365..687798d482 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequencePage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequencePage.java
@@ -28,20 +28,16 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-import org.apache.causeway.applib.annotation.Action;
-import org.apache.causeway.applib.annotation.ActionLayout;
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
 import org.apache.causeway.applib.annotation.ObjectSupport;
 import org.apache.causeway.applib.annotation.Property;
 
-import lombok.Getter;
-import lombok.Setter;
-
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
 import demoapp.dom.domain.actions.ActionLayout.sequence.child.ActionLayoutSequenceChildVm;
+import lombok.Getter;
+import lombok.Setter;
 
 @Named("demo.ActionLayoutSequencePage")
 @DomainObject(nature=Nature.VIEW_MODEL)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequencePage_addChild.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequencePage_addChild.java
index 3adc69a5f6..b663a4781e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequencePage_addChild.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequencePage_addChild.java
@@ -18,17 +18,14 @@
  */
 package demoapp.dom.domain.actions.ActionLayout.sequence;
 
-import demoapp.dom.domain.actions.ActionLayout.associateWith.child.ActionLayoutAssociateWithChildVm;
-
-import demoapp.dom.domain.actions.ActionLayout.sequence.child.ActionLayoutSequenceChildVm;
-
-import lombok.RequiredArgsConstructor;
-
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
 import org.apache.causeway.applib.annotation.MemberSupport;
 import org.apache.causeway.applib.annotation.SemanticsOf;
 
+import demoapp.dom.domain.actions.ActionLayout.sequence.child.ActionLayoutSequenceChildVm;
+import lombok.RequiredArgsConstructor;
+
 //tag::class[]
 @Action(semantics = SemanticsOf.IDEMPOTENT)
 @ActionLayout(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequencePage_removeChild.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequencePage_removeChild.java
index e938b7bd5c..9d9529ffa4 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequencePage_removeChild.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequencePage_removeChild.java
@@ -18,19 +18,16 @@
  */
 package demoapp.dom.domain.actions.ActionLayout.sequence;
 
+import java.util.List;
+
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
 import org.apache.causeway.applib.annotation.MemberSupport;
 import org.apache.causeway.applib.annotation.SemanticsOf;
 
-import demoapp.dom.domain.actions.ActionLayout.associateWith.child.ActionLayoutAssociateWithChildVm;
-
 import demoapp.dom.domain.actions.ActionLayout.sequence.child.ActionLayoutSequenceChildVm;
-
 import lombok.RequiredArgsConstructor;
 
-import java.util.List;
-
 //tag::class[]
 @Action(semantics = SemanticsOf.IDEMPOTENT)
 @ActionLayout(
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 652324a1d0..4bc1175bec 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,17 +30,12 @@ import org.apache.causeway.applib.annotation.SemanticsOf;
 import org.apache.causeway.applib.services.factory.FactoryService;
 
 import demoapp.dom._infra.samples.NameSamples;
-import demoapp.dom.domain.actions.Action.typeOf.ActionTypeOfPage;
-import demoapp.dom.domain.actions.Action.typeOf.child.ActionTypeOfChildVm;
-
+import demoapp.dom.domain.collections.Collection.domainEvent.CollectionDomainEventPage;
+import demoapp.dom.domain.collections.Collection.typeOf.CollectionTypeOfPage;
 import demoapp.dom.domain.collections.Collection.typeOf.child.CollectionTypeOfChildVm;
-
 import lombok.RequiredArgsConstructor;
 import lombok.val;
 
-import demoapp.dom.domain.collections.Collection.domainEvent.CollectionDomainEventPage;
-import demoapp.dom.domain.collections.Collection.typeOf.CollectionTypeOfPage;
-
 @Named("demo.CollectionMenu")
 @DomainService(
         nature=NatureOfService.VIEW
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/typeOf/CollectionTypeOfPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/typeOf/CollectionTypeOfPage.java
index fe2df3d88b..5f157cd8cf 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/typeOf/CollectionTypeOfPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/typeOf/CollectionTypeOfPage.java
@@ -20,32 +20,22 @@ package demoapp.dom.domain.collections.Collection.typeOf;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import javax.inject.Named;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 
-import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.CollectionLayout;
 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.applib.annotation.SemanticsOf;
 
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom.domain.collections.Collection.typeOf.child.CollectionTypeOfChildVm;
-
-import lombok.Getter;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.domain._entities.DemoEntity;
 
 @Named("demo.CollectionTypeOfPage")
 @DomainObject(nature=Nature.VIEW_MODEL)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/describedAs/CollectionLayoutDescribedAsPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/describedAs/CollectionLayoutDescribedAsPage.java
index 0272d5d284..ec1b406d4e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/describedAs/CollectionLayoutDescribedAsPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/describedAs/CollectionLayoutDescribedAsPage.java
@@ -27,7 +27,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Collection;
@@ -36,16 +35,11 @@ import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
 import org.apache.causeway.applib.annotation.ObjectSupport;
 
-import demoapp.dom.domain.collections.CollectionLayout.defaultView.child.CollectionLayoutDefaultViewChildVm;
-
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom.domain.collections.CollectionLayout.describedAs.child.CollectionLayoutDescribedAsChildVm;
-
 import lombok.Getter;
 import lombok.Setter;
 
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.domain._entities.DemoEntity;
-
 //tag::class[]
 @Named("demo.CollectionLayoutDescribedAsPage")
 @DomainObject(nature=Nature.VIEW_MODEL)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/hidden/CollectionLayoutHiddenPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/hidden/CollectionLayoutHiddenPage.java
index b8dc6c5ccf..638e2e9023 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/hidden/CollectionLayoutHiddenPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/hidden/CollectionLayoutHiddenPage.java
@@ -27,7 +27,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Collection;
@@ -37,16 +36,11 @@ import org.apache.causeway.applib.annotation.Nature;
 import org.apache.causeway.applib.annotation.ObjectSupport;
 import org.apache.causeway.applib.annotation.Where;
 
-import demoapp.dom.domain.collections.CollectionLayout.describedAs.child.CollectionLayoutDescribedAsChildVm;
-
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom.domain.collections.CollectionLayout.hidden.child.CollectionLayoutHiddenChildVm;
-
 import lombok.Getter;
 import lombok.Setter;
 
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.domain._entities.DemoEntity;
-
 //tag::class[]
 @Named("demo.CollectionLayoutHiddenPage")
 @DomainObject(nature=Nature.VIEW_MODEL)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/named/CollectionLayoutNamedPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/named/CollectionLayoutNamedPage.java
index 20ad49e20c..8e16c102c4 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/named/CollectionLayoutNamedPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/named/CollectionLayoutNamedPage.java
@@ -27,7 +27,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Collection;
@@ -35,18 +34,12 @@ import org.apache.causeway.applib.annotation.CollectionLayout;
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
 import org.apache.causeway.applib.annotation.ObjectSupport;
-import org.apache.causeway.applib.annotation.Where;
-
-import demoapp.dom.domain.collections.CollectionLayout.hidden.child.CollectionLayoutHiddenChildVm;
 
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom.domain.collections.CollectionLayout.named.child.CollectionLayoutNamedChildVm;
-
 import lombok.Getter;
 import lombok.Setter;
 
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.domain._entities.DemoEntity;
-
 //tag::class[]
 @Named("demo.CollectionLayoutNamedPage")
 @DomainObject(nature=Nature.VIEW_MODEL)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/paged/CollectionLayoutPagedPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/paged/CollectionLayoutPagedPage.java
index 01aff89897..e1b0123d67 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/paged/CollectionLayoutPagedPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/paged/CollectionLayoutPagedPage.java
@@ -27,7 +27,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Collection;
@@ -36,17 +35,11 @@ import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
 import org.apache.causeway.applib.annotation.ObjectSupport;
 
-import demoapp.dom.domain.collections.CollectionLayout.hidden.child.CollectionLayoutHiddenChildVm;
-
-import demoapp.dom.domain.collections.CollectionLayout.named.child.CollectionLayoutNamedChildVm;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom.domain.collections.CollectionLayout.paged.child.CollectionLayoutPagedChildVm;
-
 import lombok.Getter;
 import lombok.Setter;
 
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.domain._entities.DemoEntity;
-
 //tag::class[]
 @Named("demo.CollectionLayoutPagedPage")
 @DomainObject(nature=Nature.VIEW_MODEL)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/sequence/CollectionLayoutSequencePage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/sequence/CollectionLayoutSequencePage.java
index b24c62c500..a40a542835 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/sequence/CollectionLayoutSequencePage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/sequence/CollectionLayoutSequencePage.java
@@ -27,7 +27,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Collection;
@@ -36,16 +35,11 @@ import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
 import org.apache.causeway.applib.annotation.ObjectSupport;
 
-import demoapp.dom.domain.collections.CollectionLayout.paged.child.CollectionLayoutPagedChildVm;
-
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom.domain.collections.CollectionLayout.sequence.child.CollectionLayoutSequenceChildVm;
-
 import lombok.Getter;
 import lombok.Setter;
 
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.domain._entities.DemoEntity;
-
 //tag::class[]
 @Named("demo.CollectionLayoutSequencePage")
 @DomainObject(nature=Nature.VIEW_MODEL)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventPage_controlStrategy.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventPage_controlStrategy.java
index 81e3503189..52402cbc7c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventPage_controlStrategy.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventPage_controlStrategy.java
@@ -22,7 +22,6 @@ import javax.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
-import org.apache.causeway.applib.events.domain.ActionDomainEvent;
 import org.apache.causeway.applib.events.domain.PropertyDomainEvent;
 
 import lombok.RequiredArgsConstructor;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/maxLength/PropertyMaxLengthPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/maxLength/PropertyMaxLengthPage.java
index 325e77edc3..3ae39b0c60 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/maxLength/PropertyMaxLengthPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/maxLength/PropertyMaxLengthPage.java
@@ -30,13 +30,11 @@ 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.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/maxLength/PropertyMaxLengthPage_updateName.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/maxLength/PropertyMaxLengthPage_updateName.java
index b8e4089f57..8e9fb05647 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/maxLength/PropertyMaxLengthPage_updateName.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/maxLength/PropertyMaxLengthPage_updateName.java
@@ -22,7 +22,6 @@ import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
 import org.apache.causeway.applib.annotation.MemberSupport;
 import org.apache.causeway.applib.annotation.Parameter;
-import org.apache.causeway.applib.annotation.ParameterLayout;
 import org.apache.causeway.applib.annotation.SemanticsOf;
 
 import lombok.RequiredArgsConstructor;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/mustSatisfy/PropertyMustSatisfyPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/mustSatisfy/PropertyMustSatisfyPage.java
index 8fa317cc15..9b65408dfd 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/mustSatisfy/PropertyMustSatisfyPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/mustSatisfy/PropertyMustSatisfyPage.java
@@ -30,13 +30,11 @@ 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.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/PropertyMustSatisfyPage_updateCustomerAge.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/mustSatisfy/PropertyMustSatisfyPage_updateCustomerAge.java
index c002b0eb94..99b69769c5 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/mustSatisfy/PropertyMustSatisfyPage_updateCustomerAge.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/mustSatisfy/PropertyMustSatisfyPage_updateCustomerAge.java
@@ -22,7 +22,6 @@ import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
 import org.apache.causeway.applib.annotation.MemberSupport;
 import org.apache.causeway.applib.annotation.Parameter;
-import org.apache.causeway.applib.annotation.ParameterLayout;
 import org.apache.causeway.applib.annotation.SemanticsOf;
 
 import lombok.RequiredArgsConstructor;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityPage.java
index 36b3fa8275..0f4693b2a2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityPage.java
@@ -19,7 +19,6 @@
 package demoapp.dom.domain.properties.Property.optionality;
 
 import javax.inject.Named;
-import javax.validation.constraints.Null;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
@@ -32,15 +31,11 @@ import org.apache.causeway.applib.annotation.Nature;
 import org.apache.causeway.applib.annotation.ObjectSupport;
 import org.apache.causeway.applib.annotation.Optionality;
 import org.apache.causeway.applib.annotation.Property;
-import org.apache.causeway.applib.annotation.PropertyLayout;
-
-import org.springframework.lang.Nullable;
 
+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/PropertyOptionalityPage_updateMandatory.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityPage_updateMandatory.java
index b0147043bb..b7e19a395a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityPage_updateMandatory.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityPage_updateMandatory.java
@@ -23,7 +23,6 @@ import org.apache.causeway.applib.annotation.ActionLayout;
 import org.apache.causeway.applib.annotation.MemberSupport;
 import org.apache.causeway.applib.annotation.Optionality;
 import org.apache.causeway.applib.annotation.Parameter;
-import org.apache.causeway.applib.annotation.ParameterLayout;
 import org.apache.causeway.applib.annotation.SemanticsOf;
 
 import lombok.RequiredArgsConstructor;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityPage_updateNullable.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityPage_updateNullable.java
index 153d24825d..a03dc0706e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityPage_updateNullable.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityPage_updateNullable.java
@@ -21,13 +21,8 @@ package demoapp.dom.domain.properties.Property.optionality;
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
 import org.apache.causeway.applib.annotation.MemberSupport;
-import org.apache.causeway.applib.annotation.Optionality;
-import org.apache.causeway.applib.annotation.Parameter;
-import org.apache.causeway.applib.annotation.ParameterLayout;
 import org.apache.causeway.applib.annotation.SemanticsOf;
 
-import org.springframework.lang.Nullable;
-
 import lombok.RequiredArgsConstructor;
 
 @Action(semantics = SemanticsOf.IDEMPOTENT)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityPage_updateOptional.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityPage_updateOptional.java
index 4ef3a7ed50..60af850fc9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityPage_updateOptional.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityPage_updateOptional.java
@@ -23,7 +23,6 @@ import org.apache.causeway.applib.annotation.ActionLayout;
 import org.apache.causeway.applib.annotation.MemberSupport;
 import org.apache.causeway.applib.annotation.Optionality;
 import org.apache.causeway.applib.annotation.Parameter;
-import org.apache.causeway.applib.annotation.ParameterLayout;
 import org.apache.causeway.applib.annotation.SemanticsOf;
 
 import lombok.RequiredArgsConstructor;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/jdo/PropertySnapshotEntityImpl.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/jdo/PropertySnapshotEntityImpl.java
index 955cd00bf6..05d952a679 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/jdo/PropertySnapshotEntityImpl.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/jdo/PropertySnapshotEntityImpl.java
@@ -18,25 +18,21 @@
  */
 package demoapp.dom.domain.properties.Property.snapshot.jdo;
 
-import demoapp.dom.domain.properties.Property.snapshot.PropertySnapshotEntity;
-
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
 import javax.inject.Named;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
 import javax.jdo.annotations.PersistenceCapable;
-import javax.persistence.*;
+
+import org.springframework.context.annotation.Profile;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
 import org.apache.causeway.applib.annotation.Property;
-import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
 
-import org.springframework.context.annotation.Profile;
+import demoapp.dom.domain.properties.Property.snapshot.PropertySnapshotEntity;
+import lombok.Getter;
+import lombok.Setter;
 
 @Profile("demo-jdo")
 @PersistenceCapable(
@@ -54,7 +50,7 @@ public class PropertySnapshotEntityImpl
     // ...
 //end::class[]
 
-    public PropertySnapshotEntityImpl(String value) {
+    public PropertySnapshotEntityImpl(final String value) {
         setName(value);
     }
 //tag::class[]
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 0d8b16e3f8..66e6405b3a 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
@@ -27,11 +27,6 @@ import org.apache.causeway.applib.annotation.DomainService;
 import org.apache.causeway.applib.annotation.NatureOfService;
 import org.apache.causeway.applib.annotation.PriorityPrecedence;
 import org.apache.causeway.applib.annotation.SemanticsOf;
-import org.apache.causeway.applib.value.Blob;
-import org.apache.causeway.applib.value.NamedWithMimeType.CommonMimeType;
-
-import lombok.RequiredArgsConstructor;
-import lombok.val;
 
 import demoapp.dom.domain.properties.PropertyLayout.cssClass.PropertyLayoutCssClassPage;
 import demoapp.dom.domain.properties.PropertyLayout.describedAs.PropertyLayoutDescribedAsPage;
@@ -42,7 +37,8 @@ import demoapp.dom.domain.properties.PropertyLayout.named.PropertyLayoutNamedPag
 import demoapp.dom.domain.properties.PropertyLayout.navigable.FileNodeVm;
 import demoapp.dom.domain.properties.PropertyLayout.repainting.PropertyLayoutRepaintingPage;
 import demoapp.dom.domain.properties.PropertyLayout.typicalLength.PropertyLayoutTypicalLengthPage;
-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/navigable/FileNodeVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileNodeVm.java
index 18bff48202..974a5ef487 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
@@ -20,7 +20,6 @@ package demoapp.dom.domain.properties.PropertyLayout.navigable;
 
 import java.io.File;
 
-import javax.inject.Inject;
 import javax.inject.Named;
 import javax.xml.bind.annotation.XmlRootElement;
 
@@ -32,16 +31,14 @@ import org.apache.causeway.applib.annotation.ObjectSupport;
 import org.apache.causeway.applib.annotation.Property;
 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;
-
 @Named("demo.FileNodeVm")
 @XmlRootElement(name="FileNodeVm")
 @DomainObject(nature=Nature.VIEW_MODEL)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingPage.java
index a0a01b3381..015a6f99aa 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingPage.java
@@ -21,23 +21,12 @@ package demoapp.dom.domain.properties.PropertyLayout.repainting;
 import javax.inject.Named;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
 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.applib.annotation.Optionality;
-import org.apache.causeway.applib.annotation.Property;
-import org.apache.causeway.applib.annotation.PropertyLayout;
-import org.apache.causeway.applib.annotation.Repainting;
-import org.apache.causeway.applib.value.Blob;
-import org.apache.causeway.extensions.pdfjs.applib.annotations.PdfJsViewer;
-
-import lombok.Getter;
-import lombok.Setter;
 
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/dateRenderAdjustDays/ValueSemanticsDateRenderAdjustDaysPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/dateRenderAdjustDays/ValueSemanticsDateRenderAdjustDaysPage.java
index 4254828918..0a91cfbd14 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/dateRenderAdjustDays/ValueSemanticsDateRenderAdjustDaysPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/dateRenderAdjustDays/ValueSemanticsDateRenderAdjustDaysPage.java
@@ -18,10 +18,6 @@
  */
 package demoapp.dom.domain.properties.ValueSemantics.dateRenderAdjustDays;
 
-import org.apache.causeway.applib.annotation.PropertyLayout;
-import org.apache.causeway.applib.jaxb.JavaTimeJaxbAdapters;
-import org.apache.causeway.valuetypes.jodatime.applib.jaxb.JodaTimeJaxbAdapters;
-
 import java.time.LocalDate;
 
 import javax.inject.Named;
@@ -38,14 +34,15 @@ import org.apache.causeway.applib.annotation.Nature;
 import org.apache.causeway.applib.annotation.ObjectSupport;
 import org.apache.causeway.applib.annotation.Optionality;
 import org.apache.causeway.applib.annotation.Property;
+import org.apache.causeway.applib.annotation.PropertyLayout;
 import org.apache.causeway.applib.annotation.ValueSemantics;
+import org.apache.causeway.applib.jaxb.JavaTimeJaxbAdapters;
 
+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 = "root")
 @XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/dateRenderAdjustDays/ValueSemanticsDateRenderAdjustDaysPage_updateEndDate.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/dateRenderAdjustDays/ValueSemanticsDateRenderAdjustDaysPage_updateEndDate.java
index ee75c62dfc..8011fe43bf 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/dateRenderAdjustDays/ValueSemanticsDateRenderAdjustDaysPage_updateEndDate.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/dateRenderAdjustDays/ValueSemanticsDateRenderAdjustDaysPage_updateEndDate.java
@@ -19,17 +19,16 @@
 package demoapp.dom.domain.properties.ValueSemantics.dateRenderAdjustDays;
 
 
+import java.time.LocalDate;
+
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
 import org.apache.causeway.applib.annotation.MemberSupport;
 import org.apache.causeway.applib.annotation.Optionality;
 import org.apache.causeway.applib.annotation.Parameter;
-import org.apache.causeway.applib.annotation.ParameterLayout;
 import org.apache.causeway.applib.annotation.SemanticsOf;
 import org.apache.causeway.applib.annotation.ValueSemantics;
 
-import java.time.LocalDate;
-
 import lombok.RequiredArgsConstructor;
 
 @Action(semantics = SemanticsOf.IDEMPOTENT
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/percentage/ValueSemanticsProviderPercentagePage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/percentage/ValueSemanticsProviderPercentagePage.java
index 197c26c1f9..541414ebf7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/percentage/ValueSemanticsProviderPercentagePage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/percentage/ValueSemanticsProviderPercentagePage.java
@@ -18,22 +18,27 @@
  */
 package demoapp.dom.domain.properties.ValueSemantics.percentage;
 
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import java.math.BigDecimal;
+
+import javax.inject.Named;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+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.applib.annotation.Optionality;
+import org.apache.causeway.applib.annotation.Property;
 
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import org.apache.causeway.applib.annotation.*;
-import org.apache.causeway.applib.jaxb.JavaTimeJaxbAdapters;
-
-import javax.inject.Named;
-import javax.xml.bind.annotation.*;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-import java.math.BigDecimal;
-import java.time.LocalDate;
-
 //tag::class[]
 @XmlRootElement(name = "root")
 @XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/featured/causewayext/sse/SseDemoMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/featured/causewayext/sse/SseDemoMenu.java
index 6525a207a7..140519c5f1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/featured/causewayext/sse/SseDemoMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/featured/causewayext/sse/SseDemoMenu.java
@@ -30,8 +30,6 @@ import org.apache.causeway.applib.annotation.PriorityPrecedence;
 import org.apache.causeway.applib.services.factory.FactoryService;
 import org.apache.causeway.applib.value.Markup;
 
-import lombok.val;
-
 @Named("demo.SseDemoMenu")
 @DomainService(
         nature=NatureOfService.VIEW
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/featured/causewayext/sse/SseDemoPage.java b/examples/demo/domain/src/main/java/demoapp/dom/featured/causewayext/sse/SseDemoPage.java
index 44e28708ae..ac99f66188 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/featured/causewayext/sse/SseDemoPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/featured/causewayext/sse/SseDemoPage.java
@@ -38,11 +38,9 @@ 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
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/featured/causewayext/sse/TaskProgress.java b/examples/demo/domain/src/main/java/demoapp/dom/featured/causewayext/sse/TaskProgress.java
index b4c8f92752..0fc15aa6c4 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/featured/causewayext/sse/TaskProgress.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/featured/causewayext/sse/TaskProgress.java
@@ -21,7 +21,6 @@ package demoapp.dom.featured.causewayext.sse;
 import java.util.concurrent.atomic.LongAdder;
 
 import lombok.Data;
-import lombok.val;
 
 //tag::class[]
 @Data(staticConstructor="of")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/featured/customui/GeoapifyClient.java b/examples/demo/domain/src/main/java/demoapp/dom/featured/customui/GeoapifyClient.java
index db35b6b038..949fd389db 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/featured/customui/GeoapifyClient.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/featured/customui/GeoapifyClient.java
@@ -35,15 +35,13 @@ 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.Value;
 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/services/core/eventbusservice/EventBusServiceDemoPage.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventBusServiceDemoPage.java
index 9d53cbc2b8..89322d87d7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventBusServiceDemoPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventBusServiceDemoPage.java
@@ -24,10 +24,7 @@ import java.util.List;
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import org.apache.causeway.applib.ViewModel;
 import org.apache.causeway.applib.annotation.Action;
-import org.apache.causeway.applib.annotation.ActionLayout;
-import org.apache.causeway.applib.annotation.ActionLayout.Position;
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
@@ -49,7 +46,7 @@ public class EventBusServiceDemoPage implements HasAsciiDocDescription {
 
 //tag::eventClass[]
     public static class UiButtonEvent extends EventObject { // <.>
-        public UiButtonEvent(Object source) {
+        public UiButtonEvent(final Object source) {
             super(source);
         }
     }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventSubscriberForDemo.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventSubscriberForDemo.java
index c48d76b21b..ba25396326 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventSubscriberForDemo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventSubscriberForDemo.java
@@ -22,30 +22,17 @@ import javax.inject.Inject;
 import javax.inject.Named;
 
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Scope;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
 
-import org.apache.causeway.applib.annotation.Action;
-import org.apache.causeway.applib.annotation.DomainObject;
-import org.apache.causeway.applib.annotation.Nature;
-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 lombok.RequiredArgsConstructor;
-import lombok.val;
-import lombok.extern.log4j.Log4j2;
-
 import demoapp.dom.services.core.eventbusservice.EventBusServiceDemoPage.UiButtonEvent;
-
-import static demoapp.dom._infra.utils.LogUtils.emphasize;
+import lombok.RequiredArgsConstructor;
 
 //tag::class[]
 @Service
 @Named("demo.eventSubscriber")
 @Qualifier("demo")
-@Log4j2
+//@Log4j2
 @RequiredArgsConstructor(onConstructor_ = { @Inject })
 public class EventSubscriberForDemo {
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/PrimeNumberGenerator.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/PrimeNumberGenerator.java
index 1ff18684a5..0f06ced5ca 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/PrimeNumberGenerator.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/PrimeNumberGenerator.java
@@ -1,21 +1,19 @@
 package demoapp.dom.services.core.wrapperFactory;
 
-import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
-
 import javax.inject.Inject;
 import javax.inject.Named;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
 import org.apache.causeway.applib.annotation.DomainService;
-
 import org.apache.causeway.applib.annotation.NatureOfService;
-import org.apache.causeway.applib.annotation.Programmatic;
 import org.apache.causeway.applib.annotation.Where;
 import org.apache.causeway.applib.services.wrapper.WrapperFactory;
 import org.apache.causeway.applib.services.wrapper.control.AsyncControl;
 
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+
 //tag::class[]
 @Named("demo.DemoEntityFactory")
 @DomainService(
@@ -29,7 +27,7 @@ public class PrimeNumberGenerator {
 
     @Action
     @ActionLayout(hidden = Where.EVERYWHERE)                        // <.>
-    public void calculatePrimeNumbersAsync(int from, int upTo) {
+    public void calculatePrimeNumbersAsync(final int from, final int upTo) {
         int nextPrime = nextPrime(from);
         if (nextPrime <= upTo) {
             primeNumberFactory.newPrimeNumber(nextPrime);
@@ -50,7 +48,7 @@ public class PrimeNumberGenerator {
         return number;
     }
 
-    private static boolean isPrime(int number) {
+    private static boolean isPrime(final int number) {
         //...
 //end::class[]
         if (number <= 1) {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/PrimeNumberRepository.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/PrimeNumberRepository.java
index 33d7e8aea1..c007c542d0 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/PrimeNumberRepository.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/PrimeNumberRepository.java
@@ -18,16 +18,8 @@
  */
 package demoapp.dom.services.core.wrapperFactory;
 
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.services.core.wrapperFactory.jpa.PrimeNumberJpa;
-
 import java.util.List;
 
-import javax.inject.Named;
-
-import org.apache.causeway.applib.annotation.DomainObject;
-import org.apache.causeway.applib.annotation.ObjectSupport;
-
 public interface PrimeNumberRepository<T extends PrimeNumber> {
 
     public List<T> all();
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryDemoPage.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryDemoPage.java
index ea5ed2a4e4..5d1f2d47f5 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryDemoPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryDemoPage.java
@@ -18,16 +18,18 @@
  */
 package demoapp.dom.services.core.wrapperFactory;
 
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
-import javax.inject.Inject;
 import javax.inject.Named;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-import org.apache.causeway.applib.annotation.*;
+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 demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 
 @XmlRootElement(name = "Demo")
 @XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryDemoPage_createPrimes.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryDemoPage_createPrimes.java
index 44a46fb468..e1c60f3f35 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryDemoPage_createPrimes.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryDemoPage_createPrimes.java
@@ -7,12 +7,8 @@ import org.apache.causeway.applib.annotation.MemberSupport;
 import org.apache.causeway.applib.services.wrapper.WrapperFactory;
 import org.apache.causeway.applib.services.wrapper.control.AsyncControl;
 
-import demoapp.dom.services.core.wrapperFactory.jdo.PrimeNumberJdo;
-
 import lombok.RequiredArgsConstructor;
 
-import lombok.val;
-
 @Action
 @RequiredArgsConstructor
 public class WrapperFactoryDemoPage_createPrimes {
@@ -24,7 +20,7 @@ public class WrapperFactoryDemoPage_createPrimes {
     @Inject PrimeNumberGenerator primeNumberGenerator;
 
     @MemberSupport
-    public WrapperFactoryDemoPage act(Integer upTo) {
+    public WrapperFactoryDemoPage act(final Integer upTo) {
         primeNumberRepository.removeAll();
         wrapperFactory.asyncWrap(                               // <.>
                 primeNumberGenerator,                           // <.>
@@ -33,7 +29,7 @@ public class WrapperFactoryDemoPage_createPrimes {
         return page;
     }
 // end::class[]
-    public String validateUpTo(Integer upTo) {
+    public String validateUpTo(final Integer upTo) {
         if (upTo < 1) return "cannot be less than 1";
         if (upTo > 10000) return "can only calculate primes up to than 10000";
         return null;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryDemoPage_primeNumbers.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryDemoPage_primeNumbers.java
index f0ca20cf25..2f95340267 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryDemoPage_primeNumbers.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryDemoPage_primeNumbers.java
@@ -1,8 +1,5 @@
 package demoapp.dom.services.core.wrapperFactory;
 
-import lombok.RequiredArgsConstructor;
-
-import java.util.Collections;
 import java.util.List;
 
 import javax.inject.Inject;
@@ -11,6 +8,8 @@ import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.CollectionLayout;
 import org.apache.causeway.applib.annotation.MemberSupport;
 
+import lombok.RequiredArgsConstructor;
+
 @Collection
 @CollectionLayout(paged = 20)
 @RequiredArgsConstructor
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jdo/PrimeNumberJdoFactoryAndRepository.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jdo/PrimeNumberJdoFactoryAndRepository.java
index a316ef0b14..8ede8e975e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jdo/PrimeNumberJdoFactoryAndRepository.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jdo/PrimeNumberJdoFactoryAndRepository.java
@@ -25,11 +25,9 @@ import org.springframework.stereotype.Service;
 
 import org.apache.causeway.applib.services.repository.RepositoryService;
 
-import lombok.RequiredArgsConstructor;
-
 import demoapp.dom.services.core.wrapperFactory.PrimeNumberFactory;
 import demoapp.dom.services.core.wrapperFactory.PrimeNumberRepository;
-import demoapp.dom.services.core.wrapperFactory.jpa.PrimeNumberJpa;
+import lombok.RequiredArgsConstructor;
 
 @Profile("demo-jdo")
 @Service
@@ -40,7 +38,7 @@ public class PrimeNumberJdoFactoryAndRepository
     private final RepositoryService repositoryService;
 
     @Override
-    public PrimeNumberJdo newPrimeNumber(Integer value) {
+    public PrimeNumberJdo newPrimeNumber(final Integer value) {
         return repositoryService.persistAndFlush(new PrimeNumberJdo(value));
     }
 
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 c753eac94e..9de3292240 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
@@ -24,7 +24,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
@@ -33,14 +32,12 @@ import org.apache.causeway.applib.annotation.Optionality;
 import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
 import org.apache.causeway.applib.annotation.Title;
-
 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/vm/CausewayClobVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/vm/CausewayClobVm.java
index f853cbedc0..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
@@ -24,7 +24,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
@@ -33,14 +32,12 @@ import org.apache.causeway.applib.annotation.Optionality;
 import org.apache.causeway.applib.annotation.Property;
 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/vm/CausewayLocalResourcePathVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/vm/CausewayLocalResourcePathVm.java
index 6f085794ed..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
@@ -24,7 +24,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
@@ -33,14 +32,12 @@ import org.apache.causeway.applib.annotation.Optionality;
 import org.apache.causeway.applib.annotation.Property;
 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/markups/vm/CausewayMarkupVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/vm/CausewayMarkupVm.java
index b6a53dedcb..e21a4a3553 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/vm/CausewayMarkupVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/vm/CausewayMarkupVm.java
@@ -24,7 +24,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
@@ -33,14 +32,12 @@ import org.apache.causeway.applib.annotation.Optionality;
 import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
 import org.apache.causeway.applib.annotation.Title;
-
 import org.apache.causeway.applib.value.Markup;
 
-import lombok.Getter;
-import lombok.Setter;
-
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom.types.causeway.markups.holder.CausewayMarkupHolder2;
+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/persistence/CausewayPasswordEntity_checkPassword.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/persistence/CausewayPasswordEntity_checkPassword.java
index 1a0884b271..0f9710b907 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/persistence/CausewayPasswordEntity_checkPassword.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/persistence/CausewayPasswordEntity_checkPassword.java
@@ -22,7 +22,6 @@ import javax.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
-import org.apache.causeway.applib.annotation.MemberSupport;
 import org.apache.causeway.applib.annotation.PromptStyle;
 import org.apache.causeway.applib.services.message.MessageService;
 import org.apache.causeway.applib.value.Password;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/vm/CausewayAsciiDocVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/vm/CausewayAsciiDocVm.java
index f018dd5109..de2fff7a74 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/vm/CausewayAsciiDocVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/vm/CausewayAsciiDocVm.java
@@ -24,7 +24,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
@@ -33,14 +32,12 @@ import org.apache.causeway.applib.annotation.Optionality;
 import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
 import org.apache.causeway.applib.annotation.Title;
-
 import org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc;
 
-import lombok.Getter;
-import lombok.Setter;
-
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom.types.causewayval.asciidocs.holder.CausewayAsciiDocHolder2;
+import lombok.Getter;
+import lombok.Setter;
 
 //tag::class[]
 @XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/vm/CausewayMarkdownVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/vm/CausewayMarkdownVm.java
index 0d681010df..a764f41e07 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/vm/CausewayMarkdownVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/vm/CausewayMarkdownVm.java
@@ -24,7 +24,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
@@ -33,14 +32,12 @@ import org.apache.causeway.applib.annotation.Optionality;
 import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
 import org.apache.causeway.applib.annotation.Title;
-
 import org.apache.causeway.valuetypes.markdown.applib.value.Markdown;
 
-import lombok.Getter;
-import lombok.Setter;
-
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom.types.causewayval.markdowns.holder.CausewayMarkdownHolder2;
+import lombok.Getter;
+import lombok.Setter;
 
 //tag::class[]
 @XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/vm/CausewayVegaVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/vm/CausewayVegaVm.java
index 3048365195..3b94c191ea 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/vm/CausewayVegaVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/vm/CausewayVegaVm.java
@@ -24,7 +24,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
@@ -33,14 +32,12 @@ import org.apache.causeway.applib.annotation.Optionality;
 import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
 import org.apache.causeway.applib.annotation.Title;
-
 import org.apache.causeway.valuetypes.vega.applib.value.Vega;
 
-import lombok.Getter;
-import lombok.Setter;
-
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom.types.causewayval.vegas.holder.CausewayVegaHolder2;
+import lombok.Getter;
+import lombok.Setter;
 
 //tag::class[]
 @XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/BufferedImageVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/BufferedImageVm.java
index c9480410b0..1a2344f323 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/BufferedImageVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/BufferedImageVm.java
@@ -18,13 +18,14 @@
  */
 package demoapp.dom.types.javaawt.images.vm;
 
+import java.awt.image.BufferedImage;
+
 import javax.inject.Named;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
@@ -34,13 +35,10 @@ import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
 import org.apache.causeway.applib.annotation.Title;
 
-import java.awt.image.BufferedImage;
-
-import lombok.Getter;
-import lombok.Setter;
-
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom.types.javaawt.images.holder.BufferedImageHolder2;
+import lombok.Getter;
+import lombok.Setter;
 
 //tag::class[]
 @XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/vm/WrapperBooleanVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/vm/WrapperBooleanVm.java
index bc3c84843e..05c3c8df59 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/vm/WrapperBooleanVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/vm/WrapperBooleanVm.java
@@ -24,7 +24,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
@@ -34,13 +33,10 @@ import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
 import org.apache.causeway.applib.annotation.Title;
 
-import java.lang.Boolean;
-
-import lombok.Getter;
-import lombok.Setter;
-
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom.types.javalang.booleans.holder.WrapperBooleanHolder2;
+import lombok.Getter;
+import lombok.Setter;
 
 //tag::class[]
 @XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/vm/WrapperByteVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/vm/WrapperByteVm.java
index c71f6f672b..d36a1fa9f6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/vm/WrapperByteVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/vm/WrapperByteVm.java
@@ -24,7 +24,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
@@ -34,13 +33,10 @@ import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
 import org.apache.causeway.applib.annotation.Title;
 
-import java.lang.Byte;
-
-import lombok.Getter;
-import lombok.Setter;
-
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom.types.javalang.bytes.holder.WrapperByteHolder2;
+import lombok.Getter;
+import lombok.Setter;
 
 //tag::class[]
 @XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/vm/WrapperCharacterVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/vm/WrapperCharacterVm.java
index f40155cf1a..ca59b97172 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/vm/WrapperCharacterVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/vm/WrapperCharacterVm.java
@@ -24,7 +24,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
@@ -34,13 +33,10 @@ import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
 import org.apache.causeway.applib.annotation.Title;
 
-import java.lang.Character;
-
-import lombok.Getter;
-import lombok.Setter;
-
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom.types.javalang.characters.holder.WrapperCharacterHolder2;
+import lombok.Getter;
+import lombok.Setter;
 
 //tag::class[]
 @XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/vm/WrapperDoubleVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/vm/WrapperDoubleVm.java
index d749228cb4..6d9bdc4c86 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/vm/WrapperDoubleVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/vm/WrapperDoubleVm.java
@@ -24,7 +24,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
@@ -34,13 +33,10 @@ import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
 import org.apache.causeway.applib.annotation.Title;
 
-import java.lang.Double;
-
-import lombok.Getter;
-import lombok.Setter;
-
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom.types.javalang.doubles.holder.WrapperDoubleHolder2;
+import lombok.Getter;
+import lombok.Setter;
 
 //tag::class[]
 @XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/enums/vm/JavaLangEnumVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/enums/vm/JavaLangEnumVm.java
index f288767002..b4fb5f9d07 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/enums/vm/JavaLangEnumVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/enums/vm/JavaLangEnumVm.java
@@ -24,7 +24,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
@@ -34,14 +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._infra.samples.DemoEnum;
-
+import demoapp.dom.types.javalang.enums.holder.JavaLangEnumHolder2;
 import lombok.Getter;
 import lombok.Setter;
 
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.javalang.enums.holder.JavaLangEnumHolder2;
-
 //tag::class[]
 @XmlRootElement(name = "root")
 @XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/vm/WrapperFloatVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/vm/WrapperFloatVm.java
index bbe63fa6ef..d3f45495a2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/vm/WrapperFloatVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/vm/WrapperFloatVm.java
@@ -24,7 +24,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
@@ -34,13 +33,10 @@ import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
 import org.apache.causeway.applib.annotation.Title;
 
-import java.lang.Float;
-
-import lombok.Getter;
-import lombok.Setter;
-
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom.types.javalang.floats.holder.WrapperFloatHolder2;
+import lombok.Getter;
+import lombok.Setter;
 
 //tag::class[]
 @XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/vm/WrapperIntegerVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/vm/WrapperIntegerVm.java
index aead0843dd..2c0b681ed5 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/vm/WrapperIntegerVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/vm/WrapperIntegerVm.java
@@ -24,7 +24,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
@@ -34,13 +33,10 @@ import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
 import org.apache.causeway.applib.annotation.Title;
 
-import java.lang.Integer;
-
-import lombok.Getter;
-import lombok.Setter;
-
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom.types.javalang.integers.holder.WrapperIntegerHolder2;
+import lombok.Getter;
+import lombok.Setter;
 
 //tag::class[]
 @XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/vm/WrapperLongVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/vm/WrapperLongVm.java
index efc7e174b8..1ad6d92f4c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/vm/WrapperLongVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/vm/WrapperLongVm.java
@@ -24,7 +24,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
@@ -34,13 +33,10 @@ import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
 import org.apache.causeway.applib.annotation.Title;
 
-import java.lang.Long;
-
-import lombok.Getter;
-import lombok.Setter;
-
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom.types.javalang.longs.holder.WrapperLongHolder2;
+import lombok.Getter;
+import lombok.Setter;
 
 //tag::class[]
 @XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/vm/WrapperShortVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/vm/WrapperShortVm.java
index d29e39c7bd..e377fedf7a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/vm/WrapperShortVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/vm/WrapperShortVm.java
@@ -24,7 +24,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
@@ -34,13 +33,10 @@ import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
 import org.apache.causeway.applib.annotation.Title;
 
-import java.lang.Short;
-
-import lombok.Getter;
-import lombok.Setter;
-
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom.types.javalang.shorts.holder.WrapperShortHolder2;
+import lombok.Getter;
+import lombok.Setter;
 
 //tag::class[]
 @XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/vm/JavaLangStringVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/vm/JavaLangStringVm.java
index 279fca8b85..0c84b64666 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/vm/JavaLangStringVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/vm/JavaLangStringVm.java
@@ -24,7 +24,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
@@ -34,13 +33,10 @@ import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
 import org.apache.causeway.applib.annotation.Title;
 
-import java.lang.String;
-
-import lombok.Getter;
-import lombok.Setter;
-
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom.types.javalang.strings.holder.JavaLangStringHolder2;
+import lombok.Getter;
+import lombok.Setter;
 
 //tag::class[]
 @XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/voids/JavaLangVoids.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/voids/JavaLangVoids.java
index c6590c6271..04c06ee608 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/voids/JavaLangVoids.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/voids/JavaLangVoids.java
@@ -27,13 +27,11 @@ import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Action;
-import org.apache.causeway.applib.annotation.ActionLayout;
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
 import org.apache.causeway.applib.annotation.LabelPosition;
 import org.apache.causeway.applib.annotation.Nature;
 import org.apache.causeway.applib.annotation.ObjectSupport;
-import org.apache.causeway.applib.annotation.PromptStyle;
 import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
 import org.apache.causeway.applib.annotation.SemanticsOf;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/vm/BigDecimalVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/vm/BigDecimalVm.java
index cd3aca89c1..e40b8a4168 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/vm/BigDecimalVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/vm/BigDecimalVm.java
@@ -18,13 +18,14 @@
  */
 package demoapp.dom.types.javamath.bigdecimals.vm;
 
+import java.math.BigDecimal;
+
 import javax.inject.Named;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
@@ -34,13 +35,10 @@ import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
 import org.apache.causeway.applib.annotation.Title;
 
-import java.math.BigDecimal;
-
-import lombok.Getter;
-import lombok.Setter;
-
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom.types.javamath.bigdecimals.holder.BigDecimalHolder2;
+import lombok.Getter;
+import lombok.Setter;
 
 //tag::class[]
 @XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/vm/BigIntegerVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/vm/BigIntegerVm.java
index 782271f43d..76427899b2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/vm/BigIntegerVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/vm/BigIntegerVm.java
@@ -18,13 +18,14 @@
  */
 package demoapp.dom.types.javamath.bigintegers.vm;
 
+import java.math.BigInteger;
+
 import javax.inject.Named;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
@@ -34,13 +35,10 @@ import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
 import org.apache.causeway.applib.annotation.Title;
 
-import java.math.BigInteger;
-
-import lombok.Getter;
-import lombok.Setter;
-
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom.types.javamath.bigintegers.holder.BigIntegerHolder2;
+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/vm/URLsVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/vm/URLsVm.java
index 943e39543a..0cb8a4db4b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/vm/URLsVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/vm/URLsVm.java
@@ -18,13 +18,14 @@
  */
 package demoapp.dom.types.javanet.urls.vm;
 
+import java.net.URL;
+
 import javax.inject.Named;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
@@ -34,13 +35,10 @@ import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
 import org.apache.causeway.applib.annotation.Title;
 
-import java.net.URL;
-
-import lombok.Getter;
-import lombok.Setter;
-
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom.types.javanet.urls.holder.URLsHolder2;
+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/vm/JavaSqlDateVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/vm/JavaSqlDateVm.java
index 589dc59d27..547831b1f0 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
@@ -18,13 +18,14 @@
  */
 package demoapp.dom.types.javasql.javasqldate.vm;
 
+import java.sql.Date;
+
 import javax.inject.Named;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
@@ -34,13 +35,10 @@ import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
 import org.apache.causeway.applib.annotation.Title;
 
-import java.sql.Date;
-
-import lombok.Getter;
-import lombok.Setter;
-
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom.types.javasql.javasqldate.holder.JavaSqlDateHolder2;
+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/vm/JavaUtilDateVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/vm/JavaUtilDateVm.java
index 3210b7c77c..a684a28c9c 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
@@ -18,13 +18,14 @@
  */
 package demoapp.dom.types.javautil.javautildate.vm;
 
+import java.util.Date;
+
 import javax.inject.Named;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
@@ -34,13 +35,10 @@ import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
 import org.apache.causeway.applib.annotation.Title;
 
-import java.util.Date;
-
-import lombok.Getter;
-import lombok.Setter;
-
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom.types.javautil.javautildate.holder.JavaUtilDateHolder2;
+import lombok.Getter;
+import lombok.Setter;
 
 //tag::class[]
 @XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/vm/JavaUtilUuidVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/vm/JavaUtilUuidVm.java
index 360665ef23..1644cfd908 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/vm/JavaUtilUuidVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/vm/JavaUtilUuidVm.java
@@ -18,13 +18,14 @@
  */
 package demoapp.dom.types.javautil.uuids.vm;
 
+import java.util.UUID;
+
 import javax.inject.Named;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
@@ -34,13 +35,10 @@ import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
 import org.apache.causeway.applib.annotation.Title;
 
-import java.util.UUID;
-
-import lombok.Getter;
-import lombok.Setter;
-
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom.types.javautil.uuids.holder.JavaUtilUuidHolder2;
+import lombok.Getter;
+import lombok.Setter;
 
 //tag::class[]
 @XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/test/java/demoapp/dom/featured/customui/geocoding/GeoapifyClientTest_geocode.java b/examples/demo/domain/src/test/java/demoapp/dom/featured/customui/geocoding/GeoapifyClientTest_geocode.java
index 48773cda26..13d3579a13 100644
--- a/examples/demo/domain/src/test/java/demoapp/dom/featured/customui/geocoding/GeoapifyClientTest_geocode.java
+++ b/examples/demo/domain/src/test/java/demoapp/dom/featured/customui/geocoding/GeoapifyClientTest_geocode.java
@@ -22,10 +22,8 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import demoapp.dom.featured.customui.GeoapifyClient;
-import lombok.val;
-
 import demoapp.dom.AppConfiguration;
+import demoapp.dom.featured.customui.GeoapifyClient;
 
 class GeoapifyClientTest_geocode {
 
diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/contributions/T_recentBackgroundCommands.java b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/contributions/T_recentBackgroundCommands.java
index 988b07ec03..2d0105ab17 100644
--- a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/contributions/T_recentBackgroundCommands.java
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/contributions/T_recentBackgroundCommands.java
@@ -18,14 +18,11 @@
  */
 package org.apache.causeway.extensions.commandlog.applib.contributions;
 
-import lombok.RequiredArgsConstructor;
-
 import java.util.Collections;
 import java.util.List;
 
 import javax.inject.Inject;
 
-import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.MemberSupport;
 import org.apache.causeway.applib.services.bookmark.BookmarkService;
@@ -34,6 +31,8 @@ import org.apache.causeway.extensions.commandlog.applib.CausewayModuleExtCommand
 import org.apache.causeway.extensions.commandlog.applib.dom.CommandLogEntry;
 import org.apache.causeway.extensions.commandlog.applib.dom.CommandLogEntryRepository;
 
+import lombok.RequiredArgsConstructor;
+
 /**
  * This (abstract) mixin contributes a <tt>recentBackgroundCommands</tt> collection to any domain object.
  *
diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/BackgroundService.java b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/BackgroundService.java
index 5eba5af1d2..2496f2a9b7 100644
--- a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/BackgroundService.java
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/BackgroundService.java
@@ -18,26 +18,31 @@
  */
 package org.apache.causeway.extensions.commandlog.applib.dom;
 
-import lombok.val;
-
 import java.sql.Timestamp;
 import java.util.Collection;
 import java.util.List;
 import java.util.UUID;
-import java.util.concurrent.*;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 import javax.inject.Inject;
 
+import org.springframework.stereotype.Service;
+
 import org.apache.causeway.applib.jaxb.JavaSqlJaxbAdapters;
 import org.apache.causeway.applib.services.bookmark.Bookmark;
 import org.apache.causeway.applib.services.command.Command;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
 import org.apache.causeway.applib.services.wrapper.WrapperFactory;
 import org.apache.causeway.applib.services.wrapper.callable.AsyncCallable;
 import org.apache.causeway.applib.services.wrapper.control.AsyncControl;
 import org.apache.causeway.schema.cmd.v2.CommandDto;
 import org.apache.causeway.schema.common.v2.PeriodDto;
-import org.springframework.stereotype.Service;
+
+import lombok.val;
 
 /**
  * Allows the execution of action invocations or property edits to be deferred so that they can be executed later in
@@ -64,7 +69,7 @@ public class BackgroundService {
      *
      * @see #executeMixin(Class, Object) - to invoke actions that are implemented as mixins
      */
-    public <T> T execute(T object) {
+    public <T> T execute(final T object) {
         return wrapperFactory.asyncWrap(object, AsyncControl.returningVoid().withCheckRules()
                 .with(persistCommandExecutorService)
         );
@@ -75,7 +80,7 @@ public class BackgroundService {
      *
      * @see #executeMixin(Class, Object) - to invoke actions that are implemented as mixins
      */
-    public <T> T executeSkipRules(T object) {
+    public <T> T executeSkipRules(final T object) {
         return wrapperFactory.asyncWrap(object, AsyncControl.returningVoid().withSkipRules()
                 .with(persistCommandExecutorService)
         );
@@ -87,7 +92,7 @@ public class BackgroundService {
      *
      * @see #execute(Object) - to invoke actions that are implemented directly within the object
      */
-    public <T> T executeMixin(Class<T> mixinClass, Object mixedIn) {
+    public <T> T executeMixin(final Class<T> mixinClass, final Object mixedIn) {
         return wrapperFactory.asyncWrapMixin(mixinClass, mixedIn, AsyncControl.returningVoid().withCheckRules()
                 .with(persistCommandExecutorService)
         );
@@ -99,7 +104,7 @@ public class BackgroundService {
      *
      * @see #execute(Object) - to invoke actions that are implemented directly within the object
      */
-    public <T> T executeMixinSkipRules(Class<T> mixinClass, Object mixedIn) {
+    public <T> T executeMixinSkipRules(final Class<T> mixinClass, final Object mixedIn) {
         return wrapperFactory.asyncWrapMixin(mixinClass, mixedIn, AsyncControl.returningVoid().withSkipRules()
                 .with(persistCommandExecutorService)
         );
@@ -116,7 +121,7 @@ public class BackgroundService {
         private final static JavaSqlJaxbAdapters.TimestampToXMLGregorianCalendarAdapter gregorianCalendarAdapter  = new JavaSqlJaxbAdapters.TimestampToXMLGregorianCalendarAdapter();;
 
         @Override
-        public <T> Future<T> submit(Callable<T> task) {
+        public <T> Future<T> submit(final Callable<T> task) {
             val callable = (AsyncCallable<T>) task;
             val commandDto = callable.getCommandDto();
 
@@ -146,7 +151,7 @@ public class BackgroundService {
             // querying the CommandLogEntryRepository
             return new Future<T>() {
                 @Override
-                public boolean cancel(boolean mayInterruptIfRunning) {
+                public boolean cancel(final boolean mayInterruptIfRunning) {
                     throw new IllegalStateException("Not implemented");
                 }
                 @Override
@@ -165,13 +170,13 @@ public class BackgroundService {
                 }
 
                 @Override
-                public T get(long timeout, TimeUnit unit) {
+                public T get(final long timeout, final TimeUnit unit) {
                     throw new IllegalStateException("Not implemented");
                 }
             };
         }
 
-        private static Command newCommand(CommandDto commandDto) {
+        private static Command newCommand(final CommandDto commandDto) {
             return new Command(UUID.fromString(commandDto.getInteractionId())) {
                 @Override public String getUsername() {return commandDto.getUsername();}
                 @Override public Timestamp getTimestamp() {return gregorianCalendarAdapter.unmarshal(commandDto.getTimestamp());}
@@ -187,37 +192,37 @@ public class BackgroundService {
 
 
         @Override
-        public <T> Future<T> submit(Runnable task, T result) {
+        public <T> Future<T> submit(final Runnable task, final T result) {
             throw new IllegalStateException("Not implemented");
         }
 
         @Override
-        public Future<?> submit(Runnable task) {
+        public Future<?> submit(final Runnable task) {
             throw new IllegalStateException("Not implemented");
         }
 
         @Override
-        public void execute(Runnable command) {
+        public void execute(final Runnable command) {
             throw new IllegalStateException("Not implemented");
         }
 
         @Override
-        public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks) {
+        public <T> List<Future<T>> invokeAll(final Collection<? extends Callable<T>> tasks) {
             throw new IllegalStateException("Not implemented");
         }
 
         @Override
-        public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit) throws InterruptedException {
+        public <T> List<Future<T>> invokeAll(final Collection<? extends Callable<T>> tasks, final long timeout, final TimeUnit unit) throws InterruptedException {
             throw new IllegalStateException("Not implemented");
         }
 
         @Override
-        public <T> T invokeAny(Collection<? extends Callable<T>> tasks) throws InterruptedException, ExecutionException {
+        public <T> T invokeAny(final Collection<? extends Callable<T>> tasks) throws InterruptedException, ExecutionException {
             throw new IllegalStateException("Not implemented");
         }
 
         @Override
-        public <T> T invokeAny(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
+        public <T> T invokeAny(final Collection<? extends Callable<T>> tasks, final long timeout, final TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
             throw new IllegalStateException("Not implemented");
         }
 
@@ -232,7 +237,7 @@ public class BackgroundService {
         }
 
         @Override
-        public boolean awaitTermination(long timeout, TimeUnit unit) throws InterruptedException {
+        public boolean awaitTermination(final long timeout, final TimeUnit unit) throws InterruptedException {
             throw new IllegalStateException("Not implemented");
         }
 
diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/CommandLogEntry.java b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/CommandLogEntry.java
index 2a87a402e1..b951821310 100644
--- a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/CommandLogEntry.java
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/CommandLogEntry.java
@@ -23,7 +23,10 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.math.BigDecimal;
 import java.time.format.DateTimeFormatter;
-import java.util.*;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.UUID;
 import java.util.function.Consumer;
 
 import javax.annotation.Priority;
@@ -31,23 +34,34 @@ import javax.inject.Inject;
 import javax.inject.Named;
 import javax.validation.constraints.Digits;
 
-import org.apache.causeway.applib.annotation.*;
-import org.apache.causeway.commons.internal.base._Casts;
 import org.springframework.stereotype.Service;
 
+import org.apache.causeway.applib.annotation.Domain;
+import org.apache.causeway.applib.annotation.DomainObject;
+import org.apache.causeway.applib.annotation.DomainObjectLayout;
+import org.apache.causeway.applib.annotation.Editing;
+import org.apache.causeway.applib.annotation.MemberSupport;
+import org.apache.causeway.applib.annotation.ObjectSupport;
+import org.apache.causeway.applib.annotation.Optionality;
+import org.apache.causeway.applib.annotation.Parameter;
+import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.applib.annotation.Programmatic;
+import org.apache.causeway.applib.annotation.Property;
+import org.apache.causeway.applib.annotation.PropertyLayout;
+import org.apache.causeway.applib.annotation.Publishing;
+import org.apache.causeway.applib.annotation.Where;
 import org.apache.causeway.applib.jaxb.JavaSqlXMLGregorianCalendarMarshalling;
 import org.apache.causeway.applib.mixins.system.DomainChangeRecord;
 import org.apache.causeway.applib.mixins.system.HasInteractionId;
 import org.apache.causeway.applib.services.bookmark.Bookmark;
 import org.apache.causeway.applib.services.command.Command;
-import org.apache.causeway.applib.services.command.CommandOutcomeHandler;
 import org.apache.causeway.applib.services.commanddto.HasCommandDto;
 import org.apache.causeway.applib.services.commanddto.conmap.UserDataKeys;
 import org.apache.causeway.applib.services.tablecol.TableColumnOrderForCollectionTypeAbstract;
 import org.apache.causeway.applib.util.ObjectContracts;
 import org.apache.causeway.applib.util.TitleBuffer;
 import org.apache.causeway.applib.util.ToString;
-import org.apache.causeway.commons.functional.Try;
+import org.apache.causeway.commons.internal.base._Casts;
 import org.apache.causeway.commons.internal.base._Strings;
 import org.apache.causeway.commons.internal.base._Temporals;
 import org.apache.causeway.commons.internal.exceptions._Exceptions;
@@ -56,8 +70,8 @@ import org.apache.causeway.schema.cmd.v2.CommandDto;
 import org.apache.causeway.schema.cmd.v2.MapDto;
 
 import lombok.NoArgsConstructor;
-import lombok.experimental.UtilityClass;
 import lombok.val;
+import lombok.experimental.UtilityClass;
 
 /**
  * A persistent representation of a {@link Command}, being the intention to edit a property or invoke an action.
diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/subscriber/CommandSubscriberForCommandLog.java b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/subscriber/CommandSubscriberForCommandLog.java
index 574d417f80..ee5a8b5824 100644
--- a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/subscriber/CommandSubscriberForCommandLog.java
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/subscriber/CommandSubscriberForCommandLog.java
@@ -22,15 +22,14 @@ import javax.annotation.Priority;
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import org.apache.causeway.applib.services.clock.ClockService;
-import org.apache.causeway.applib.services.repository.RepositoryService;
-import org.apache.causeway.schema.cmd.v2.CommandDto;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
 import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.applib.services.clock.ClockService;
 import org.apache.causeway.applib.services.command.Command;
 import org.apache.causeway.applib.services.publishing.spi.CommandSubscriber;
+import org.apache.causeway.applib.services.repository.RepositoryService;
 import org.apache.causeway.applib.util.schema.CommandDtoUtils;
 import org.apache.causeway.commons.functional.Try;
 import org.apache.causeway.core.config.CausewayConfiguration;
@@ -70,7 +69,7 @@ public class CommandSubscriberForCommandLog implements CommandSubscriber {
     }
 
     @Override
-    public void onReady(Command command) {
+    public void onReady(final Command command) {
 
         if (!isEnabled()) {
             return;
@@ -111,7 +110,7 @@ public class CommandSubscriberForCommandLog implements CommandSubscriber {
     }
 
     @Override
-    public void onStarted(Command command) {
+    public void onStarted(final Command command) {
 
         if (!isEnabled()) {
             return;
diff --git a/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/commandlog/jdo/dom/CommandLogEntryRepository.java b/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/commandlog/jdo/dom/CommandLogEntryRepository.java
index 7a734a9a79..620c597fcc 100644
--- a/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/commandlog/jdo/dom/CommandLogEntryRepository.java
+++ b/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/commandlog/jdo/dom/CommandLogEntryRepository.java
@@ -48,6 +48,7 @@ extends org.apache.causeway.extensions.commandlog.applib.dom.CommandLogEntryRepo
      * should  generate Q classes under 'target/generated-sources/annotations'.
      * @see "https://www.datanucleus.org/products/accessplatform_6_0/jdo/query.html#jdoql"
      */
+    @SuppressWarnings("unused")
     private void ensureWeHaveQClasses() {
         // ensures at compile time, that Q classes are generated
         org.apache.causeway.extensions.commandlog.jdo.dom.QCommandLogEntry q;
diff --git a/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java b/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
index fcdb7c82c6..e4c83e9b90 100644
--- a/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
+++ b/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
@@ -146,9 +146,10 @@ public class BulkUpdateManagerForDemoToDoItem {
         return Subcategory.validate(category, subcategory);
     }
 
+    /* not used
     private String currentUserName() {
         return userService.currentUserNameElseNobody();
-    }
+    }*/
 
     @Collection
     @CollectionLayout(defaultView = "table")
diff --git a/extensions/core/excel/integtests/src/test/java/org/apache/causeway/extensions/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java b/extensions/core/excel/integtests/src/test/java/org/apache/causeway/extensions/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java
index d8b25f6ccf..0ad5548dc3 100644
--- a/extensions/core/excel/integtests/src/test/java/org/apache/causeway/extensions/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java
+++ b/extensions/core/excel/integtests/src/test/java/org/apache/causeway/extensions/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java
@@ -42,6 +42,7 @@ import org.apache.causeway.extensions.excel.fixtures.demoapp.demomodule.fixtures
 import org.apache.causeway.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
 import org.apache.causeway.extensions.excel.integtests.ExcelModuleIntegTestAbstract;
 
+@SuppressWarnings("unused")
 public class ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest extends ExcelModuleIntegTestAbstract {
 
     @BeforeEach
@@ -105,7 +106,7 @@ public class ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest extends ExcelMod
     private static final Matcher<? super byte[]> lengthWithinPercentage(final byte[] expectedBytes, final int percentage) {
         return new TypeSafeMatcher<byte[]>() {
             @Override
-            protected boolean matchesSafely(byte[] item) {
+            protected boolean matchesSafely(final byte[] item) {
                 final double lower = expectedBytes.length * (100 - percentage) / 100;
                 final double upper = expectedBytes.length * (100 + percentage) / 100;
                 final int actualLength = item.length;
@@ -113,7 +114,7 @@ public class ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest extends ExcelMod
             }
 
             @Override
-            public void describeTo(Description description) {
+            public void describeTo(final Description description) {
                 description.appendText("Byte array with length within " + percentage + "% of expected length (" + expectedBytes.length + " bytes)");
             }
         };
diff --git a/extensions/core/executionoutbox/applib/src/main/java/org/apache/causeway/extensions/executionoutbox/applib/app/ExecutionOutboxMenu.java b/extensions/core/executionoutbox/applib/src/main/java/org/apache/causeway/extensions/executionoutbox/applib/app/ExecutionOutboxMenu.java
index d319991081..4da4887f91 100644
--- a/extensions/core/executionoutbox/applib/src/main/java/org/apache/causeway/extensions/executionoutbox/applib/app/ExecutionOutboxMenu.java
+++ b/extensions/core/executionoutbox/applib/src/main/java/org/apache/causeway/extensions/executionoutbox/applib/app/ExecutionOutboxMenu.java
@@ -18,8 +18,6 @@
  */
 package org.apache.causeway.extensions.executionoutbox.applib.app;
 
-import java.time.LocalDate;
-import java.time.ZoneId;
 import java.util.List;
 
 import javax.inject.Inject;
@@ -80,10 +78,9 @@ public class ExecutionOutboxMenu {
     final ExecutionOutboxEntryRepository<? extends ExecutionOutboxEntry> executionOutboxEntryRepository;
     final ClockService clockService;
 
-
-
+    /* not used
     private LocalDate now() {
         return clockService.getClock().nowAsLocalDate(ZoneId.systemDefault());
-    }
+    } */
 }
 
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/CalendaredCollectionAbstract.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/CalendaredCollectionAbstract.java
index 024218089c..015d420759 100644
--- a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/CalendaredCollectionAbstract.java
+++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/CalendaredCollectionAbstract.java
@@ -58,13 +58,13 @@ extends PanelAbstract<DataTableModel, EntityCollectionModel> {
 
     public CalendaredCollectionAbstract(final String id, final EntityCollectionModel model) {
         super(id, model);
-
         buildGui();
     }
 
+    /* not used
     private void buildGuiDebug() {
         _Sample.buildCalendar(this, ID_FULL_CALENDAR);
-    }
+    } */
 
     private void buildGui() {
 
diff --git a/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/causeway/extensions/pdfjs/metamodel/facet/PdfJsViewerFacet.java b/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/causeway/extensions/pdfjs/metamodel/facet/PdfJsViewerFacet.java
index 108c4cc9b0..513d878fee 100644
--- a/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/causeway/extensions/pdfjs/metamodel/facet/PdfJsViewerFacet.java
+++ b/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/causeway/extensions/pdfjs/metamodel/facet/PdfJsViewerFacet.java
@@ -19,7 +19,6 @@
 package org.apache.causeway.extensions.pdfjs.metamodel.facet;
 
 import org.apache.causeway.core.metamodel.facetapi.Facet;
-import org.apache.causeway.core.metamodel.facetapi.FacetWithAttributes;
 import org.apache.causeway.extensions.pdfjs.applib.config.PdfJsConfig;
 import org.apache.causeway.extensions.pdfjs.applib.spi.PdfJsViewerAdvisor;
 
diff --git a/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/causeway/extensions/pdfjs/metamodel/facet/PdfJsViewerFacetFromAnnotation.java b/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/causeway/extensions/pdfjs/metamodel/facet/PdfJsViewerFacetFromAnnotation.java
index c09d0a15cd..568597ef87 100644
--- a/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/causeway/extensions/pdfjs/metamodel/facet/PdfJsViewerFacetFromAnnotation.java
+++ b/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/causeway/extensions/pdfjs/metamodel/facet/PdfJsViewerFacetFromAnnotation.java
@@ -23,7 +23,6 @@ import java.util.function.BiConsumer;
 
 import javax.inject.Inject;
 
-import org.apache.causeway.applib.services.user.UserService;
 import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
 import org.apache.causeway.core.metamodel.facetapi.FacetWithAttributes;
 import org.apache.causeway.extensions.pdfjs.applib.annotations.PdfJsViewer;
diff --git a/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/causeway/extensions/pdfjs/metamodel/facet/PdfJsViewerFacetFromAnnotationFactory.java b/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/causeway/extensions/pdfjs/metamodel/facet/PdfJsViewerFacetFromAnnotationFactory.java
index 3e8301bdc9..52a2855b8b 100644
--- a/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/causeway/extensions/pdfjs/metamodel/facet/PdfJsViewerFacetFromAnnotationFactory.java
+++ b/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/causeway/extensions/pdfjs/metamodel/facet/PdfJsViewerFacetFromAnnotationFactory.java
@@ -20,8 +20,6 @@ package org.apache.causeway.extensions.pdfjs.metamodel.facet;
 
 import javax.inject.Inject;
 
-import org.apache.causeway.applib.annotation.Property;
-import org.apache.causeway.core.metamodel.specloader.validator.ValidationFailureUtils;
 import org.springframework.stereotype.Component;
 
 import org.apache.causeway.core.metamodel.context.MetaModelContext;
@@ -30,6 +28,7 @@ import org.apache.causeway.core.metamodel.facetapi.FeatureType;
 import org.apache.causeway.core.metamodel.facetapi.MetaModelRefiner;
 import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.causeway.core.metamodel.progmodel.ProgrammingModel;
+import org.apache.causeway.core.metamodel.specloader.validator.ValidationFailureUtils;
 import org.apache.causeway.extensions.pdfjs.applib.annotations.PdfJsViewer;
 
 import lombok.val;
diff --git a/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_MixinDomainWithPdfJsViewer_IntegTest.java b/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_MixinDomainWithPdfJsViewer_IntegTest.java
index 30bfb3c40a..d88ee72415 100644
--- a/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_MixinDomainWithPdfJsViewer_IntegTest.java
+++ b/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_MixinDomainWithPdfJsViewer_IntegTest.java
@@ -18,8 +18,6 @@
  */
 package org.apache.causeway.extensions.pdfjs.metamodel;
 
-import org.apache.causeway.extensions.pdfjs.applib.spi.PdfJsViewerAdvisor;
-import org.apache.causeway.extensions.pdfjs.metamodel.domains.mixin.MixinDomain;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -28,6 +26,8 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Import;
 import org.springframework.test.context.ActiveProfiles;
 
+import org.apache.causeway.extensions.pdfjs.metamodel.domains.mixin.MixinDomain;
+
 @SpringBootTest(
         classes = {PdfjsViewer_MixinDomainWithPdfJsViewer_IntegTest.AppManifest.class},
         properties = {
@@ -53,6 +53,7 @@ public class PdfjsViewer_MixinDomainWithPdfJsViewer_IntegTest extends PdfjsViewe
         return MixinDomain.class;
     }
 
+    @Override
     @Test
     void dump_facets() {
         super.dump_facets();
diff --git a/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_PropDomain_IntegTest.java b/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_PropDomain_IntegTest.java
index 591213bfd8..0c1d9418ee 100644
--- a/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_PropDomain_IntegTest.java
+++ b/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_PropDomain_IntegTest.java
@@ -18,8 +18,6 @@
  */
 package org.apache.causeway.extensions.pdfjs.metamodel;
 
-import org.apache.causeway.extensions.pdfjs.metamodel.domains.mixin.MixinDomain;
-import org.apache.causeway.extensions.pdfjs.metamodel.domains.prop.PropDomain;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -28,6 +26,8 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Import;
 import org.springframework.test.context.ActiveProfiles;
 
+import org.apache.causeway.extensions.pdfjs.metamodel.domains.prop.PropDomain;
+
 @SpringBootTest(
         classes = {PdfjsViewer_PropDomain_IntegTest.AppManifest.class},
         properties = {
@@ -51,6 +51,7 @@ public class PdfjsViewer_PropDomain_IntegTest extends PdfjsViewer_Abstract_Integ
         return PropDomain.class;
     }
 
+    @Override
     @Test
     void dump_facets() {
         super.dump_facets();
diff --git a/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/domains/mixin/SomeViewModel_pdf.java b/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/domains/mixin/SomeViewModel_pdf.java
index 1794daa4d4..781fd5a474 100644
--- a/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/domains/mixin/SomeViewModel_pdf.java
+++ b/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/domains/mixin/SomeViewModel_pdf.java
@@ -18,20 +18,19 @@
  */
 package org.apache.causeway.extensions.pdfjs.metamodel.domains.mixin;
 
-import lombok.RequiredArgsConstructor;
-
-import org.apache.causeway.applib.annotation.DomainObject;
-import org.apache.causeway.applib.annotation.Nature;
 import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.value.Blob;
 import org.apache.causeway.extensions.pdfjs.applib.annotations.PdfJsViewer;
 import org.apache.causeway.extensions.pdfjs.applib.config.Scale;
 
+import lombok.RequiredArgsConstructor;
+
 @Property
 @PdfJsViewer(initialScale = Scale._0_75, initialHeight = 1000, initialPageNum = 2)
 @RequiredArgsConstructor
 public class SomeViewModel_pdf {
 
+    @SuppressWarnings("unused")
     private final SomeViewModel someViewModel;
 
     public Blob prop() {
diff --git a/regressiontests/stable-cmdexecauditsess/generic/src/main/java/org/apache/causeway/regressiontests/cmdexecauditsess/generic/integtest/CmdExecAuditSessLog_IntegTestAbstract.java b/regressiontests/stable-cmdexecauditsess/generic/src/main/java/org/apache/causeway/regressiontests/cmdexecauditsess/generic/integtest/CmdExecAuditSessLog_IntegTestAbstract.java
index 9525e9d1e7..d82330a96e 100644
--- a/regressiontests/stable-cmdexecauditsess/generic/src/main/java/org/apache/causeway/regressiontests/cmdexecauditsess/generic/integtest/CmdExecAuditSessLog_IntegTestAbstract.java
+++ b/regressiontests/stable-cmdexecauditsess/generic/src/main/java/org/apache/causeway/regressiontests/cmdexecauditsess/generic/integtest/CmdExecAuditSessLog_IntegTestAbstract.java
@@ -32,9 +32,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 import org.apache.causeway.applib.mixins.system.DomainChangeRecord;
 import org.apache.causeway.applib.services.bookmark.Bookmark;
 import org.apache.causeway.applib.services.bookmark.BookmarkService;
-import org.apache.causeway.applib.services.clock.ClockService;
 import org.apache.causeway.applib.services.iactnlayer.InteractionService;
-import org.apache.causeway.applib.services.sudo.SudoService;
 import org.apache.causeway.applib.services.wrapper.WrapperFactory;
 import org.apache.causeway.core.config.beans.CausewayBeanTypeRegistry;
 import org.apache.causeway.core.config.presets.CausewayPresets;
@@ -108,7 +106,7 @@ public abstract class CmdExecAuditSessLog_IntegTestAbstract extends CausewayInte
 
     }
 
-    private void assertEntityPublishingDisabledFor(Class<?> entityClass) {
+    private void assertEntityPublishingDisabledFor(final Class<?> entityClass) {
         val objectSpecification = specificationLoader.loadSpecification(entityClass);
         EntityChangePublishingFacet facet = objectSpecification.getFacet(EntityChangePublishingFacet.class);
         Assertions.assertThat(facet)
diff --git a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CustomContextWithNoPermissionChecksTest.java b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CustomContextWithNoPermissionChecksTest.java
index 36df5c6d34..973d3a5123 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CustomContextWithNoPermissionChecksTest.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CustomContextWithNoPermissionChecksTest.java
@@ -18,31 +18,24 @@
  */
 package org.apache.causeway.testdomain.interact;
 
-import lombok.val;
+import javax.inject.Inject;
 
-import java.time.Duration;
-import java.time.LocalDateTime;
-import java.util.Locale;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.TestPropertySource;
 
-import javax.inject.Inject;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import org.apache.causeway.applib.services.iactnlayer.InteractionService;
 import org.apache.causeway.core.config.presets.CausewayPresets;
-import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants.DateTimeFormat;
 import org.apache.causeway.testdomain.conf.Configuration_headless;
 import org.apache.causeway.testdomain.model.interaction.Configuration_usingInteractionDomain;
 import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
 import org.apache.causeway.testing.integtestsupport.applib.NoPermissionChecks;
-import org.apache.causeway.testing.integtestsupport.applib.annotation.InteractAs;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.TestPropertySource;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import lombok.val;
 
 @SpringBootTest(
         classes = {
@@ -68,6 +61,4 @@ class CustomContextWithNoPermissionChecksTest extends CausewayIntegrationTestAbs
         assertThat(iaCtx.getUser().hasSudoAccessAllRole()).isTrue();
     }
 
-
-
 }
diff --git a/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_Counter_IntegTest.java b/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_Counter_IntegTest.java
index 5ac35c86d3..14494f52fa 100644
--- a/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_Counter_IntegTest.java
+++ b/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_Counter_IntegTest.java
@@ -20,9 +20,7 @@
 package org.apache.causeway.regressiontests.layouts.integtest;
 
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import javax.inject.Inject;
@@ -49,12 +47,10 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import org.apache.causeway.applib.CausewayModuleApplibMixins;
 import org.apache.causeway.applib.annotation.ActionLayout;
-import org.apache.causeway.applib.id.LogicalType;
 import org.apache.causeway.applib.layout.LayoutConstants;
 import org.apache.causeway.applib.services.bookmark.Bookmark;
 import org.apache.causeway.applib.services.bookmark.BookmarkService;
 import org.apache.causeway.applib.services.iactnlayer.InteractionService;
-import org.apache.causeway.applib.services.metamodel.Config;
 import org.apache.causeway.applib.services.metamodel.MetaModelService;
 import org.apache.causeway.core.config.beans.CausewayBeanTypeRegistry;
 import org.apache.causeway.core.config.presets.CausewayPresets;
@@ -68,10 +64,6 @@ import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
 import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
 import org.apache.causeway.regressiontests.layouts.integtest.model.Counter;
 import org.apache.causeway.regressiontests.layouts.integtest.model.LayoutTestDomainModel;
-import org.apache.causeway.schema.metamodel.v2.Action;
-import org.apache.causeway.schema.metamodel.v2.DomainClassDto;
-import org.apache.causeway.schema.metamodel.v2.FacetAttr;
-import org.apache.causeway.schema.metamodel.v2.MetamodelDto;
 import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
 import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
 import org.apache.causeway.viewer.wicket.applib.CausewayModuleViewerWicketApplibMixins;
@@ -730,7 +722,9 @@ public class Layout_Counter_IntegTest extends CausewayIntegrationTestAbstract {
         val action = lookupAction("clearHints");
 
         // when, then
+        /* not used
         List<Facet> facets = action.getFacetHolder().streamFacets().collect(Collectors.toList());
+        */
 
         val actionPositionFacet = action.getFacet(ActionPositionFacet.class);
         assertThat(actionPositionFacet)
@@ -755,7 +749,7 @@ public class Layout_Counter_IntegTest extends CausewayIntegrationTestAbstract {
         return objectSpecification.streamAnyActions(MixedIn.INCLUDED).filter(x -> x.getId().equals(id)).findFirst().orElseThrow();
     }
 
-
+    /* not used
     private void extracted(final Class<?> cls) {
         LogicalType logicalType = metaModelService.lookupLogicalTypeByClass(cls).orElseThrow();
         MetamodelDto metamodelDto = metaModelService.exportMetaModel(Config.builder().build().withNamespacePrefix("layouts.test."));
@@ -766,7 +760,7 @@ public class Layout_Counter_IntegTest extends CausewayIntegrationTestAbstract {
         Map<String, org.apache.causeway.schema.metamodel.v2.Facet> facetById = facets.stream().collect(Collectors.toMap(org.apache.causeway.schema.metamodel.v2.Facet::getId, Function.identity()));
         Map<String, String> facetAttrByName = facetById.get(LayoutGroupFacet.class.getCanonicalName()).getAttr().stream().collect(Collectors.toMap(FacetAttr::getName, FacetAttr::getValue));
         facetAttrByName.get("Name");
-    }
+    } */
 
 
     @Inject InteractionService interactionService;
diff --git a/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_SimpleObject_IntegTest.java b/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_SimpleObject_IntegTest.java
index ace59e87c9..7431117e59 100644
--- a/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_SimpleObject_IntegTest.java
+++ b/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_SimpleObject_IntegTest.java
@@ -20,8 +20,6 @@
 package org.apache.causeway.regressiontests.layouts.integtest;
 
 import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import javax.inject.Inject;
@@ -41,11 +39,9 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import org.apache.causeway.applib.CausewayModuleApplibMixins;
 import org.apache.causeway.applib.annotation.ActionLayout;
-import org.apache.causeway.applib.id.LogicalType;
 import org.apache.causeway.applib.layout.LayoutConstants;
 import org.apache.causeway.applib.services.bookmark.BookmarkService;
 import org.apache.causeway.applib.services.iactnlayer.InteractionService;
-import org.apache.causeway.applib.services.metamodel.Config;
 import org.apache.causeway.applib.services.metamodel.MetaModelService;
 import org.apache.causeway.core.config.beans.CausewayBeanTypeRegistry;
 import org.apache.causeway.core.config.presets.CausewayPresets;
@@ -59,10 +55,6 @@ import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
 import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
 import org.apache.causeway.regressiontests.layouts.integtest.model.LayoutTestDomainModel;
 import org.apache.causeway.regressiontests.layouts.integtest.model.SimpleObject;
-import org.apache.causeway.schema.metamodel.v2.Action;
-import org.apache.causeway.schema.metamodel.v2.DomainClassDto;
-import org.apache.causeway.schema.metamodel.v2.FacetAttr;
-import org.apache.causeway.schema.metamodel.v2.MetamodelDto;
 import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
 import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
 import org.apache.causeway.viewer.wicket.applib.CausewayModuleViewerWicketApplibMixins;
@@ -131,7 +123,9 @@ public class Layout_SimpleObject_IntegTest extends CausewayIntegrationTestAbstra
         val action = lookupAction("clearHints");
 
         // when, then
+        /* not used
         List<Facet> facets = action.getFacetHolder().streamFacets().collect(Collectors.toList());
+        */
 
         val actionPositionFacet = action.getFacet(ActionPositionFacet.class);
         assertThat(actionPositionFacet)
@@ -152,11 +146,13 @@ public class Layout_SimpleObject_IntegTest extends CausewayIntegrationTestAbstra
 
     private ObjectAction lookupAction(final String id) {
         val objectSpecification = specificationLoader.loadSpecification(SimpleObject.class);
+        /* not used
         List<ObjectAction> objectActions = objectSpecification.streamAnyActions(MixedIn.INCLUDED).collect(Collectors.toList());
+        */
         return objectSpecification.streamAnyActions(MixedIn.INCLUDED).filter(x -> x.getId().equals(id)).findFirst().orElseThrow();
     }
 
-
+    /* not used
     private void extracted(final Class<?> cls) {
         LogicalType logicalType = metaModelService.lookupLogicalTypeByClass(cls).orElseThrow();
         MetamodelDto metamodelDto = metaModelService.exportMetaModel(Config.builder().build().withNamespacePrefix("layouts.test."));
@@ -167,7 +163,7 @@ public class Layout_SimpleObject_IntegTest extends CausewayIntegrationTestAbstra
         Map<String, org.apache.causeway.schema.metamodel.v2.Facet> facetById = facets.stream().collect(Collectors.toMap(org.apache.causeway.schema.metamodel.v2.Facet::getId, Function.identity()));
         Map<String, String> facetAttrByName = facetById.get(LayoutGroupFacet.class.getCanonicalName()).getAttr().stream().collect(Collectors.toMap(FacetAttr::getName, FacetAttr::getValue));
         facetAttrByName.get("Name");
-    }
+    } */
 
 
     @Inject InteractionService interactionService;
diff --git a/security/keycloak/src/main/java/org/apache/causeway/security/keycloak/services/KeycloakOauth2UserService.java b/security/keycloak/src/main/java/org/apache/causeway/security/keycloak/services/KeycloakOauth2UserService.java
index 8fd40dc317..2363ff7d96 100644
--- a/security/keycloak/src/main/java/org/apache/causeway/security/keycloak/services/KeycloakOauth2UserService.java
+++ b/security/keycloak/src/main/java/org/apache/causeway/security/keycloak/services/KeycloakOauth2UserService.java
@@ -43,7 +43,6 @@ import org.springframework.security.oauth2.core.oidc.user.OidcUser;
 import org.springframework.security.oauth2.jwt.Jwt;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
 import org.springframework.security.oauth2.jwt.JwtException;
-import org.springframework.util.CollectionUtils;
 
 import org.apache.causeway.commons.internal.base._Casts;
 import org.apache.causeway.commons.internal.base._NullSafe;
diff --git a/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/modules/ModulesArchTests.java b/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/modules/ModulesArchTests.java
index 386b4ab376..d2c0f2d65f 100644
--- a/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/modules/ModulesArchTests.java
+++ b/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/modules/ModulesArchTests.java
@@ -85,6 +85,7 @@ public class ModulesArchTests {
         final List<String> local;
         final List<String> referencing;
 
+        @Override
         public String getName() {
             return name();
         }
@@ -99,10 +100,12 @@ public class ModulesArchTests {
             return referencing;
         }
 
+        /* not used
         private static String[] asArray(List<String> list) {
             return list != null ?
                     list.toArray(new String[] {}) : null;
-        }
+        } */
+
     }
 
 }
diff --git a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/CausewayIntegrationGwtAbstractWithFixtures.java b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/CausewayIntegrationGwtAbstractWithFixtures.java
index a320b7f270..b6a5fd7b92 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/CausewayIntegrationGwtAbstractWithFixtures.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/CausewayIntegrationGwtAbstractWithFixtures.java
@@ -20,15 +20,15 @@ package org.apache.causeway.testing.fixtures.applib;
 
 import javax.inject.Inject;
 
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+
 import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
 import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScripts;
 import org.apache.causeway.testing.fixtures.applib.modules.ModuleWithFixturesService;
 import org.apache.causeway.testing.fixtures.applib.personas.BuilderScriptAbstract;
 import org.apache.causeway.testing.fixtures.applib.personas.PersonaWithBuilderScript;
 import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationGwtAbstract;
-import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
 
 /**
  * @since 2.x {@index}
diff --git a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScripts.java b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScripts.java
index e89160e3fb..246c90f8a8 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScripts.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScripts.java
@@ -53,7 +53,6 @@ import org.apache.causeway.applib.services.registry.ServiceRegistry;
 import org.apache.causeway.applib.services.repository.RepositoryService;
 import org.apache.causeway.applib.services.title.TitleService;
 import org.apache.causeway.applib.services.xactn.TransactionService;
-import org.apache.causeway.commons.internal.base._Casts;
 import org.apache.causeway.commons.internal.collections._Maps;
 import org.apache.causeway.commons.internal.exceptions._Exceptions;
 import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib;
diff --git a/tooling/cli/src/main/java/org/apache/causeway/tooling/cli/projdoc/ProjectDocModel.java b/tooling/cli/src/main/java/org/apache/causeway/tooling/cli/projdoc/ProjectDocModel.java
index 4aacc010ba..9f989cfb61 100644
--- a/tooling/cli/src/main/java/org/apache/causeway/tooling/cli/projdoc/ProjectDocModel.java
+++ b/tooling/cli/src/main/java/org/apache/causeway/tooling/cli/projdoc/ProjectDocModel.java
@@ -481,9 +481,10 @@ public class ProjectDocModel {
         return String.format(".%s\n****\n%s\n****\n\n", title, content);
     }
 
+    /* not used
     private static String toAdocListItem(final String element) {
         return String.format("* %s\n", element);
-    }
+    } */
 
     private static String toAdocCompactListItem(final String element) {
         return String.format("%s +\n", element);
diff --git a/tooling/metaprog/src/test/java/org/apache/causeway/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplateTest.java b/tooling/metaprog/src/test/java/org/apache/causeway/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplateTest.java
index cd8f60096a..3a44e3e47c 100644
--- a/tooling/metaprog/src/test/java/org/apache/causeway/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplateTest.java
+++ b/tooling/metaprog/src/test/java/org/apache/causeway/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplateTest.java
@@ -25,13 +25,11 @@ import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.Objects;
-import java.util.Set;
 
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 
 import org.apache.causeway.commons.collections.Can;
@@ -46,6 +44,7 @@ import lombok.SneakyThrows;
 import lombok.val;
 import lombok.extern.log4j.Log4j2;
 
+@SuppressWarnings("unused")
 @Log4j2
 class ValueTypeGenTemplateTest {
 
@@ -107,6 +106,7 @@ class ValueTypeGenTemplateTest {
         return new File(outputRootDir, subfolder);
     }
 
+    /* not used
     private void assertFileSetEquals(
             final Set<File> setA, final File rootA,
             final Set<File> setB, final File rootB) {
@@ -117,10 +117,9 @@ class ValueTypeGenTemplateTest {
                 Can.ofCollection(setB)
                 .map(FileUtils.realtiveFileName(rootB))
                 .sorted(Comparator.naturalOrder()));
-    }
+    }*/
 
 
-    @SuppressWarnings("unused")
     private void copyFiles(final Collection<File> generatedFiles, final File sourceRoot, final File destinationRoot) {
         generatedFiles.forEach(src->{
             val dest = new File(destinationRoot, FileUtils.realtiveFileName(sourceRoot, src));
@@ -130,7 +129,6 @@ class ValueTypeGenTemplateTest {
         });
     }
 
-    @SuppressWarnings("unused")
     private void copyMissingFiles(final Collection<File> generatedFiles, final File sourceRoot, final File destinationRoot) {
         generatedFiles.forEach(src->{
             val dest = new File(destinationRoot, FileUtils.realtiveFileName(sourceRoot, src));
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarFragmentFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarFragmentFactory.java
index 9623c2f574..519910ee4f 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarFragmentFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarFragmentFactory.java
@@ -155,12 +155,13 @@ public class ScalarFragmentFactory {
         @Getter private final String fragmentId;
         @Getter private final String containerId = "container-fieldFrame";
 
+        /* not used
         private boolean isMatching(final @Nullable MarkupContainer container) {
             if(container instanceof Fragment) {
                 return fragmentId.equals(((Fragment)container).getAssociatedMarkupId());
             }
             return false;
-        }
+        }*/
         public abstract RepeatingView createButtonContainer(final MarkupContainer container);
     }
 
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
index e6591b21a1..c99bba35c1 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
@@ -28,7 +28,6 @@ import org.apache.wicket.model.Model;
 
 import org.apache.causeway.applib.annotation.TableDecorator;
 import org.apache.causeway.core.metamodel.interactions.managed.nonscalar.DataTableModel;
-import org.apache.causeway.core.metamodel.util.Facets;
 import org.apache.causeway.viewer.commons.model.components.UiComponentType;
 import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel;
 import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModelStandalone;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/WktDecorators.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/WktDecorators.java
index 0e32f8dfd9..2acb1c8888 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/WktDecorators.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/WktDecorators.java
@@ -44,7 +44,6 @@ import org.apache.causeway.viewer.wicket.model.links.LinkAndLabel;
 import org.apache.causeway.viewer.wicket.ui.components.actionmenu.CssClassFaBehavior;
 import org.apache.causeway.viewer.wicket.ui.util.BootstrapConstants.ButtonSemantics;
 
-import de.agilecoders.wicket.core.markup.html.bootstrap.behavior.CssClassNameRemover;
 import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig.Placement;
 import de.agilecoders.wicket.extensions.markup.html.bootstrap.confirmation.ConfirmationConfig;
 import lombok.Getter;