You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/10/25 08:09:27 UTC
[isis] branch master updated: ISIS-3142: batch organize imports: extension sources
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 24e3fd01a9 ISIS-3142: batch organize imports: extension sources
24e3fd01a9 is described below
commit 24e3fd01a95f51a24861bc909e100ffaea6ce2c5
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Oct 25 10:09:18 2022 +0200
ISIS-3142: batch organize imports: extension sources
---
.../applib/CausewayModuleExtCommandLogApplib.java | 5 +++--
.../commandlog/applib/app/CommandLogMenu.java | 18 ++++++++++++++----
.../commandlog/applib/dom/CommandLogEntry.java | 11 ++++++-----
.../integtest/CommandLog_IntegTestAbstract.java | 13 +++++++------
.../CausewayModuleExtCommandLogPersistenceJdo.java | 1 +
.../jdo/integtests/CommandLog_IntegTest.java | 3 +--
.../CausewayModuleExtCommandLogPersistenceJpa.java | 1 +
.../commandlog/jpa/dom/CommandLogEntry.java | 3 +--
.../dom/CommandLogEntryPK_Stringifier_Test.java | 1 -
.../jpa/integtests/CommandLog_IntegTest.java | 3 +--
.../commandlog/jpa/integtests/model/Counter.java | 3 ---
.../excel/applib/CausewayModuleExtExcelApplib.java | 3 ++-
.../excel/applib/service/ExcelServiceDefault.java | 10 +++++-----
.../excel/applib/service/_ExcelConverter.java | 12 ++++++------
.../excel/applib/service/_ExcelServiceHelper.java | 2 +-
.../excel/applib/util/ExcelFileBlobConverter.java | 6 +++---
.../extensions/excel/applib/util/PivotUtils.java | 3 ++-
.../extensions/excel/applib/util/SheetPivoter.java | 5 +++--
.../excel/applib/util/AnnotationListTest.java | 2 --
.../excel/applib/util/AnnotationTripletTest.java | 1 -
.../excel/applib/util/PivotUtilsTest.java | 1 -
.../excel/applib/util/SheetPivoterTest.java | 1 -
.../fixtures/CausewayModuleExtExcelFixtures.java | 4 ++--
.../BulkUpdateManagerForDemoToDoItem.java | 6 +++---
.../demotodoitem/DemoToDoItemRowHandler.java | 1 -
.../demotodoitem/DemoToDoItemRowHandler2.java | 1 -
.../ExcelUploadRowHandler4ToDoItem.java | 1 -
.../ExcelUploadServiceForDemoToDoItem.java | 1 -
.../DemoFixture_extending_ExcelFixture2.java | 2 +-
.../DemoToDoItem_create_usingExcelFixture.java | 5 ++---
.../DemoToDoItem_recreate_usingExcelFixture.java | 1 -
.../ExcelDemoToDoItem_recreate5_for.java | 1 -
.../fixturescripts/ExcelDemoToDoItem_tearDown.java | 1 -
.../integtests/ExcelModuleIntegTestAbstract.java | 4 +---
.../ExcelModuleDemoMetaDataEnabled_IntegTest.java | 8 +++-----
...uleDemoToDoItemBulkUpdateManager_IntegTest.java | 18 +++++++++---------
.../ExcelModuleDemoUploadService_IntegTest.java | 10 ++++------
.../testing/CausewayModuleExtExcelTesting.java | 3 ++-
.../extensions/excel/testing/ExcelFixture.java | 12 +++++-------
.../extensions/excel/testing/ExcelFixture2.java | 9 ++++-----
.../excel/testing/FixtureAwareRowHandler.java | 1 -
.../CausewayModuleExtExecutionLogApplib.java | 6 +++---
.../executionlog/applib/app/ExecutionLogMenu.java | 13 +++++++++++--
.../executionlog/applib/dom/ExecutionLogEntry.java | 5 +++--
...ausewayModuleExtExecutionLogPersistenceJdo.java | 1 +
.../executionlog/jdo/dom/ExecutionLogEntry.java | 2 +-
.../jdo/integtests/ExecutionLog_IntegTest.java | 3 +--
...ausewayModuleExtExecutionLogPersistenceJpa.java | 1 +
.../executionlog/jpa/dom/ExecutionLogEntry.java | 2 +-
.../executionlog/jpa/dom/ExecutionLogEntryPK.java | 2 +-
.../jpa/integtests/ExecutionLog_IntegTest.java | 3 +--
.../executionlog/jpa/integtests/model/Counter.java | 3 ---
.../CausewayModuleExtExecutionOutboxApplib.java | 7 +++----
.../applib/dom/ExecutionOutboxEntry.java | 5 +++--
.../ExecutionOutbox_IntegTestAbstract.java | 1 -
...ewayModuleExtExecutionOutboxPersistenceJdo.java | 1 +
.../jdo/dom/ExecutionOutboxEntry.java | 2 +-
.../jdo/integtests/ExecutionOutbox_IntegTest.java | 3 +--
...ewayModuleExtExecutionOutboxPersistenceJpa.java | 1 +
.../jpa/dom/ExecutionOutboxEntry.java | 3 +--
.../jpa/integtests/ExecutionOutbox_IntegTest.java | 3 +--
.../CausewayModuleExtExecutionRestClient.java | 3 ++-
...ausewayModuleExtExecutionRepublisherApplib.java | 5 ++---
.../ExecutionLogEntry_copyToOutbox.java | 1 -
.../applib/CausewayModuleExtAuditTrailApplib.java | 5 +++--
.../audittrail/applib/app/AuditTrailMenu.java | 9 ++++++++-
.../audittrail/applib/dom/AuditTrailEntry.java | 7 ++++---
.../integtests/AuditTrail_IntegTestAbstract.java | 11 ++++++-----
.../applib/integtests/model/CounterRepository.java | 1 -
.../CausewayModuleExtAuditTrailPersistenceJdo.java | 5 +++--
.../audittrail/jdo/dom/AuditTrailEntry.java | 1 -
.../jdo/integtests/AuditTrail_IntegTest.java | 17 +++++++++--------
.../CausewayModuleExtAuditTrailPersistenceJpa.java | 7 ++++---
.../audittrail/jpa/dom/AuditTrailEntry.java | 3 ---
.../jpa/integtests/AuditTrail_IntegTest.java | 19 ++++++++++---------
.../applib/CausewayModuleExtSecmanApplib.java | 6 +++---
.../feature/api/ApplicationFeatureChoices.java | 5 ++---
.../permission/dom/ApplicationPermission.java | 6 +++---
.../permission/dom/ApplicationPermissionMode.java | 3 +--
.../ApplicationPermissionRepositoryAbstract.java | 16 ++++++++--------
.../permission/dom/ApplicationPermissionRule.java | 3 +--
.../dom/ApplicationPermissionValueSet.java | 4 ++--
.../dom/ApplicationRoleRepositoryAbstract.java | 4 ++--
.../role/dom/mixins/ApplicationRole_addUser.java | 8 ++++----
.../mixins/ApplicationRole_removePermissions.java | 3 +--
.../dom/mixins/ApplicationRole_removeUsers.java | 12 ++++++------
.../AbstractRoleAndPermissionsFixtureScript.java | 3 +--
.../seed/CausewayAppFeatureRoleAndPermissions.java | 6 +++---
.../CausewayConfigurationRoleAndPermissions.java | 6 +++---
.../CausewayExtAuditTrailRoleAndPermissions.java | 2 +-
.../CausewayExtCommandLogRoleAndPermissions.java | 2 +-
.../CausewayExtExecutionLogRoleAndPermissions.java | 2 +-
...usewayExtExecutionOutboxRoleAndPermissions.java | 2 +-
.../CausewayExtH2ConsoleRoleAndPermissions.java | 2 +-
.../CausewayExtSecmanAdminRoleAndPermissions.java | 3 +--
...ewayExtSecmanRegularUserRoleAndPermissions.java | 4 +---
.../CausewayExtSessionLogRoleAndPermissions.java | 2 +-
...yPersistenceJdoMetaModelRoleAndPermissions.java | 2 +-
.../CausewaySudoImpersonateRoleAndPermissions.java | 4 ++--
...werRestfulObjectsSwaggerRoleAndPermissions.java | 2 +-
.../applib/seed/SeedSecurityModuleService.java | 1 -
.../scripts/SeedUsersAndRolesFixtureScript.java | 1 -
.../dom/ApplicationTenancyRepositoryAbstract.java | 6 +++---
.../dom/mixins/ApplicationTenancy_addChild.java | 8 ++++----
.../dom/mixins/ApplicationTenancy_addUser.java | 10 +++++-----
.../fixtures/AbstractTenancyFixtureScript.java | 1 -
.../secman/applib/tenancy/seed/GlobalTenancy.java | 1 -
.../secman/applib/user/dom/ApplicationUser.java | 8 +++-----
.../dom/ApplicationUserRepositoryAbstract.java | 6 +++---
.../user/dom/mixins/ApplicationUser_addRole.java | 8 ++++----
.../dom/mixins/ApplicationUser_removeRoles.java | 10 +++++-----
.../user/dom/mixins/ApplicationUser_timeZone.java | 4 ++--
.../dom/mixins/perms/UserPermissionViewModel.java | 22 +++++++++++-----------
.../AbstractUserAndRolesFixtureScript.java | 5 ++---
.../user/seed/CausewayExtSecmanAdminUser.java | 3 ---
.../secman/applib/util/ApplicationSecurityDto.java | 2 +-
...ationPermissionRepositoryIntegTestAbstract.java | 1 -
.../extensions/secman/applib/mmm/MmmModule.java | 5 +++--
.../mixins/perms/UserPermissionViewModelTest.java | 9 ++++-----
.../shiro/realm/AuthInfoForApplicationUser.java | 5 +++--
.../realm/AuthenticationStrategyForSecMan.java | 1 -
.../realm/CausewayModuleExtSecmanShiroRealm.java | 6 +++---
...lCollectionForApplicationUserOnSingleRealm.java | 3 ++-
.../shiro/realm/PrincipalForApplicationUser.java | 5 +++--
.../secman/delegated/shiro/util/ShiroUtils.java | 3 ++-
...usewayModuleExtSecmanDelegatedSpringOauth2.java | 5 +++--
.../CausewayModuleExtSecmanEncryptionJbcrypt.java | 3 ++-
.../CausewayModuleExtSecmanIntegration.java | 5 +++--
.../integration/authorizor/AuthorizorSecman.java | 2 +-
.../facets/TenantedAuthorizationPostProcessor.java | 2 +-
.../PermissionsEvaluationServiceForSecman.java | 8 ++++----
.../userreg/UserRegistrationServiceForSecman.java | 2 +-
.../jdo/CausewayModuleExtSecmanPersistenceJdo.java | 2 +-
.../jdo/permission/dom/ApplicationPermission.java | 10 +++++-----
.../dom/ApplicationPermissionRepository.java | 3 ++-
.../secman/jdo/role/dom/ApplicationRole.java | 4 ++--
.../jdo/role/dom/ApplicationRoleRepository.java | 3 ++-
.../secman/jdo/tenancy/dom/ApplicationTenancy.java | 4 ++--
.../tenancy/dom/ApplicationTenancyRepository.java | 3 ++-
.../secman/jdo/user/dom/ApplicationUser.java | 6 +++---
.../jdo/user/dom/ApplicationUserRepository.java | 3 ++-
.../extensions/secman/jdo/util/RegexReplacer.java | 3 ++-
.../ApplicationPermissionRepository_IntegTest.java | 3 +--
.../jpa/CausewayModuleExtSecmanPersistenceJpa.java | 1 +
.../jpa/permission/dom/ApplicationPermission.java | 10 +++++-----
.../dom/ApplicationPermissionRepository.java | 3 ++-
.../secman/jpa/role/dom/ApplicationRole.java | 6 +++---
.../jpa/role/dom/ApplicationRoleRepository.java | 3 ++-
.../secman/jpa/tenancy/dom/ApplicationTenancy.java | 4 ++--
.../tenancy/dom/ApplicationTenancyRepository.java | 3 ++-
.../secman/jpa/user/dom/ApplicationUser.java | 8 ++++----
.../jpa/user/dom/ApplicationUserRepository.java | 3 ++-
.../extensions/secman/jpa/util/RegexReplacer.java | 3 ++-
.../ApplicationPermissionRepository_IntegTest.java | 3 +--
.../applib/CausewayModuleExtSessionLogApplib.java | 5 +++--
.../sessionlog/applib/dom/SessionLogEntry.java | 20 +++++++++++++++++---
.../integtests/SessionLogIntegTestAbstract.java | 1 -
.../CausewayModuleExtSessionLogPersistenceJdo.java | 2 +-
.../jdo/integtests/SessionLog_IntegTest.java | 3 +--
.../CausewayModuleExtSessionLogPersistenceJpa.java | 2 +-
.../jpa/integtests/SessionLog_IntegTest.java | 3 +--
.../realm/impl/CausewayLdapRealm.java | 8 ++++----
.../CausewayModuleExtSpringSecurityOAuth2.java | 2 +-
...icationConverterOfOAuth2UserPrincipal_Test.java | 3 ++-
.../cors/impl/CausewayModuleExtCorsImplTest.java | 1 -
.../ui/CausewayModuleExtExcelDownloadWicketUi.java | 3 ++-
.../CollectionContentsAsExcelFactory.java | 1 +
.../CausewayModuleExtFullCalendarApplib.java | 3 ++-
.../applib/value/CalendarEventSemantics.java | 8 ++++----
.../wkt/fullcalendar/AbstractFullCalendar.java | 7 ++++---
.../wkt/fullcalendar/CalendarResponse.java | 3 ++-
.../wkt/fullcalendar/FullCalendar.java | 7 ++++---
.../callback/AbstractAjaxCallback.java | 3 ++-
.../fullcalendar/callback/AbstractCallback.java | 3 ++-
.../callback/AbstractShiftedEventParam.java | 3 ++-
.../callback/DateRangeSelectedCallback.java | 3 ++-
.../callback/EventClickedCallback.java | 5 +++--
.../callback/EventDroppedCallback.java | 5 +++--
.../callback/EventResizedCallback.java | 5 +++--
.../fullcalendar/callback/GetEventsCallback.java | 3 ++-
.../wkt/fullcalendar/callback/View.java | 3 ++-
.../fullcalendar/callback/ViewDisplayCallback.java | 5 +++--
.../fullcalendar/res/FullCalendarCssReference.java | 3 +--
.../res/FullCalendarEventSourceEvents.java | 1 -
.../res/FullCalendarIntegrationJsReference.java | 3 ++-
.../fullcalendar/res/FullCalendarJsReference.java | 3 +--
.../fullcalendar/selector/EventSourceSelector.java | 2 +-
.../wkt/viewer/CalendaredCollectionAbstract.java | 1 -
.../CalendaredCollectionFactoryAbstract.java | 1 +
.../CausewayModuleExtFullCalendarWicketUi.java | 5 +++--
.../wkt/viewer/EventProviderAbstract.java | 4 +---
.../wkt/viewer/FullCalendarWithEventHandling.java | 4 +---
.../fullcalendar/wkt/viewer/_Sample.java | 6 +++---
.../CalendarableCollectionAsFullCalendar.java | 2 --
...alendarableCollectionAsFullCalendarFactory.java | 4 ++--
.../calendarable/CalendarableEventProvider.java | 2 --
.../CalendarEventableCollectionAsFullCalendar.java | 2 --
...arEventableCollectionAsFullCalendarFactory.java | 4 ++--
.../CalendarEventableEventProvider.java | 2 --
.../applib/CausewayModuleExtPdfjsApplibModel.java | 3 ++-
.../pdfjs/applib/config/PdfJsConfig.java | 3 ++-
.../metamodel/CausewayModuleExtPdfjsMetaModel.java | 3 ++-
.../PdfJsViewerFacetFromAnnotationFactory.java | 2 ++
.../wkt/integration/components/PdfJsPanel.java | 8 ++++----
.../wkt/integration/res/PdfJsCmapsReference.java | 6 +++---
.../integration/res/PdfJsIntegrationReference.java | 5 +++--
.../pdfjs/wkt/integration/res/PdfJsReference.java | 6 +++---
.../wkt/integration/res/PdfJsWorkerReference.java | 6 +++---
.../wkt/ui/CausewayModuleExtPdfjsWicketUi.java | 5 +++--
.../pdfjs/wkt/ui/components/PdfJsViewerPanel.java | 4 +---
.../PdfJsViewerPanelComponentFactory.java | 1 +
.../metamodel/CausewayModuleExtSseMetaModel.java | 5 +++--
.../facets/SseAnnotationFacetFactory.java | 1 +
.../metamodel/facets/SseObserveFacetAbstract.java | 1 -
.../sse/wicket/CausewayModuleExtSseWicket.java | 5 +++--
.../markup/ListeningMarkupComponent_observing.java | 5 ++---
.../ListeningMarkupPanelFactoriesForWicket.java | 1 -
.../sse/wicket/services/SseServiceDefault.java | 8 ++++----
.../wicket/webmodule/ServerSentEventsServlet.java | 6 +++---
.../webmodule/WebModuleServerSentEvents.java | 2 +-
.../CausewayModuleExtCommandReplayPrimary.java | 7 ++++---
.../analyser/CommandReplayAnalyserException.java | 2 +-
.../secondary/fetch/CommandFetcher.java | 10 +++++-----
.../secondary/job/SecondaryStatusData.java | 3 ++-
.../secondary/fetch/CommandFetcher_Test.java | 5 ++---
225 files changed, 512 insertions(+), 492 deletions(-)
diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/CausewayModuleExtCommandLogApplib.java b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/CausewayModuleExtCommandLogApplib.java
index dd5b4f0aa8..368b07b936 100644
--- a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/CausewayModuleExtCommandLogApplib.java
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/CausewayModuleExtCommandLogApplib.java
@@ -18,6 +18,9 @@
*/
package org.apache.causeway.extensions.commandlog.applib;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
import org.apache.causeway.core.config.util.SpringProfileUtil;
import org.apache.causeway.extensions.commandlog.applib.app.CommandLogMenu;
import org.apache.causeway.extensions.commandlog.applib.contributions.HasInteractionId_commandLogEntry;
@@ -28,8 +31,6 @@ import org.apache.causeway.extensions.commandlog.applib.dom.mixins.CommandLogEnt
import org.apache.causeway.extensions.commandlog.applib.dom.mixins.CommandLogEntry_openResultObject;
import org.apache.causeway.extensions.commandlog.applib.dom.mixins.CommandLogEntry_siblingCommands;
import org.apache.causeway.extensions.commandlog.applib.subscriber.CommandSubscriberForCommandLog;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
@Configuration
@Import({
diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/app/CommandLogMenu.java b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/app/CommandLogMenu.java
index 05f9546995..28a42bcc64 100644
--- a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/app/CommandLogMenu.java
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/app/CommandLogMenu.java
@@ -18,8 +18,6 @@
*/
package org.apache.causeway.extensions.commandlog.applib.app;
-import lombok.RequiredArgsConstructor;
-
import java.time.LocalDate;
import java.time.ZoneId;
import java.util.List;
@@ -27,12 +25,24 @@ import java.util.List;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.causeway.applib.annotation.*;
+import org.springframework.lang.Nullable;
+
+import org.apache.causeway.applib.annotation.Action;
+import org.apache.causeway.applib.annotation.ActionLayout;
+import org.apache.causeway.applib.annotation.BookmarkPolicy;
+import org.apache.causeway.applib.annotation.DomainService;
+import org.apache.causeway.applib.annotation.DomainServiceLayout;
+import org.apache.causeway.applib.annotation.MemberSupport;
+import org.apache.causeway.applib.annotation.NatureOfService;
+import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.applib.annotation.RestrictTo;
+import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.services.clock.ClockService;
import org.apache.causeway.extensions.commandlog.applib.CausewayModuleExtCommandLogApplib;
import org.apache.causeway.extensions.commandlog.applib.dom.CommandLogEntry;
import org.apache.causeway.extensions.commandlog.applib.dom.CommandLogEntryRepository;
-import org.springframework.lang.Nullable;
+
+import lombok.RequiredArgsConstructor;
/**
* @since 2.0 {@index}
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 ea90a391c4..166854151a 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
@@ -33,11 +33,6 @@ import javax.annotation.Priority;
import javax.inject.Named;
import javax.validation.constraints.Digits;
-import org.apache.causeway.commons.functional.Try;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.base._Temporals;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
-import org.apache.causeway.extensions.commandlog.applib.CausewayModuleExtCommandLogApplib;
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.DomainObject;
@@ -55,6 +50,7 @@ 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.DomainChangeRecord.ChangeType;
import org.apache.causeway.applib.mixins.system.HasInteractionId;
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.command.Command;
@@ -65,6 +61,11 @@ import org.apache.causeway.applib.services.tablecol.TableColumnOrderForCollectio
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._Strings;
+import org.apache.causeway.commons.internal.base._Temporals;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
+import org.apache.causeway.extensions.commandlog.applib.CausewayModuleExtCommandLogApplib;
import org.apache.causeway.schema.cmd.v2.CommandDto;
import org.apache.causeway.schema.cmd.v2.MapDto;
diff --git a/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/integtest/CommandLog_IntegTestAbstract.java b/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/integtest/CommandLog_IntegTestAbstract.java
index aed82ad6a4..55ba9b0da1 100644
--- a/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/integtest/CommandLog_IntegTestAbstract.java
+++ b/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/integtest/CommandLog_IntegTestAbstract.java
@@ -24,6 +24,13 @@ import java.util.UUID;
import javax.inject.Inject;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.causeway.applib.clock.VirtualClock;
import org.apache.causeway.applib.mixins.system.DomainChangeRecord;
import org.apache.causeway.applib.services.bookmark.Bookmark;
@@ -48,12 +55,6 @@ import org.apache.causeway.schema.cmd.v2.ActionDto;
import org.apache.causeway.schema.cmd.v2.CommandDto;
import org.apache.causeway.schema.cmd.v2.PropertyDto;
import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
import lombok.val;
diff --git a/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/commandlog/jdo/CausewayModuleExtCommandLogPersistenceJdo.java b/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/commandlog/jdo/CausewayModuleExtCommandLogPersistenceJdo.java
index fec3ca011c..5d0ce7f1fd 100644
--- a/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/commandlog/jdo/CausewayModuleExtCommandLogPersistenceJdo.java
+++ b/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/commandlog/jdo/CausewayModuleExtCommandLogPersistenceJdo.java
@@ -20,6 +20,7 @@ package org.apache.causeway.extensions.commandlog.jdo;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+
import org.apache.causeway.extensions.commandlog.applib.CausewayModuleExtCommandLogApplib;
import org.apache.causeway.extensions.commandlog.jdo.dom.CommandLogEntry;
import org.apache.causeway.extensions.commandlog.jdo.dom.CommandLogEntryRepository;
diff --git a/extensions/core/commandlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/commandlog/jdo/integtests/CommandLog_IntegTest.java b/extensions/core/commandlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/commandlog/jdo/integtests/CommandLog_IntegTest.java
index 848cfa8abc..2a648b5566 100644
--- a/extensions/core/commandlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/commandlog/jdo/integtests/CommandLog_IntegTest.java
+++ b/extensions/core/commandlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/commandlog/jdo/integtests/CommandLog_IntegTest.java
@@ -28,13 +28,12 @@ import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
import org.apache.causeway.core.config.presets.CausewayPresets;
+import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.extensions.commandlog.applib.integtest.CommandLog_IntegTestAbstract;
import org.apache.causeway.extensions.commandlog.applib.integtest.model.CommandLogTestDomainModel;
import org.apache.causeway.extensions.commandlog.jdo.CausewayModuleExtCommandLogPersistenceJdo;
import org.apache.causeway.extensions.commandlog.jdo.integtests.model.Counter;
import org.apache.causeway.extensions.commandlog.jdo.integtests.model.CounterRepository;
-
-import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
@SpringBootTest(
diff --git a/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/commandlog/jpa/CausewayModuleExtCommandLogPersistenceJpa.java b/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/commandlog/jpa/CausewayModuleExtCommandLogPersistenceJpa.java
index 5e48d2c6a6..681c811a2f 100644
--- a/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/commandlog/jpa/CausewayModuleExtCommandLogPersistenceJpa.java
+++ b/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/commandlog/jpa/CausewayModuleExtCommandLogPersistenceJpa.java
@@ -21,6 +21,7 @@ package org.apache.causeway.extensions.commandlog.jpa;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+
import org.apache.causeway.extensions.commandlog.applib.CausewayModuleExtCommandLogApplib;
import org.apache.causeway.extensions.commandlog.jpa.dom.CommandLogEntry;
import org.apache.causeway.extensions.commandlog.jpa.dom.CommandLogEntryPK;
diff --git a/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/commandlog/jpa/dom/CommandLogEntry.java b/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/commandlog/jpa/dom/CommandLogEntry.java
index 45fe12a666..12787cf61d 100644
--- a/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/commandlog/jpa/dom/CommandLogEntry.java
+++ b/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/commandlog/jpa/dom/CommandLogEntry.java
@@ -46,13 +46,12 @@ import org.apache.causeway.applib.annotation.Editing;
import org.apache.causeway.applib.annotation.Publishing;
import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
import org.apache.causeway.applib.services.bookmark.Bookmark;
+import org.apache.causeway.extensions.commandlog.applib.dom.CommandLogEntry.Nq;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import org.apache.causeway.persistence.jpa.integration.typeconverters.applib.CausewayBookmarkConverter;
import org.apache.causeway.persistence.jpa.integration.typeconverters.schema.v2.CausewayCommandDtoConverter;
import org.apache.causeway.schema.cmd.v2.CommandDto;
-import static org.apache.causeway.extensions.commandlog.jpa.dom.CommandLogEntry.Nq;
-
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
diff --git a/extensions/core/commandlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/commandlog/jpa/dom/CommandLogEntryPK_Stringifier_Test.java b/extensions/core/commandlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/commandlog/jpa/dom/CommandLogEntryPK_Stringifier_Test.java
index 47b51fa43f..7b2430430f 100644
--- a/extensions/core/commandlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/commandlog/jpa/dom/CommandLogEntryPK_Stringifier_Test.java
+++ b/extensions/core/commandlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/commandlog/jpa/dom/CommandLogEntryPK_Stringifier_Test.java
@@ -23,7 +23,6 @@ package org.apache.causeway.extensions.commandlog.jpa.dom;
import java.util.UUID;
import java.util.stream.Stream;
-import org.apache.causeway.extensions.commandlog.jpa.dom.CommandLogEntryPK;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
diff --git a/extensions/core/commandlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/commandlog/jpa/integtests/CommandLog_IntegTest.java b/extensions/core/commandlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/commandlog/jpa/integtests/CommandLog_IntegTest.java
index ec05abfa9d..a7d006b694 100644
--- a/extensions/core/commandlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/commandlog/jpa/integtests/CommandLog_IntegTest.java
+++ b/extensions/core/commandlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/commandlog/jpa/integtests/CommandLog_IntegTest.java
@@ -29,12 +29,11 @@ import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
import org.apache.causeway.core.config.presets.CausewayPresets;
+import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.extensions.commandlog.applib.integtest.CommandLog_IntegTestAbstract;
import org.apache.causeway.extensions.commandlog.applib.integtest.model.CommandLogTestDomainModel;
import org.apache.causeway.extensions.commandlog.jpa.CausewayModuleExtCommandLogPersistenceJpa;
import org.apache.causeway.extensions.commandlog.jpa.integtests.model.Counter;
-
-import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
@SpringBootTest(
diff --git a/extensions/core/commandlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/commandlog/jpa/integtests/model/Counter.java b/extensions/core/commandlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/commandlog/jpa/integtests/model/Counter.java
index 5268d6966b..b00abafc71 100644
--- a/extensions/core/commandlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/commandlog/jpa/integtests/model/Counter.java
+++ b/extensions/core/commandlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/commandlog/jpa/integtests/model/Counter.java
@@ -28,10 +28,7 @@ import javax.persistence.Id;
import javax.persistence.Table;
import org.apache.causeway.applib.annotation.DomainObject;
-import org.apache.causeway.applib.annotation.Editing;
import org.apache.causeway.applib.annotation.Nature;
-import org.apache.causeway.applib.annotation.Property;
-import org.apache.causeway.applib.annotation.Publishing;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
diff --git a/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/CausewayModuleExtExcelApplib.java b/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/CausewayModuleExtExcelApplib.java
index 9d72b2d386..9c3329875a 100644
--- a/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/CausewayModuleExtExcelApplib.java
+++ b/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/CausewayModuleExtExcelApplib.java
@@ -18,10 +18,11 @@
*/
package org.apache.causeway.extensions.excel.applib;
-import org.apache.causeway.extensions.excel.applib.service.ExcelServiceDefault;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.extensions.excel.applib.service.ExcelServiceDefault;
+
/**
* @since 2.0 {@index}
*/
diff --git a/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/service/ExcelServiceDefault.java b/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/service/ExcelServiceDefault.java
index 26dfac8d39..225e1eda7d 100644
--- a/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/service/ExcelServiceDefault.java
+++ b/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/service/ExcelServiceDefault.java
@@ -28,11 +28,6 @@ import javax.annotation.Priority;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.extensions.excel.applib.ExcelService;
-import org.apache.causeway.extensions.excel.applib.Mode;
-import org.apache.causeway.extensions.excel.applib.WorksheetContent;
-import org.apache.causeway.extensions.excel.applib.WorksheetSpec;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -41,6 +36,11 @@ import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.inject.ServiceInjector;
import org.apache.causeway.applib.value.Blob;
+import org.apache.causeway.commons.internal.collections._Lists;
+import org.apache.causeway.extensions.excel.applib.ExcelService;
+import org.apache.causeway.extensions.excel.applib.Mode;
+import org.apache.causeway.extensions.excel.applib.WorksheetContent;
+import org.apache.causeway.extensions.excel.applib.WorksheetSpec;
@Service
diff --git a/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/service/_ExcelConverter.java b/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/service/_ExcelConverter.java
index bf5503aa33..af18d0ff13 100644
--- a/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/service/_ExcelConverter.java
+++ b/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/service/_ExcelConverter.java
@@ -33,12 +33,6 @@ import java.util.UUID;
import java.util.function.Predicate;
import java.util.stream.Collectors;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.commons.internal.collections._Maps;
-import org.apache.causeway.commons.internal.collections._Sets;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellStyle;
@@ -54,6 +48,12 @@ import org.springframework.lang.Nullable;
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.services.bookmark.BookmarkService;
import org.apache.causeway.applib.services.inject.ServiceInjector;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.commons.internal.base._NullSafe;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.collections._Lists;
+import org.apache.causeway.commons.internal.collections._Maps;
+import org.apache.causeway.commons.internal.collections._Sets;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.objectmanager.ObjectManager;
diff --git a/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/service/_ExcelServiceHelper.java b/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/service/_ExcelServiceHelper.java
index 170e74e29d..05ecf77b22 100644
--- a/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/service/_ExcelServiceHelper.java
+++ b/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/service/_ExcelServiceHelper.java
@@ -24,13 +24,13 @@ import java.io.InputStream;
import java.util.Collections;
import java.util.List;
-import org.apache.causeway.commons.internal.base._Casts;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.apache.causeway.applib.services.bookmark.BookmarkService;
import org.apache.causeway.applib.services.inject.ServiceInjector;
import org.apache.causeway.applib.value.Blob;
+import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.core.metamodel.objectmanager.ObjectManager;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
import org.apache.causeway.extensions.excel.applib.WorksheetContent;
diff --git a/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/util/ExcelFileBlobConverter.java b/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/util/ExcelFileBlobConverter.java
index 0b3b3cfcc4..454c910e76 100644
--- a/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/util/ExcelFileBlobConverter.java
+++ b/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/util/ExcelFileBlobConverter.java
@@ -25,12 +25,12 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
-import org.apache.causeway.commons.internal.base._Bytes;
-import org.apache.causeway.extensions.excel.applib.ExcelService;
-import org.apache.causeway.extensions.excel.applib.service.ExcelServiceDefault;
import org.apache.poi.util.IOUtils;
import org.apache.causeway.applib.value.Blob;
+import org.apache.causeway.commons.internal.base._Bytes;
+import org.apache.causeway.extensions.excel.applib.ExcelService;
+import org.apache.causeway.extensions.excel.applib.service.ExcelServiceDefault;
/**
* @since 2.0 {@index}
diff --git a/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/util/PivotUtils.java b/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/util/PivotUtils.java
index 342a87c62e..a2a26baa28 100644
--- a/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/util/PivotUtils.java
+++ b/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/util/PivotUtils.java
@@ -20,11 +20,12 @@ package org.apache.causeway.extensions.excel.applib.util;
import java.util.List;
-import org.apache.causeway.extensions.excel.applib.AggregationType;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.Row;
+import org.apache.causeway.extensions.excel.applib.AggregationType;
+
/**
* @since 2.0 {@index}
*/
diff --git a/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/util/SheetPivoter.java b/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/util/SheetPivoter.java
index cf16e0f6bf..2873d0b30c 100644
--- a/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/util/SheetPivoter.java
+++ b/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/util/SheetPivoter.java
@@ -23,8 +23,6 @@ import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
-import org.apache.causeway.extensions.excel.applib.AggregationType;
-import org.apache.causeway.extensions.excel.applib.service.ExcelServiceDefault;
import org.apache.poi.hssf.util.HSSFColor;
import org.apache.poi.ss.usermodel.BorderStyle;
import org.apache.poi.ss.usermodel.Cell;
@@ -36,6 +34,9 @@ import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.util.CellReference;
+import org.apache.causeway.extensions.excel.applib.AggregationType;
+import org.apache.causeway.extensions.excel.applib.service.ExcelServiceDefault;
+
import lombok.val;
/**
diff --git a/extensions/core/excel/applib/src/test/java/org/apache/causeway/extensions/excel/applib/util/AnnotationListTest.java b/extensions/core/excel/applib/src/test/java/org/apache/causeway/extensions/excel/applib/util/AnnotationListTest.java
index 3259aafa13..eefdd2d88b 100644
--- a/extensions/core/excel/applib/src/test/java/org/apache/causeway/extensions/excel/applib/util/AnnotationListTest.java
+++ b/extensions/core/excel/applib/src/test/java/org/apache/causeway/extensions/excel/applib/util/AnnotationListTest.java
@@ -21,8 +21,6 @@ package org.apache.causeway.extensions.excel.applib.util;
import java.util.Arrays;
import java.util.List;
-import org.apache.causeway.extensions.excel.applib.util.AnnotationList;
-import org.apache.causeway.extensions.excel.applib.util.AnnotationTriplet;
import org.assertj.core.api.Assertions;
import org.junit.Test;
diff --git a/extensions/core/excel/applib/src/test/java/org/apache/causeway/extensions/excel/applib/util/AnnotationTripletTest.java b/extensions/core/excel/applib/src/test/java/org/apache/causeway/extensions/excel/applib/util/AnnotationTripletTest.java
index 98675fc137..5a328c304a 100644
--- a/extensions/core/excel/applib/src/test/java/org/apache/causeway/extensions/excel/applib/util/AnnotationTripletTest.java
+++ b/extensions/core/excel/applib/src/test/java/org/apache/causeway/extensions/excel/applib/util/AnnotationTripletTest.java
@@ -22,7 +22,6 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import org.apache.causeway.extensions.excel.applib.util.AnnotationTriplet;
import org.assertj.core.api.Assertions;
import org.junit.Test;
diff --git a/extensions/core/excel/applib/src/test/java/org/apache/causeway/extensions/excel/applib/util/PivotUtilsTest.java b/extensions/core/excel/applib/src/test/java/org/apache/causeway/extensions/excel/applib/util/PivotUtilsTest.java
index ae381c7fcf..d7285fb5f5 100644
--- a/extensions/core/excel/applib/src/test/java/org/apache/causeway/extensions/excel/applib/util/PivotUtilsTest.java
+++ b/extensions/core/excel/applib/src/test/java/org/apache/causeway/extensions/excel/applib/util/PivotUtilsTest.java
@@ -21,7 +21,6 @@ package org.apache.causeway.extensions.excel.applib.util;
import java.util.Arrays;
import java.util.List;
-import org.apache.causeway.extensions.excel.applib.util.PivotUtils;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellStyle;
import org.apache.poi.ss.usermodel.CellType;
diff --git a/extensions/core/excel/applib/src/test/java/org/apache/causeway/extensions/excel/applib/util/SheetPivoterTest.java b/extensions/core/excel/applib/src/test/java/org/apache/causeway/extensions/excel/applib/util/SheetPivoterTest.java
index 4d26a66d9a..6c687000db 100644
--- a/extensions/core/excel/applib/src/test/java/org/apache/causeway/extensions/excel/applib/util/SheetPivoterTest.java
+++ b/extensions/core/excel/applib/src/test/java/org/apache/causeway/extensions/excel/applib/util/SheetPivoterTest.java
@@ -21,7 +21,6 @@ package org.apache.causeway.extensions.excel.applib.util;
import java.util.Arrays;
import java.util.List;
-import org.apache.causeway.extensions.excel.applib.util.SheetPivoter;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.Row;
diff --git a/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/CausewayModuleExtExcelFixtures.java b/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/CausewayModuleExtExcelFixtures.java
index 67cd0400c9..db6b767ea6 100644
--- a/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/CausewayModuleExtExcelFixtures.java
+++ b/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/CausewayModuleExtExcelFixtures.java
@@ -18,12 +18,12 @@
*/
package org.apache.causeway.extensions.excel.fixtures;
-import org.apache.causeway.extensions.excel.applib.CausewayModuleExtExcelApplib;
-import org.apache.causeway.extensions.excel.fixtures.demoapp.todomodule.fixturescripts.ExcelDemoToDoItem_tearDown;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.extensions.excel.applib.CausewayModuleExtExcelApplib;
+import org.apache.causeway.extensions.excel.fixtures.demoapp.todomodule.fixturescripts.ExcelDemoToDoItem_tearDown;
import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib;
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.causeway.testing.fixtures.applib.modules.ModuleWithFixtures;
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 f87547378f..fcdb7c82c6 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
@@ -31,9 +31,6 @@ import javax.xml.bind.annotation.XmlType;
import org.springframework.lang.Nullable;
-import static org.apache.causeway.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem.Predicates.thoseCategorised;
-import static org.apache.causeway.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem.Predicates.thoseCompleted;
-
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
import org.apache.causeway.applib.annotation.BookmarkPolicy;
@@ -58,6 +55,9 @@ import org.apache.causeway.extensions.excel.fixtures.demoapp.todomodule.dom.Cate
import org.apache.causeway.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
import org.apache.causeway.extensions.excel.fixtures.demoapp.todomodule.dom.Subcategory;
+import static org.apache.causeway.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem.Predicates.thoseCategorised;
+import static org.apache.causeway.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem.Predicates.thoseCompleted;
+
import lombok.Getter;
import lombok.Setter;
import lombok.val;
diff --git a/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java b/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java
index c7b751a3ff..f48a51f642 100644
--- a/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java
+++ b/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java
@@ -36,7 +36,6 @@ import org.apache.causeway.extensions.excel.fixtures.demoapp.todomodule.dom.Exce
import org.apache.causeway.extensions.excel.fixtures.demoapp.todomodule.dom.Subcategory;
import org.apache.causeway.extensions.excel.testing.ExcelFixture;
import org.apache.causeway.extensions.excel.testing.ExcelFixtureRowHandler;
-
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
import lombok.Getter;
diff --git a/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java b/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java
index 5b63dd0f03..4a026e63d8 100644
--- a/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java
+++ b/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java
@@ -27,7 +27,6 @@ import org.apache.causeway.extensions.excel.fixtures.demoapp.todomodule.dom.Cate
import org.apache.causeway.extensions.excel.fixtures.demoapp.todomodule.dom.Subcategory;
import org.apache.causeway.extensions.excel.testing.ExcelFixture2;
import org.apache.causeway.extensions.excel.testing.FixtureAwareRowHandler;
-
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
import lombok.Getter;
diff --git a/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java b/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java
index 9631a0b218..0b087eb0d5 100644
--- a/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java
+++ b/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java
@@ -42,7 +42,6 @@ import org.apache.causeway.extensions.excel.fixtures.demoapp.todomodule.dom.Exce
import org.apache.causeway.extensions.excel.fixtures.demoapp.todomodule.dom.Subcategory;
import org.apache.causeway.extensions.excel.testing.ExcelFixture;
import org.apache.causeway.extensions.excel.testing.ExcelFixtureRowHandler;
-
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
import lombok.Getter;
diff --git a/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java b/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java
index 2fd938bed4..3aa7401263 100644
--- a/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java
+++ b/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java
@@ -33,7 +33,6 @@ import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.extensions.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem.DemoToDoItemRowHandler;
import org.apache.causeway.extensions.excel.testing.ExcelFixture;
-
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureResult;
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScripts;
diff --git a/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java b/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java
index d47f4605aa..4c0fe67532 100644
--- a/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java
+++ b/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java
@@ -20,12 +20,12 @@ package org.apache.causeway.extensions.excel.fixtures.demoapp.demomodule.fixture
import javax.inject.Named;
+import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.commons.internal.resources._Resources;
import org.apache.causeway.extensions.excel.applib.Mode;
import org.apache.causeway.extensions.excel.applib.WorksheetSpec;
import org.apache.causeway.extensions.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem.DemoToDoItemRowHandler2;
import org.apache.causeway.extensions.excel.testing.ExcelFixture2;
-import org.apache.causeway.applib.annotation.DomainObject;
import lombok.Getter;
import lombok.Setter;
diff --git a/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java b/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java
index d3d53b36fd..24a58730b1 100644
--- a/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java
+++ b/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java
@@ -23,14 +23,13 @@ import java.util.List;
import javax.inject.Inject;
+import org.apache.causeway.applib.services.user.UserService;
+import org.apache.causeway.applib.services.xactn.TransactionService;
import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.commons.internal.resources._Resources;
import org.apache.causeway.extensions.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem.DemoToDoItemRowHandler;
import org.apache.causeway.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
import org.apache.causeway.extensions.excel.testing.ExcelFixture;
-import org.apache.causeway.applib.services.user.UserService;
-import org.apache.causeway.applib.services.xactn.TransactionService;
-
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
import lombok.Getter;
diff --git a/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_recreate_usingExcelFixture.java b/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_recreate_usingExcelFixture.java
index 72bd5fefed..f704d21b51 100644
--- a/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_recreate_usingExcelFixture.java
+++ b/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_recreate_usingExcelFixture.java
@@ -24,7 +24,6 @@ import javax.inject.Inject;
import org.apache.causeway.applib.services.user.UserService;
import org.apache.causeway.applib.services.xactn.TransactionService;
import org.apache.causeway.extensions.excel.fixtures.demoapp.todomodule.fixturescripts.ExcelDemoToDoItem_tearDown2;
-
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
public class DemoToDoItem_recreate_usingExcelFixture extends FixtureScript {
diff --git a/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java b/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java
index 409b65636f..36a4598e7d 100644
--- a/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java
+++ b/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java
@@ -29,7 +29,6 @@ import org.apache.causeway.extensions.excel.fixtures.demoapp.todomodule.dom.Cate
import org.apache.causeway.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
import org.apache.causeway.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
import org.apache.causeway.extensions.excel.fixtures.demoapp.todomodule.dom.Subcategory;
-
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
public class ExcelDemoToDoItem_recreate5_for extends FixtureScript {
diff --git a/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java b/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java
index 3dde7177ab..7a8652311c 100644
--- a/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java
+++ b/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java
@@ -19,7 +19,6 @@
package org.apache.causeway.extensions.excel.fixtures.demoapp.todomodule.fixturescripts;
import org.apache.causeway.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
-
import org.apache.causeway.testing.fixtures.applib.teardown.jdo.TeardownFixtureJdoAbstract;
public class ExcelDemoToDoItem_tearDown extends TeardownFixtureJdoAbstract {
diff --git a/extensions/core/excel/integtests/src/test/java/org/apache/causeway/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java b/extensions/core/excel/integtests/src/test/java/org/apache/causeway/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java
index 3acc645f44..df2ce2010e 100644
--- a/extensions/core/excel/integtests/src/test/java/org/apache/causeway/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java
+++ b/extensions/core/excel/integtests/src/test/java/org/apache/causeway/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java
@@ -28,10 +28,8 @@ import org.springframework.test.context.TestPropertySource;
import org.springframework.transaction.annotation.Transactional;
import org.apache.causeway.core.config.presets.CausewayPresets;
-import org.apache.causeway.extensions.excel.fixtures.CausewayModuleExtExcelFixtures;
-
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
-
+import org.apache.causeway.extensions.excel.fixtures.CausewayModuleExtExcelFixtures;
import org.apache.causeway.persistence.jdo.applib.CausewayModulePersistenceJdoApplib;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
import org.apache.causeway.testing.fixtures.applib.CausewayIntegrationTestAbstractWithFixtures;
diff --git a/extensions/core/excel/integtests/src/test/java/org/apache/causeway/extensions/excel/integtests/tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java b/extensions/core/excel/integtests/src/test/java/org/apache/causeway/extensions/excel/integtests/tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java
index 8b6a5098f0..e2b0ec9d27 100644
--- a/extensions/core/excel/integtests/src/test/java/org/apache/causeway/extensions/excel/integtests/tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java
+++ b/extensions/core/excel/integtests/src/test/java/org/apache/causeway/extensions/excel/integtests/tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java
@@ -23,15 +23,13 @@ import java.util.List;
import javax.inject.Inject;
-import org.apache.causeway.extensions.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem.DemoToDoItemRowHandler2;
-import org.apache.causeway.extensions.excel.fixtures.demoapp.demomodule.fixturescripts.DemoFixture_extending_ExcelFixture2;
-import org.apache.causeway.extensions.excel.integtests.ExcelModuleIntegTestAbstract;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
+import org.apache.causeway.extensions.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem.DemoToDoItemRowHandler2;
+import org.apache.causeway.extensions.excel.fixtures.demoapp.demomodule.fixturescripts.DemoFixture_extending_ExcelFixture2;
+import org.apache.causeway.extensions.excel.integtests.ExcelModuleIntegTestAbstract;
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureResult;
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScripts;
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 70b48a5766..d8b25f6ccf 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
@@ -23,15 +23,6 @@ import java.util.List;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.base._Bytes;
-import org.apache.causeway.commons.internal.resources._Resources;
-import org.apache.causeway.extensions.excel.applib.ExcelService;
-import org.apache.causeway.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateLineItemForDemoToDoItem;
-import org.apache.causeway.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateManagerForDemoToDoItem;
-import org.apache.causeway.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateMenuForDemoToDoItem;
-import org.apache.causeway.extensions.excel.fixtures.demoapp.demomodule.fixturescripts.DemoToDoItem_recreate_usingExcelFixture;
-import org.apache.causeway.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
-import org.apache.causeway.extensions.excel.integtests.ExcelModuleIntegTestAbstract;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
@@ -41,6 +32,15 @@ import org.junit.jupiter.api.Disabled;
import static org.assertj.core.api.Assertions.assertThat;
import org.apache.causeway.applib.value.Blob;
+import org.apache.causeway.commons.internal.base._Bytes;
+import org.apache.causeway.commons.internal.resources._Resources;
+import org.apache.causeway.extensions.excel.applib.ExcelService;
+import org.apache.causeway.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateLineItemForDemoToDoItem;
+import org.apache.causeway.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateManagerForDemoToDoItem;
+import org.apache.causeway.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateMenuForDemoToDoItem;
+import org.apache.causeway.extensions.excel.fixtures.demoapp.demomodule.fixturescripts.DemoToDoItem_recreate_usingExcelFixture;
+import org.apache.causeway.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
+import org.apache.causeway.extensions.excel.integtests.ExcelModuleIntegTestAbstract;
public class ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest extends ExcelModuleIntegTestAbstract {
diff --git a/extensions/core/excel/integtests/src/test/java/org/apache/causeway/extensions/excel/integtests/tests/ExcelModuleDemoUploadService_IntegTest.java b/extensions/core/excel/integtests/src/test/java/org/apache/causeway/extensions/excel/integtests/tests/ExcelModuleDemoUploadService_IntegTest.java
index bb5b46dcf4..9d3ace35b0 100644
--- a/extensions/core/excel/integtests/src/test/java/org/apache/causeway/extensions/excel/integtests/tests/ExcelModuleDemoUploadService_IntegTest.java
+++ b/extensions/core/excel/integtests/src/test/java/org/apache/causeway/extensions/excel/integtests/tests/ExcelModuleDemoUploadService_IntegTest.java
@@ -23,6 +23,10 @@ import java.util.List;
import javax.inject.Inject;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+
+import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.commons.internal.resources._Resources;
import org.apache.causeway.extensions.excel.applib.util.ExcelFileBlobConverter;
import org.apache.causeway.extensions.excel.fixtures.demoapp.demomodule.fixturehandlers.excelupload.ExcelUploadServiceForDemoToDoItem;
@@ -30,12 +34,6 @@ import org.apache.causeway.extensions.excel.fixtures.demoapp.todomodule.dom.Exce
import org.apache.causeway.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
import org.apache.causeway.extensions.excel.fixtures.demoapp.todomodule.fixturescripts.ExcelDemoToDoItem_tearDown;
import org.apache.causeway.extensions.excel.integtests.ExcelModuleIntegTestAbstract;
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-import org.apache.causeway.applib.value.Blob;
public class ExcelModuleDemoUploadService_IntegTest extends ExcelModuleIntegTestAbstract {
diff --git a/extensions/core/excel/testing/src/main/java/org/apache/causeway/extensions/excel/testing/CausewayModuleExtExcelTesting.java b/extensions/core/excel/testing/src/main/java/org/apache/causeway/extensions/excel/testing/CausewayModuleExtExcelTesting.java
index 7e84747863..0cdff172bd 100644
--- a/extensions/core/excel/testing/src/main/java/org/apache/causeway/extensions/excel/testing/CausewayModuleExtExcelTesting.java
+++ b/extensions/core/excel/testing/src/main/java/org/apache/causeway/extensions/excel/testing/CausewayModuleExtExcelTesting.java
@@ -18,11 +18,12 @@
*/
package org.apache.causeway.extensions.excel.testing;
-import org.apache.causeway.extensions.excel.applib.CausewayModuleExtExcelApplib;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.extensions.excel.applib.CausewayModuleExtExcelApplib;
+
/**
* @since 2.0 {@index}
*/
diff --git a/extensions/core/excel/testing/src/main/java/org/apache/causeway/extensions/excel/testing/ExcelFixture.java b/extensions/core/excel/testing/src/main/java/org/apache/causeway/extensions/excel/testing/ExcelFixture.java
index a57b487727..bf95b85ae7 100644
--- a/extensions/core/excel/testing/src/main/java/org/apache/causeway/extensions/excel/testing/ExcelFixture.java
+++ b/extensions/core/excel/testing/src/main/java/org/apache/causeway/extensions/excel/testing/ExcelFixture.java
@@ -28,11 +28,6 @@ import java.util.Optional;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.causeway.commons.internal.base._Bytes;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.commons.internal.collections._Maps;
-
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Programmatic;
import org.apache.causeway.applib.annotation.PropertyLayout;
@@ -40,11 +35,14 @@ import org.apache.causeway.applib.services.inject.ServiceInjector;
import org.apache.causeway.applib.services.metamodel.BeanSort;
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.applib.value.Blob;
+import org.apache.causeway.commons.internal.base._Bytes;
+import org.apache.causeway.commons.internal.base._NullSafe;
+import org.apache.causeway.commons.internal.collections._Lists;
+import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
-import org.apache.causeway.extensions.excel.applib.ExcelService;
import org.apache.causeway.extensions.excel.applib.CausewayModuleExtExcelApplib;
-
+import org.apache.causeway.extensions.excel.applib.ExcelService;
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureResultList;
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
diff --git a/extensions/core/excel/testing/src/main/java/org/apache/causeway/extensions/excel/testing/ExcelFixture2.java b/extensions/core/excel/testing/src/main/java/org/apache/causeway/extensions/excel/testing/ExcelFixture2.java
index d186ab7d6c..e473b534e5 100644
--- a/extensions/core/excel/testing/src/main/java/org/apache/causeway/extensions/excel/testing/ExcelFixture2.java
+++ b/extensions/core/excel/testing/src/main/java/org/apache/causeway/extensions/excel/testing/ExcelFixture2.java
@@ -26,15 +26,14 @@ import java.util.List;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.causeway.commons.internal.base._Bytes;
-import org.apache.causeway.extensions.excel.applib.ExcelService;
-import org.apache.causeway.extensions.excel.applib.CausewayModuleExtExcelApplib;
-import org.apache.causeway.extensions.excel.applib.WorksheetSpec;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.value.Blob;
-
+import org.apache.causeway.commons.internal.base._Bytes;
+import org.apache.causeway.extensions.excel.applib.CausewayModuleExtExcelApplib;
+import org.apache.causeway.extensions.excel.applib.ExcelService;
+import org.apache.causeway.extensions.excel.applib.WorksheetSpec;
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
import lombok.Getter;
diff --git a/extensions/core/excel/testing/src/main/java/org/apache/causeway/extensions/excel/testing/FixtureAwareRowHandler.java b/extensions/core/excel/testing/src/main/java/org/apache/causeway/extensions/excel/testing/FixtureAwareRowHandler.java
index 0e29a43361..d3ca3f8a70 100644
--- a/extensions/core/excel/testing/src/main/java/org/apache/causeway/extensions/excel/testing/FixtureAwareRowHandler.java
+++ b/extensions/core/excel/testing/src/main/java/org/apache/causeway/extensions/excel/testing/FixtureAwareRowHandler.java
@@ -20,7 +20,6 @@ package org.apache.causeway.extensions.excel.testing;
import org.apache.causeway.extensions.excel.applib.RowHandler;
-
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
/**
diff --git a/extensions/core/executionlog/applib/src/main/java/org/apache/causeway/extensions/executionlog/applib/CausewayModuleExtExecutionLogApplib.java b/extensions/core/executionlog/applib/src/main/java/org/apache/causeway/extensions/executionlog/applib/CausewayModuleExtExecutionLogApplib.java
index 640796babd..196b1cb845 100644
--- a/extensions/core/executionlog/applib/src/main/java/org/apache/causeway/extensions/executionlog/applib/CausewayModuleExtExecutionLogApplib.java
+++ b/extensions/core/executionlog/applib/src/main/java/org/apache/causeway/extensions/executionlog/applib/CausewayModuleExtExecutionLogApplib.java
@@ -18,6 +18,9 @@
*/
package org.apache.causeway.extensions.executionlog.applib;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
import org.apache.causeway.extensions.executionlog.applib.app.ExecutionLogMenu;
import org.apache.causeway.extensions.executionlog.applib.contributions.HasInteractionId_executionLogEntries;
import org.apache.causeway.extensions.executionlog.applib.contributions.HasUsername_recentExecutionsByUser;
@@ -25,9 +28,6 @@ import org.apache.causeway.extensions.executionlog.applib.contributions.Object_r
import org.apache.causeway.extensions.executionlog.applib.dom.ExecutionLogEntry;
import org.apache.causeway.extensions.executionlog.applib.dom.mixins.ExecutionLogEntry_siblingExecutions;
import org.apache.causeway.extensions.executionlog.applib.spiimpl.ExecutionSubscriberForExecutionLog;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
import org.apache.causeway.testing.fixtures.applib.modules.ModuleWithFixtures;
@Configuration
diff --git a/extensions/core/executionlog/applib/src/main/java/org/apache/causeway/extensions/executionlog/applib/app/ExecutionLogMenu.java b/extensions/core/executionlog/applib/src/main/java/org/apache/causeway/extensions/executionlog/applib/app/ExecutionLogMenu.java
index b3f683f029..d8d3fc04c6 100644
--- a/extensions/core/executionlog/applib/src/main/java/org/apache/causeway/extensions/executionlog/applib/app/ExecutionLogMenu.java
+++ b/extensions/core/executionlog/applib/src/main/java/org/apache/causeway/extensions/executionlog/applib/app/ExecutionLogMenu.java
@@ -25,12 +25,21 @@ import java.util.List;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.causeway.applib.annotation.*;
+import org.springframework.lang.Nullable;
+
+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.DomainServiceLayout;
+import org.apache.causeway.applib.annotation.MemberSupport;
+import org.apache.causeway.applib.annotation.NatureOfService;
+import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.applib.annotation.RestrictTo;
+import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.services.clock.ClockService;
import org.apache.causeway.extensions.executionlog.applib.CausewayModuleExtExecutionLogApplib;
import org.apache.causeway.extensions.executionlog.applib.dom.ExecutionLogEntry;
import org.apache.causeway.extensions.executionlog.applib.dom.ExecutionLogEntryRepository;
-import org.springframework.lang.Nullable;
import lombok.RequiredArgsConstructor;
diff --git a/extensions/core/executionlog/applib/src/main/java/org/apache/causeway/extensions/executionlog/applib/dom/ExecutionLogEntry.java b/extensions/core/executionlog/applib/src/main/java/org/apache/causeway/extensions/executionlog/applib/dom/ExecutionLogEntry.java
index e9538d8d64..077c8e7bdd 100644
--- a/extensions/core/executionlog/applib/src/main/java/org/apache/causeway/extensions/executionlog/applib/dom/ExecutionLogEntry.java
+++ b/extensions/core/executionlog/applib/src/main/java/org/apache/causeway/extensions/executionlog/applib/dom/ExecutionLogEntry.java
@@ -32,8 +32,6 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.validation.constraints.Digits;
-import org.apache.causeway.commons.internal.base._Temporals;
-import org.apache.causeway.extensions.executionlog.applib.CausewayModuleExtExecutionLogApplib;
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.DomainObject;
@@ -47,6 +45,7 @@ import org.apache.causeway.applib.annotation.Programmatic;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.Publishing;
import org.apache.causeway.applib.mixins.system.DomainChangeRecord;
+import org.apache.causeway.applib.mixins.system.DomainChangeRecord.ChangeType;
import org.apache.causeway.applib.mixins.system.HasInteractionId;
import org.apache.causeway.applib.mixins.system.HasInteractionIdAndSequence;
import org.apache.causeway.applib.services.bookmark.Bookmark;
@@ -59,6 +58,8 @@ import org.apache.causeway.applib.services.tablecol.TableColumnOrderForCollectio
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.internal.base._Temporals;
+import org.apache.causeway.extensions.executionlog.applib.CausewayModuleExtExecutionLogApplib;
import org.apache.causeway.schema.ixn.v2.InteractionDto;
import org.apache.causeway.schema.ixn.v2.MemberExecutionDto;
diff --git a/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionlog/jdo/CausewayModuleExtExecutionLogPersistenceJdo.java b/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionlog/jdo/CausewayModuleExtExecutionLogPersistenceJdo.java
index 33d4235783..09ca41bc44 100644
--- a/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionlog/jdo/CausewayModuleExtExecutionLogPersistenceJdo.java
+++ b/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionlog/jdo/CausewayModuleExtExecutionLogPersistenceJdo.java
@@ -20,6 +20,7 @@ package org.apache.causeway.extensions.executionlog.jdo;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+
import org.apache.causeway.extensions.executionlog.applib.CausewayModuleExtExecutionLogApplib;
import org.apache.causeway.extensions.executionlog.jdo.dom.ExecutionLogEntry;
import org.apache.causeway.extensions.executionlog.jdo.dom.ExecutionLogEntryPK;
diff --git a/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionlog/jdo/dom/ExecutionLogEntry.java b/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionlog/jdo/dom/ExecutionLogEntry.java
index b5f5354847..b408cba964 100644
--- a/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionlog/jdo/dom/ExecutionLogEntry.java
+++ b/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionlog/jdo/dom/ExecutionLogEntry.java
@@ -37,8 +37,8 @@ import org.apache.causeway.applib.annotation.Editing;
import org.apache.causeway.applib.annotation.Publishing;
import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
import org.apache.causeway.applib.services.bookmark.Bookmark;
-import org.apache.causeway.extensions.executionlog.applib.dom.ExecutionLogEntryType;
import org.apache.causeway.extensions.executionlog.applib.dom.ExecutionLogEntry.Nq;
+import org.apache.causeway.extensions.executionlog.applib.dom.ExecutionLogEntryType;
import org.apache.causeway.schema.ixn.v2.InteractionDto;
import lombok.Getter;
diff --git a/extensions/core/executionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionlog/jdo/integtests/ExecutionLog_IntegTest.java b/extensions/core/executionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionlog/jdo/integtests/ExecutionLog_IntegTest.java
index 03c9089513..cb843b37ba 100644
--- a/extensions/core/executionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionlog/jdo/integtests/ExecutionLog_IntegTest.java
+++ b/extensions/core/executionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionlog/jdo/integtests/ExecutionLog_IntegTest.java
@@ -28,12 +28,11 @@ import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
import org.apache.causeway.core.config.presets.CausewayPresets;
+import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.extensions.executionlog.applib.integtest.ExecutionLog_IntegTestAbstract;
import org.apache.causeway.extensions.executionlog.applib.integtest.model.ExecutionLogTestDomainModel;
import org.apache.causeway.extensions.executionlog.jdo.CausewayModuleExtExecutionLogPersistenceJdo;
import org.apache.causeway.extensions.executionlog.jdo.integtests.model.Counter;
-
-import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
@SpringBootTest(
diff --git a/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionlog/jpa/CausewayModuleExtExecutionLogPersistenceJpa.java b/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionlog/jpa/CausewayModuleExtExecutionLogPersistenceJpa.java
index 7d6ea45e91..7fed9480fc 100644
--- a/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionlog/jpa/CausewayModuleExtExecutionLogPersistenceJpa.java
+++ b/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionlog/jpa/CausewayModuleExtExecutionLogPersistenceJpa.java
@@ -21,6 +21,7 @@ package org.apache.causeway.extensions.executionlog.jpa;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+
import org.apache.causeway.extensions.executionlog.applib.CausewayModuleExtExecutionLogApplib;
import org.apache.causeway.extensions.executionlog.jpa.dom.ExecutionLogEntry;
import org.apache.causeway.extensions.executionlog.jpa.dom.ExecutionLogEntryPK;
diff --git a/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionlog/jpa/dom/ExecutionLogEntry.java b/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionlog/jpa/dom/ExecutionLogEntry.java
index 195aea151a..567e99910e 100644
--- a/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionlog/jpa/dom/ExecutionLogEntry.java
+++ b/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionlog/jpa/dom/ExecutionLogEntry.java
@@ -43,8 +43,8 @@ import org.apache.causeway.applib.annotation.Editing;
import org.apache.causeway.applib.annotation.Publishing;
import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
import org.apache.causeway.applib.services.bookmark.Bookmark;
-import org.apache.causeway.extensions.executionlog.applib.dom.ExecutionLogEntryType;
import org.apache.causeway.extensions.executionlog.applib.dom.ExecutionLogEntry.Nq;
+import org.apache.causeway.extensions.executionlog.applib.dom.ExecutionLogEntryType;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import org.apache.causeway.persistence.jpa.integration.typeconverters.applib.CausewayBookmarkConverter;
import org.apache.causeway.persistence.jpa.integration.typeconverters.schema.v2.CausewayInteractionDtoConverter;
diff --git a/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionlog/jpa/dom/ExecutionLogEntryPK.java b/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionlog/jpa/dom/ExecutionLogEntryPK.java
index 610c36816e..0f925c7314 100644
--- a/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionlog/jpa/dom/ExecutionLogEntryPK.java
+++ b/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionlog/jpa/dom/ExecutionLogEntryPK.java
@@ -27,11 +27,11 @@ import javax.persistence.Column;
import javax.persistence.Convert;
import javax.persistence.Embeddable;
-import org.apache.causeway.commons.internal.assertions._Assert;
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.value.semantics.ValueSemanticsBasedOnIdStringifierEntityAgnostic;
+import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.causeway.persistence.jpa.integration.typeconverters.java.util.JavaUtilUuidConverter;
import lombok.AccessLevel;
diff --git a/extensions/core/executionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionlog/jpa/integtests/ExecutionLog_IntegTest.java b/extensions/core/executionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionlog/jpa/integtests/ExecutionLog_IntegTest.java
index dc02a2f210..47a0694bfd 100644
--- a/extensions/core/executionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionlog/jpa/integtests/ExecutionLog_IntegTest.java
+++ b/extensions/core/executionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionlog/jpa/integtests/ExecutionLog_IntegTest.java
@@ -29,12 +29,11 @@ import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
import org.apache.causeway.core.config.presets.CausewayPresets;
+import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.extensions.executionlog.applib.integtest.ExecutionLog_IntegTestAbstract;
import org.apache.causeway.extensions.executionlog.applib.integtest.model.ExecutionLogTestDomainModel;
import org.apache.causeway.extensions.executionlog.jpa.CausewayModuleExtExecutionLogPersistenceJpa;
import org.apache.causeway.extensions.executionlog.jpa.integtests.model.Counter;
-
-import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
@SpringBootTest(
diff --git a/extensions/core/executionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionlog/jpa/integtests/model/Counter.java b/extensions/core/executionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionlog/jpa/integtests/model/Counter.java
index 3411bcdacd..90e837c2a2 100644
--- a/extensions/core/executionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionlog/jpa/integtests/model/Counter.java
+++ b/extensions/core/executionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionlog/jpa/integtests/model/Counter.java
@@ -28,10 +28,7 @@ import javax.persistence.Id;
import javax.persistence.Table;
import org.apache.causeway.applib.annotation.DomainObject;
-import org.apache.causeway.applib.annotation.Editing;
import org.apache.causeway.applib.annotation.Nature;
-import org.apache.causeway.applib.annotation.Property;
-import org.apache.causeway.applib.annotation.Publishing;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
diff --git a/extensions/core/executionoutbox/applib/src/main/java/org/apache/causeway/extensions/executionoutbox/applib/CausewayModuleExtExecutionOutboxApplib.java b/extensions/core/executionoutbox/applib/src/main/java/org/apache/causeway/extensions/executionoutbox/applib/CausewayModuleExtExecutionOutboxApplib.java
index 02206b0fdb..300cfa3db3 100644
--- a/extensions/core/executionoutbox/applib/src/main/java/org/apache/causeway/extensions/executionoutbox/applib/CausewayModuleExtExecutionOutboxApplib.java
+++ b/extensions/core/executionoutbox/applib/src/main/java/org/apache/causeway/extensions/executionoutbox/applib/CausewayModuleExtExecutionOutboxApplib.java
@@ -18,15 +18,14 @@
*/
package org.apache.causeway.extensions.executionoutbox.applib;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
import org.apache.causeway.extensions.executionoutbox.applib.app.ExecutionOutboxMenu;
import org.apache.causeway.extensions.executionoutbox.applib.dom.ExecutionOutboxEntry;
import org.apache.causeway.extensions.executionoutbox.applib.restapi.OutboxRestApi;
import org.apache.causeway.extensions.executionoutbox.applib.spiimpl.ContentMappingServiceForOutboxEvents;
import org.apache.causeway.extensions.executionoutbox.applib.spiimpl.ExecutionSubscriberForExecutionOutbox;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-import org.apache.causeway.testing.fixtures.applib.modules.ModuleWithFixtures;
@Configuration
@Import({
diff --git a/extensions/core/executionoutbox/applib/src/main/java/org/apache/causeway/extensions/executionoutbox/applib/dom/ExecutionOutboxEntry.java b/extensions/core/executionoutbox/applib/src/main/java/org/apache/causeway/extensions/executionoutbox/applib/dom/ExecutionOutboxEntry.java
index 6efafe7232..c924ebcfd4 100644
--- a/extensions/core/executionoutbox/applib/src/main/java/org/apache/causeway/extensions/executionoutbox/applib/dom/ExecutionOutboxEntry.java
+++ b/extensions/core/executionoutbox/applib/src/main/java/org/apache/causeway/extensions/executionoutbox/applib/dom/ExecutionOutboxEntry.java
@@ -32,8 +32,6 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.validation.constraints.Digits;
-import org.apache.causeway.commons.internal.base._Temporals;
-import org.apache.causeway.extensions.executionoutbox.applib.CausewayModuleExtExecutionOutboxApplib;
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.DomainObject;
@@ -49,6 +47,7 @@ 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.mixins.system.DomainChangeRecord;
+import org.apache.causeway.applib.mixins.system.DomainChangeRecord.ChangeType;
import org.apache.causeway.applib.mixins.system.HasInteractionId;
import org.apache.causeway.applib.mixins.system.HasInteractionIdAndSequence;
import org.apache.causeway.applib.services.bookmark.Bookmark;
@@ -61,6 +60,8 @@ import org.apache.causeway.applib.services.tablecol.TableColumnOrderForCollectio
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.internal.base._Temporals;
+import org.apache.causeway.extensions.executionoutbox.applib.CausewayModuleExtExecutionOutboxApplib;
import org.apache.causeway.schema.ixn.v2.InteractionDto;
import org.apache.causeway.schema.ixn.v2.MemberExecutionDto;
diff --git a/extensions/core/executionoutbox/applib/src/test/java/org/apache/causeway/extensions/executionoutbox/applib/integtest/ExecutionOutbox_IntegTestAbstract.java b/extensions/core/executionoutbox/applib/src/test/java/org/apache/causeway/extensions/executionoutbox/applib/integtest/ExecutionOutbox_IntegTestAbstract.java
index dbe7508298..4882982ada 100644
--- a/extensions/core/executionoutbox/applib/src/test/java/org/apache/causeway/extensions/executionoutbox/applib/integtest/ExecutionOutbox_IntegTestAbstract.java
+++ b/extensions/core/executionoutbox/applib/src/test/java/org/apache/causeway/extensions/executionoutbox/applib/integtest/ExecutionOutbox_IntegTestAbstract.java
@@ -35,7 +35,6 @@ 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.InteractionContext;
-import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.sudo.SudoService;
import org.apache.causeway.applib.services.user.UserMemento;
diff --git a/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionoutbox/jdo/CausewayModuleExtExecutionOutboxPersistenceJdo.java b/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionoutbox/jdo/CausewayModuleExtExecutionOutboxPersistenceJdo.java
index 9ac0400a65..2ef7deeac5 100644
--- a/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionoutbox/jdo/CausewayModuleExtExecutionOutboxPersistenceJdo.java
+++ b/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionoutbox/jdo/CausewayModuleExtExecutionOutboxPersistenceJdo.java
@@ -20,6 +20,7 @@ package org.apache.causeway.extensions.executionoutbox.jdo;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+
import org.apache.causeway.extensions.executionoutbox.applib.CausewayModuleExtExecutionOutboxApplib;
import org.apache.causeway.extensions.executionoutbox.jdo.dom.ExecutionOutboxEntry;
import org.apache.causeway.extensions.executionoutbox.jdo.dom.ExecutionOutboxEntryPK;
diff --git a/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionoutbox/jdo/dom/ExecutionOutboxEntry.java b/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionoutbox/jdo/dom/ExecutionOutboxEntry.java
index 185b7b76bc..7de6c1419d 100644
--- a/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionoutbox/jdo/dom/ExecutionOutboxEntry.java
+++ b/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionoutbox/jdo/dom/ExecutionOutboxEntry.java
@@ -37,8 +37,8 @@ import org.apache.causeway.applib.annotation.Editing;
import org.apache.causeway.applib.annotation.Publishing;
import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
import org.apache.causeway.applib.services.bookmark.Bookmark;
-import org.apache.causeway.extensions.executionoutbox.applib.dom.ExecutionOutboxEntryType;
import org.apache.causeway.extensions.executionoutbox.applib.dom.ExecutionOutboxEntry.Nq;
+import org.apache.causeway.extensions.executionoutbox.applib.dom.ExecutionOutboxEntryType;
import org.apache.causeway.schema.ixn.v2.InteractionDto;
import lombok.Getter;
diff --git a/extensions/core/executionoutbox/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionoutbox/jdo/integtests/ExecutionOutbox_IntegTest.java b/extensions/core/executionoutbox/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionoutbox/jdo/integtests/ExecutionOutbox_IntegTest.java
index c97589e47b..b327fc5350 100644
--- a/extensions/core/executionoutbox/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionoutbox/jdo/integtests/ExecutionOutbox_IntegTest.java
+++ b/extensions/core/executionoutbox/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionoutbox/jdo/integtests/ExecutionOutbox_IntegTest.java
@@ -28,12 +28,11 @@ import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
import org.apache.causeway.core.config.presets.CausewayPresets;
+import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.extensions.executionoutbox.applib.integtest.ExecutionOutbox_IntegTestAbstract;
import org.apache.causeway.extensions.executionoutbox.applib.integtest.model.ExecutionOutboxTestDomainModel;
import org.apache.causeway.extensions.executionoutbox.jdo.CausewayModuleExtExecutionOutboxPersistenceJdo;
import org.apache.causeway.extensions.executionoutbox.jdo.integtests.model.Counter;
-
-import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
@SpringBootTest(
diff --git a/extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionoutbox/jpa/CausewayModuleExtExecutionOutboxPersistenceJpa.java b/extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionoutbox/jpa/CausewayModuleExtExecutionOutboxPersistenceJpa.java
index 98cc58308d..dd8833b7df 100644
--- a/extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionoutbox/jpa/CausewayModuleExtExecutionOutboxPersistenceJpa.java
+++ b/extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionoutbox/jpa/CausewayModuleExtExecutionOutboxPersistenceJpa.java
@@ -21,6 +21,7 @@ package org.apache.causeway.extensions.executionoutbox.jpa;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+
import org.apache.causeway.extensions.executionoutbox.applib.CausewayModuleExtExecutionOutboxApplib;
import org.apache.causeway.extensions.executionoutbox.jpa.dom.ExecutionOutboxEntry;
import org.apache.causeway.extensions.executionoutbox.jpa.dom.ExecutionOutboxEntryPK;
diff --git a/extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionoutbox/jpa/dom/ExecutionOutboxEntry.java b/extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionoutbox/jpa/dom/ExecutionOutboxEntry.java
index b27e0b5bde..9020913852 100644
--- a/extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionoutbox/jpa/dom/ExecutionOutboxEntry.java
+++ b/extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionoutbox/jpa/dom/ExecutionOutboxEntry.java
@@ -43,14 +43,13 @@ import org.apache.causeway.applib.annotation.Editing;
import org.apache.causeway.applib.annotation.Publishing;
import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
import org.apache.causeway.applib.services.bookmark.Bookmark;
+import org.apache.causeway.extensions.executionoutbox.applib.dom.ExecutionOutboxEntry.Nq;
import org.apache.causeway.extensions.executionoutbox.applib.dom.ExecutionOutboxEntryType;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import org.apache.causeway.persistence.jpa.integration.typeconverters.applib.CausewayBookmarkConverter;
import org.apache.causeway.persistence.jpa.integration.typeconverters.schema.v2.CausewayInteractionDtoConverter;
import org.apache.causeway.schema.ixn.v2.InteractionDto;
-import static org.apache.causeway.extensions.executionoutbox.applib.dom.ExecutionOutboxEntry.Nq;
-
import lombok.Getter;
import lombok.Setter;
diff --git a/extensions/core/executionoutbox/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionoutbox/jpa/integtests/ExecutionOutbox_IntegTest.java b/extensions/core/executionoutbox/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionoutbox/jpa/integtests/ExecutionOutbox_IntegTest.java
index 61ae341d79..bf86f14179 100644
--- a/extensions/core/executionoutbox/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionoutbox/jpa/integtests/ExecutionOutbox_IntegTest.java
+++ b/extensions/core/executionoutbox/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionoutbox/jpa/integtests/ExecutionOutbox_IntegTest.java
@@ -29,12 +29,11 @@ import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
import org.apache.causeway.core.config.presets.CausewayPresets;
+import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.extensions.executionoutbox.applib.integtest.ExecutionOutbox_IntegTestAbstract;
import org.apache.causeway.extensions.executionoutbox.applib.integtest.model.ExecutionOutboxTestDomainModel;
import org.apache.causeway.extensions.executionoutbox.jpa.CausewayModuleExtExecutionOutboxPersistenceJpa;
import org.apache.causeway.extensions.executionoutbox.jpa.integtests.model.Counter;
-
-import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
@SpringBootTest(
diff --git a/extensions/core/executionoutbox/restclient/src/main/java/org/apache/causeway/extensions/executionoutbox/restclient/CausewayModuleExtExecutionRestClient.java b/extensions/core/executionoutbox/restclient/src/main/java/org/apache/causeway/extensions/executionoutbox/restclient/CausewayModuleExtExecutionRestClient.java
index 28f9762a5f..eb8c5eb7e8 100644
--- a/extensions/core/executionoutbox/restclient/src/main/java/org/apache/causeway/extensions/executionoutbox/restclient/CausewayModuleExtExecutionRestClient.java
+++ b/extensions/core/executionoutbox/restclient/src/main/java/org/apache/causeway/extensions/executionoutbox/restclient/CausewayModuleExtExecutionRestClient.java
@@ -18,10 +18,11 @@
*/
package org.apache.causeway.extensions.executionoutbox.restclient;
-import org.apache.causeway.schema.CausewayModuleSchema;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.schema.CausewayModuleSchema;
+
@Configuration
@Import({
CausewayModuleSchema.class,
diff --git a/extensions/core/executionrepublisher/applib/src/main/java/org/apache/causeway/extensions/executionrepublisher/applib/CausewayModuleExtExecutionRepublisherApplib.java b/extensions/core/executionrepublisher/applib/src/main/java/org/apache/causeway/extensions/executionrepublisher/applib/CausewayModuleExtExecutionRepublisherApplib.java
index d72b2d1b14..0284de7678 100644
--- a/extensions/core/executionrepublisher/applib/src/main/java/org/apache/causeway/extensions/executionrepublisher/applib/CausewayModuleExtExecutionRepublisherApplib.java
+++ b/extensions/core/executionrepublisher/applib/src/main/java/org/apache/causeway/extensions/executionrepublisher/applib/CausewayModuleExtExecutionRepublisherApplib.java
@@ -18,12 +18,11 @@
*/
package org.apache.causeway.extensions.executionrepublisher.applib;
-import org.apache.causeway.extensions.executionoutbox.applib.dom.ExecutionOutboxEntry;
-import org.apache.causeway.extensions.executionoutbox.applib.spiimpl.ExecutionSubscriberForExecutionOutbox;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.causeway.testing.fixtures.applib.modules.ModuleWithFixtures;
+import org.apache.causeway.extensions.executionoutbox.applib.dom.ExecutionOutboxEntry;
+import org.apache.causeway.extensions.executionoutbox.applib.spiimpl.ExecutionSubscriberForExecutionOutbox;
@Configuration
@Import({
diff --git a/extensions/core/executionrepublisher/applib/src/main/java/org/apache/causeway/extensions/executionrepublisher/applib/contributions/ExecutionLogEntry_copyToOutbox.java b/extensions/core/executionrepublisher/applib/src/main/java/org/apache/causeway/extensions/executionrepublisher/applib/contributions/ExecutionLogEntry_copyToOutbox.java
index 5ad382e45e..d988352ac9 100644
--- a/extensions/core/executionrepublisher/applib/src/main/java/org/apache/causeway/extensions/executionrepublisher/applib/contributions/ExecutionLogEntry_copyToOutbox.java
+++ b/extensions/core/executionrepublisher/applib/src/main/java/org/apache/causeway/extensions/executionrepublisher/applib/contributions/ExecutionLogEntry_copyToOutbox.java
@@ -22,7 +22,6 @@ package org.apache.causeway.extensions.executionrepublisher.applib.contributions
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;
diff --git a/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/CausewayModuleExtAuditTrailApplib.java b/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/CausewayModuleExtAuditTrailApplib.java
index 66e2b73bc5..9d268d65e7 100644
--- a/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/CausewayModuleExtAuditTrailApplib.java
+++ b/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/CausewayModuleExtAuditTrailApplib.java
@@ -20,12 +20,13 @@
package org.apache.causeway.extensions.audittrail.applib;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
import org.apache.causeway.extensions.audittrail.applib.app.AuditTrailMenu;
import org.apache.causeway.extensions.audittrail.applib.contributions.HasInteractionId_auditTrailEntries;
import org.apache.causeway.extensions.audittrail.applib.contributions.Object_recentAuditTrailEntries;
import org.apache.causeway.extensions.audittrail.applib.spiimpl.EntityPropertyChangeSubscriberForAuditTrail;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
@Configuration
@Import({
diff --git a/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/app/AuditTrailMenu.java b/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/app/AuditTrailMenu.java
index 9953319b30..784a29d080 100644
--- a/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/app/AuditTrailMenu.java
+++ b/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/app/AuditTrailMenu.java
@@ -27,9 +27,16 @@ import java.util.List;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.causeway.applib.annotation.*;
import org.springframework.lang.Nullable;
+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.DomainServiceLayout;
+import org.apache.causeway.applib.annotation.MemberSupport;
+import org.apache.causeway.applib.annotation.NatureOfService;
+import org.apache.causeway.applib.annotation.RestrictTo;
+import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.services.clock.ClockService;
import org.apache.causeway.extensions.audittrail.applib.CausewayModuleExtAuditTrailApplib;
import org.apache.causeway.extensions.audittrail.applib.dom.AuditTrailEntry;
diff --git a/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/dom/AuditTrailEntry.java b/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/dom/AuditTrailEntry.java
index 418153df4a..2744c2fc00 100644
--- a/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/dom/AuditTrailEntry.java
+++ b/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/dom/AuditTrailEntry.java
@@ -27,9 +27,6 @@ import java.util.UUID;
import javax.inject.Named;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.base._Temporals;
-import org.apache.causeway.extensions.audittrail.applib.CausewayModuleExtAuditTrailApplib;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.annotation.Editing;
@@ -41,12 +38,16 @@ 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.mixins.system.DomainChangeRecord;
+import org.apache.causeway.applib.mixins.system.DomainChangeRecord.ChangeType;
import org.apache.causeway.applib.mixins.system.HasInteractionId;
import org.apache.causeway.applib.mixins.system.HasInteractionIdAndSequence;
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.publishing.spi.EntityPropertyChange;
import org.apache.causeway.applib.util.ObjectContracts;
import org.apache.causeway.applib.util.TitleBuffer;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.base._Temporals;
+import org.apache.causeway.extensions.audittrail.applib.CausewayModuleExtAuditTrailApplib;
import lombok.val;
import lombok.experimental.UtilityClass;
diff --git a/extensions/security/audittrail/applib/src/test/java/org/apache/causeway/extensions/audittrail/applib/integtests/AuditTrail_IntegTestAbstract.java b/extensions/security/audittrail/applib/src/test/java/org/apache/causeway/extensions/audittrail/applib/integtests/AuditTrail_IntegTestAbstract.java
index 977dd9a0bb..b4ca7ba37b 100644
--- a/extensions/security/audittrail/applib/src/test/java/org/apache/causeway/extensions/audittrail/applib/integtests/AuditTrail_IntegTestAbstract.java
+++ b/extensions/security/audittrail/applib/src/test/java/org/apache/causeway/extensions/audittrail/applib/integtests/AuditTrail_IntegTestAbstract.java
@@ -22,6 +22,12 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.causeway.applib.mixins.system.DomainChangeRecord;
import org.apache.causeway.applib.services.bookmark.BookmarkService;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
@@ -33,11 +39,6 @@ import org.apache.causeway.extensions.audittrail.applib.integtests.model.Counter
import org.apache.causeway.extensions.audittrail.applib.integtests.model.CounterRepository;
import org.apache.causeway.extensions.audittrail.applib.integtests.model.Counter_bumpUsingMixin;
import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
import lombok.val;
diff --git a/extensions/security/audittrail/applib/src/test/java/org/apache/causeway/extensions/audittrail/applib/integtests/model/CounterRepository.java b/extensions/security/audittrail/applib/src/test/java/org/apache/causeway/extensions/audittrail/applib/integtests/model/CounterRepository.java
index ea871dd7a3..f570b24458 100644
--- a/extensions/security/audittrail/applib/src/test/java/org/apache/causeway/extensions/audittrail/applib/integtests/model/CounterRepository.java
+++ b/extensions/security/audittrail/applib/src/test/java/org/apache/causeway/extensions/audittrail/applib/integtests/model/CounterRepository.java
@@ -21,7 +21,6 @@
package org.apache.causeway.extensions.audittrail.applib.integtests.model;
import java.util.List;
-import java.util.Objects;
import javax.inject.Inject;
diff --git a/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/causeway/extensions/audittrail/jdo/CausewayModuleExtAuditTrailPersistenceJdo.java b/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/causeway/extensions/audittrail/jdo/CausewayModuleExtAuditTrailPersistenceJdo.java
index 9731074c8d..3e1854347d 100644
--- a/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/causeway/extensions/audittrail/jdo/CausewayModuleExtAuditTrailPersistenceJdo.java
+++ b/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/causeway/extensions/audittrail/jdo/CausewayModuleExtAuditTrailPersistenceJdo.java
@@ -20,6 +20,9 @@
package org.apache.causeway.extensions.audittrail.jdo;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
import org.apache.causeway.extensions.audittrail.applib.CausewayModuleExtAuditTrailApplib;
import org.apache.causeway.extensions.audittrail.jdo.dom.AuditTrailEntry;
import org.apache.causeway.extensions.audittrail.jdo.dom.AuditTrailEntryRepository;
@@ -28,8 +31,6 @@ import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixtures
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.causeway.testing.fixtures.applib.modules.ModuleWithFixtures;
import org.apache.causeway.testing.fixtures.applib.teardown.jdo.TeardownFixtureJdoAbstract;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
@Configuration
diff --git a/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/causeway/extensions/audittrail/jdo/dom/AuditTrailEntry.java b/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/causeway/extensions/audittrail/jdo/dom/AuditTrailEntry.java
index 35ba84d0ae..adc67fdf9d 100644
--- a/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/causeway/extensions/audittrail/jdo/dom/AuditTrailEntry.java
+++ b/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/causeway/extensions/audittrail/jdo/dom/AuditTrailEntry.java
@@ -37,7 +37,6 @@ import javax.jdo.annotations.Version;
import javax.jdo.annotations.VersionStrategy;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Editing;
import org.apache.causeway.applib.annotation.Publishing;
diff --git a/extensions/security/audittrail/persistence-jdo/src/test/java/org/apache/causeway/extensions/audittrail/jdo/integtests/AuditTrail_IntegTest.java b/extensions/security/audittrail/persistence-jdo/src/test/java/org/apache/causeway/extensions/audittrail/jdo/integtests/AuditTrail_IntegTest.java
index c0497a49c2..c7fffc95a8 100644
--- a/extensions/security/audittrail/persistence-jdo/src/test/java/org/apache/causeway/extensions/audittrail/jdo/integtests/AuditTrail_IntegTest.java
+++ b/extensions/security/audittrail/persistence-jdo/src/test/java/org/apache/causeway/extensions/audittrail/jdo/integtests/AuditTrail_IntegTest.java
@@ -18,14 +18,6 @@
*/
package org.apache.causeway.extensions.audittrail.jdo.integtests;
-import org.apache.causeway.core.config.presets.CausewayPresets;
-import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
-import org.apache.causeway.extensions.audittrail.applib.integtests.AuditTrail_IntegTestAbstract;
-import org.apache.causeway.extensions.audittrail.applib.integtests.model.AuditTrailTestDomainModel;
-import org.apache.causeway.extensions.audittrail.jdo.CausewayModuleExtAuditTrailPersistenceJdo;
-import org.apache.causeway.extensions.audittrail.jdo.integtests.model.Counter;
-import org.apache.causeway.extensions.audittrail.jdo.integtests.model.CounterRepository;
-import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
@@ -35,6 +27,15 @@ import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
+import org.apache.causeway.core.config.presets.CausewayPresets;
+import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
+import org.apache.causeway.extensions.audittrail.applib.integtests.AuditTrail_IntegTestAbstract;
+import org.apache.causeway.extensions.audittrail.applib.integtests.model.AuditTrailTestDomainModel;
+import org.apache.causeway.extensions.audittrail.jdo.CausewayModuleExtAuditTrailPersistenceJdo;
+import org.apache.causeway.extensions.audittrail.jdo.integtests.model.Counter;
+import org.apache.causeway.extensions.audittrail.jdo.integtests.model.CounterRepository;
+import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
+
@SpringBootTest(
classes = AuditTrail_IntegTest.AppManifest.class
)
diff --git a/extensions/security/audittrail/persistence-jpa/src/main/java/org/apache/causeway/extensions/audittrail/jpa/CausewayModuleExtAuditTrailPersistenceJpa.java b/extensions/security/audittrail/persistence-jpa/src/main/java/org/apache/causeway/extensions/audittrail/jpa/CausewayModuleExtAuditTrailPersistenceJpa.java
index 17b82cb56e..d625437c8c 100644
--- a/extensions/security/audittrail/persistence-jpa/src/main/java/org/apache/causeway/extensions/audittrail/jpa/CausewayModuleExtAuditTrailPersistenceJpa.java
+++ b/extensions/security/audittrail/persistence-jpa/src/main/java/org/apache/causeway/extensions/audittrail/jpa/CausewayModuleExtAuditTrailPersistenceJpa.java
@@ -20,6 +20,10 @@
package org.apache.causeway.extensions.audittrail.jpa;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
import org.apache.causeway.extensions.audittrail.applib.CausewayModuleExtAuditTrailApplib;
import org.apache.causeway.extensions.audittrail.jpa.dom.AuditTrailEntry;
import org.apache.causeway.extensions.audittrail.jpa.dom.AuditTrailEntryRepository;
@@ -28,9 +32,6 @@ import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixtures
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.causeway.testing.fixtures.applib.modules.ModuleWithFixtures;
import org.apache.causeway.testing.fixtures.applib.teardown.jpa.TeardownFixtureJpaAbstract;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
@Configuration
diff --git a/extensions/security/audittrail/persistence-jpa/src/main/java/org/apache/causeway/extensions/audittrail/jpa/dom/AuditTrailEntry.java b/extensions/security/audittrail/persistence-jpa/src/main/java/org/apache/causeway/extensions/audittrail/jpa/dom/AuditTrailEntry.java
index 4cf4a65bfc..7bcd31d3b2 100644
--- a/extensions/security/audittrail/persistence-jpa/src/main/java/org/apache/causeway/extensions/audittrail/jpa/dom/AuditTrailEntry.java
+++ b/extensions/security/audittrail/persistence-jpa/src/main/java/org/apache/causeway/extensions/audittrail/jpa/dom/AuditTrailEntry.java
@@ -46,9 +46,6 @@ import org.apache.causeway.extensions.audittrail.applib.dom.AuditTrailEntry.Nq;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import org.apache.causeway.persistence.jpa.integration.typeconverters.applib.CausewayBookmarkConverter;
import org.apache.causeway.persistence.jpa.integration.typeconverters.java.util.JavaUtilUuidConverter;
-
-import lombok.Getter;
-import lombok.Setter;
@Entity
@Table(
schema = AuditTrailEntry.SCHEMA,
diff --git a/extensions/security/audittrail/persistence-jpa/src/test/java/org/apache/causeway/extensions/audittrail/jpa/integtests/AuditTrail_IntegTest.java b/extensions/security/audittrail/persistence-jpa/src/test/java/org/apache/causeway/extensions/audittrail/jpa/integtests/AuditTrail_IntegTest.java
index ee067f4d96..895df6346f 100644
--- a/extensions/security/audittrail/persistence-jpa/src/test/java/org/apache/causeway/extensions/audittrail/jpa/integtests/AuditTrail_IntegTest.java
+++ b/extensions/security/audittrail/persistence-jpa/src/test/java/org/apache/causeway/extensions/audittrail/jpa/integtests/AuditTrail_IntegTest.java
@@ -20,15 +20,6 @@ package org.apache.causeway.extensions.audittrail.jpa.integtests;
import javax.inject.Inject;
-import org.apache.causeway.core.config.beans.CausewayBeanTypeRegistry;
-import org.apache.causeway.core.config.presets.CausewayPresets;
-import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
-import org.apache.causeway.extensions.audittrail.applib.integtests.AuditTrail_IntegTestAbstract;
-import org.apache.causeway.extensions.audittrail.applib.integtests.model.AuditTrailTestDomainModel;
-import org.apache.causeway.extensions.audittrail.jpa.CausewayModuleExtAuditTrailPersistenceJpa;
-import org.apache.causeway.extensions.audittrail.jpa.integtests.model.Counter;
-import org.apache.causeway.extensions.audittrail.jpa.integtests.model.CounterRepository;
-import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.domain.EntityScan;
@@ -39,6 +30,16 @@ import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
+import org.apache.causeway.core.config.beans.CausewayBeanTypeRegistry;
+import org.apache.causeway.core.config.presets.CausewayPresets;
+import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
+import org.apache.causeway.extensions.audittrail.applib.integtests.AuditTrail_IntegTestAbstract;
+import org.apache.causeway.extensions.audittrail.applib.integtests.model.AuditTrailTestDomainModel;
+import org.apache.causeway.extensions.audittrail.jpa.CausewayModuleExtAuditTrailPersistenceJpa;
+import org.apache.causeway.extensions.audittrail.jpa.integtests.model.Counter;
+import org.apache.causeway.extensions.audittrail.jpa.integtests.model.CounterRepository;
+import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
+
@SpringBootTest(
classes = AuditTrail_IntegTest.AppManifest.class,
properties = {
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/CausewayModuleExtSecmanApplib.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/CausewayModuleExtSecmanApplib.java
index 8a6dfcd694..26383e1c7b 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/CausewayModuleExtSecmanApplib.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/CausewayModuleExtSecmanApplib.java
@@ -18,6 +18,9 @@
*/
package org.apache.causeway.extensions.secman.applib;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
import org.apache.causeway.extensions.secman.applib.feature.api.ApplicationFeatureChoices;
import org.apache.causeway.extensions.secman.applib.feature.contributions.ApplicationFeatureViewModel_permissions;
import org.apache.causeway.extensions.secman.applib.permission.app.ApplicationOrphanedPermissionManager;
@@ -79,9 +82,6 @@ import org.apache.causeway.extensions.secman.applib.user.man.mixins.ApplicationU
import org.apache.causeway.extensions.secman.applib.user.man.mixins.ApplicationUserManager_newLocalUser;
import org.apache.causeway.extensions.secman.applib.user.menu.ApplicationUserMenu;
import org.apache.causeway.extensions.secman.applib.user.menu.MeService;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib;
/**
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/feature/api/ApplicationFeatureChoices.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/feature/api/ApplicationFeatureChoices.java
index fcb2e05be8..4bffa52485 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/feature/api/ApplicationFeatureChoices.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/feature/api/ApplicationFeatureChoices.java
@@ -28,8 +28,6 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.causeway.commons.internal.functions._Predicates;
-import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.ViewModel;
@@ -38,9 +36,10 @@ import org.apache.causeway.applib.annotation.MinLength;
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.Title;
import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
import org.apache.causeway.applib.services.appfeat.ApplicationFeatureRepository;
+import org.apache.causeway.commons.internal.functions._Predicates;
+import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/permission/dom/ApplicationPermission.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/permission/dom/ApplicationPermission.java
index 9650f257d4..c529eb23cb 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/permission/dom/ApplicationPermission.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/permission/dom/ApplicationPermission.java
@@ -30,9 +30,6 @@ import java.util.function.Function;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
-import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
-import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRole;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.annotation.Editing;
@@ -49,6 +46,9 @@ import org.apache.causeway.applib.services.appfeat.ApplicationFeatureRepository;
import org.apache.causeway.applib.services.appfeat.ApplicationFeatureSort;
import org.apache.causeway.applib.services.appfeat.ApplicationMemberSort;
import org.apache.causeway.applib.util.ObjectContracts;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
+import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
+import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRole;
import lombok.val;
import lombok.experimental.UtilityClass;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/permission/dom/ApplicationPermissionMode.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/permission/dom/ApplicationPermissionMode.java
index bc65c986fd..a9302b300f 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/permission/dom/ApplicationPermissionMode.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/permission/dom/ApplicationPermissionMode.java
@@ -18,9 +18,8 @@
*/
package org.apache.causeway.extensions.secman.applib.permission.dom;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.services.appfeat.ApplicationFeature;
+import org.apache.causeway.commons.internal.base._Strings;
/**
* Named after UNIX modes (<code>chmod</code> etc), determines that nature of access (of denial of access if vetoed)
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/permission/dom/ApplicationPermissionRepositoryAbstract.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/permission/dom/ApplicationPermissionRepositoryAbstract.java
index 140e0b31e1..bda36265bc 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/permission/dom/ApplicationPermissionRepositoryAbstract.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/permission/dom/ApplicationPermissionRepositoryAbstract.java
@@ -26,14 +26,6 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
import javax.inject.Provider;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.commons.internal.collections._Multimaps;
-import org.apache.causeway.commons.internal.collections._Sets;
-import org.apache.causeway.commons.internal.collections._Multimaps.ListMultimap;
-import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRole;
-import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser;
import org.apache.causeway.applib.query.Query;
import org.apache.causeway.applib.services.appfeat.ApplicationFeature;
import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
@@ -45,6 +37,14 @@ import org.apache.causeway.applib.services.queryresultscache.QueryResultsCache;
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.applib.services.user.RoleMemento;
import org.apache.causeway.applib.services.user.UserMemento;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.commons.internal.base._NullSafe;
+import org.apache.causeway.commons.internal.collections._Lists;
+import org.apache.causeway.commons.internal.collections._Multimaps;
+import org.apache.causeway.commons.internal.collections._Multimaps.ListMultimap;
+import org.apache.causeway.commons.internal.collections._Sets;
+import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRole;
+import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser;
import lombok.NonNull;
import lombok.val;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/permission/dom/ApplicationPermissionRule.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/permission/dom/ApplicationPermissionRule.java
index 279e3a4bd7..31cd8ff279 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/permission/dom/ApplicationPermissionRule.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/permission/dom/ApplicationPermissionRule.java
@@ -18,9 +18,8 @@
*/
package org.apache.causeway.extensions.secman.applib.permission.dom;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.services.appfeat.ApplicationFeature;
+import org.apache.causeway.commons.internal.base._Strings;
/**
* Whether the permission {@link #ALLOW grants} or {@link #VETO denies} access to an
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/permission/dom/ApplicationPermissionValueSet.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/permission/dom/ApplicationPermissionValueSet.java
index f7b171ac4d..08c4465e53 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/permission/dom/ApplicationPermissionValueSet.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/permission/dom/ApplicationPermissionValueSet.java
@@ -22,12 +22,12 @@ import java.io.Serializable;
import java.util.Collections;
import java.util.List;
+import org.apache.causeway.applib.annotation.Programmatic;
+import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.commons.internal.collections._Multimaps;
import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
import org.apache.causeway.extensions.secman.applib.permission.spi.PermissionsEvaluationService;
-import org.apache.causeway.applib.annotation.Programmatic;
-import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
import lombok.val;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/dom/ApplicationRoleRepositoryAbstract.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/dom/ApplicationRoleRepositoryAbstract.java
index 694c5aa192..36e6737499 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/dom/ApplicationRoleRepositoryAbstract.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/dom/ApplicationRoleRepositoryAbstract.java
@@ -27,14 +27,14 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Provider;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.collections._Sets;
import org.springframework.stereotype.Repository;
import org.apache.causeway.applib.query.Query;
import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.services.queryresultscache.QueryResultsCache;
import org.apache.causeway.applib.services.repository.RepositoryService;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.commons.internal.collections._Sets;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
import org.apache.causeway.extensions.secman.applib.permission.dom.mixins.ApplicationPermission_delete;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/dom/mixins/ApplicationRole_addUser.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/dom/mixins/ApplicationRole_addUser.java
index 28723a183e..5121b14777 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/dom/mixins/ApplicationRole_addUser.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/dom/mixins/ApplicationRole_addUser.java
@@ -23,6 +23,10 @@ import java.util.List;
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.SemanticsOf;
import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRole;
@@ -30,10 +34,6 @@ import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRoleRepo
import org.apache.causeway.extensions.secman.applib.role.dom.mixins.ApplicationRole_addUser.DomainEvent;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUserRepository;
-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 lombok.RequiredArgsConstructor;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/dom/mixins/ApplicationRole_removePermissions.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/dom/mixins/ApplicationRole_removePermissions.java
index 0305b91e04..f83e6eb3f9 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/dom/mixins/ApplicationRole_removePermissions.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/dom/mixins/ApplicationRole_removePermissions.java
@@ -23,8 +23,6 @@ import java.util.Objects;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.base._NullSafe;
-
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
import org.apache.causeway.applib.annotation.MemberSupport;
@@ -32,6 +30,7 @@ import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.services.message.MessageService;
import org.apache.causeway.applib.services.repository.RepositoryService;
+import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.CausewayConfiguration.Extensions.Secman;
import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/dom/mixins/ApplicationRole_removeUsers.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/dom/mixins/ApplicationRole_removeUsers.java
index bf1f5cae23..e7ee81c20b 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/dom/mixins/ApplicationRole_removeUsers.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/dom/mixins/ApplicationRole_removeUsers.java
@@ -22,6 +22,12 @@ import java.util.Collection;
import javax.inject.Inject;
+import org.apache.causeway.applib.annotation.Action;
+import org.apache.causeway.applib.annotation.ActionLayout;
+import org.apache.causeway.applib.annotation.Domain;
+import org.apache.causeway.applib.annotation.MemberSupport;
+import org.apache.causeway.applib.annotation.SemanticsOf;
+import org.apache.causeway.applib.services.message.MessageService;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRole;
@@ -29,12 +35,6 @@ import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRoleRepo
import org.apache.causeway.extensions.secman.applib.role.dom.mixins.ApplicationRole_removeUsers.DomainEvent;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUserRepository;
-import org.apache.causeway.applib.annotation.Action;
-import org.apache.causeway.applib.annotation.ActionLayout;
-import org.apache.causeway.applib.annotation.Domain;
-import org.apache.causeway.applib.annotation.MemberSupport;
-import org.apache.causeway.applib.annotation.SemanticsOf;
-import org.apache.causeway.applib.services.message.MessageService;
import lombok.RequiredArgsConstructor;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/fixtures/AbstractRoleAndPermissionsFixtureScript.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/fixtures/AbstractRoleAndPermissionsFixtureScript.java
index 3cbd17dfcd..6c4fa8cff0 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/fixtures/AbstractRoleAndPermissionsFixtureScript.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/fixtures/AbstractRoleAndPermissionsFixtureScript.java
@@ -22,13 +22,12 @@ import java.util.function.Supplier;
import javax.inject.Inject;
+import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionMode;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionRepository;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionRule;
import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRoleRepository;
-import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
-
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
import lombok.val;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayAppFeatureRoleAndPermissions.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayAppFeatureRoleAndPermissions.java
index 0382a67321..27e9842c13 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayAppFeatureRoleAndPermissions.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayAppFeatureRoleAndPermissions.java
@@ -18,13 +18,13 @@
*/
package org.apache.causeway.extensions.secman.applib.role.seed;
+import org.apache.causeway.applib.CausewayModuleApplib;
+import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
+import org.apache.causeway.applib.services.appfeatui.ApplicationFeatureMenu;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionMode;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionRule;
import org.apache.causeway.extensions.secman.applib.role.fixtures.AbstractRoleAndPermissionsFixtureScript;
-import org.apache.causeway.applib.CausewayModuleApplib;
-import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
-import org.apache.causeway.applib.services.appfeatui.ApplicationFeatureMenu;
/**
* @since 2.0 {@index}
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayConfigurationRoleAndPermissions.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayConfigurationRoleAndPermissions.java
index 0a524642bd..12927bbe3d 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayConfigurationRoleAndPermissions.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayConfigurationRoleAndPermissions.java
@@ -18,13 +18,13 @@
*/
package org.apache.causeway.extensions.secman.applib.role.seed;
+import org.apache.causeway.applib.CausewayModuleApplib;
+import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
+import org.apache.causeway.applib.services.confview.ConfigurationMenu;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionMode;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionRule;
import org.apache.causeway.extensions.secman.applib.role.fixtures.AbstractRoleAndPermissionsFixtureScript;
-import org.apache.causeway.applib.CausewayModuleApplib;
-import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
-import org.apache.causeway.applib.services.confview.ConfigurationMenu;
/**
* @since 2.0 {@index}
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtAuditTrailRoleAndPermissions.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtAuditTrailRoleAndPermissions.java
index 9834433ae8..e7900e2336 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtAuditTrailRoleAndPermissions.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtAuditTrailRoleAndPermissions.java
@@ -18,11 +18,11 @@
*/
package org.apache.causeway.extensions.secman.applib.role.seed;
+import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionMode;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionRule;
import org.apache.causeway.extensions.secman.applib.role.fixtures.AbstractRoleAndPermissionsFixtureScript;
-import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
/**
* Access to the command replay primary menu.
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtCommandLogRoleAndPermissions.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtCommandLogRoleAndPermissions.java
index 4d0a8e8f02..a8f297f5f8 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtCommandLogRoleAndPermissions.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtCommandLogRoleAndPermissions.java
@@ -18,11 +18,11 @@
*/
package org.apache.causeway.extensions.secman.applib.role.seed;
+import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionMode;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionRule;
import org.apache.causeway.extensions.secman.applib.role.fixtures.AbstractRoleAndPermissionsFixtureScript;
-import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
/**
* Access to the command replay primary menu.
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtExecutionLogRoleAndPermissions.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtExecutionLogRoleAndPermissions.java
index 4468bbb195..0797fa2c4a 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtExecutionLogRoleAndPermissions.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtExecutionLogRoleAndPermissions.java
@@ -18,11 +18,11 @@
*/
package org.apache.causeway.extensions.secman.applib.role.seed;
+import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionMode;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionRule;
import org.apache.causeway.extensions.secman.applib.role.fixtures.AbstractRoleAndPermissionsFixtureScript;
-import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
/**
* Access to the command replay primary menu.
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtExecutionOutboxRoleAndPermissions.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtExecutionOutboxRoleAndPermissions.java
index feea1c6630..d439b0336f 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtExecutionOutboxRoleAndPermissions.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtExecutionOutboxRoleAndPermissions.java
@@ -18,11 +18,11 @@
*/
package org.apache.causeway.extensions.secman.applib.role.seed;
+import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionMode;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionRule;
import org.apache.causeway.extensions.secman.applib.role.fixtures.AbstractRoleAndPermissionsFixtureScript;
-import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
/**
* Access to the command replay primary menu.
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtH2ConsoleRoleAndPermissions.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtH2ConsoleRoleAndPermissions.java
index bbc974546d..9921435235 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtH2ConsoleRoleAndPermissions.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtH2ConsoleRoleAndPermissions.java
@@ -18,11 +18,11 @@
*/
package org.apache.causeway.extensions.secman.applib.role.seed;
+import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionMode;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionRule;
import org.apache.causeway.extensions.secman.applib.role.fixtures.AbstractRoleAndPermissionsFixtureScript;
-import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
/**
* Access to the h2 console UI.
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtSecmanAdminRoleAndPermissions.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtSecmanAdminRoleAndPermissions.java
index f49d3313f7..4c3d4b8682 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtSecmanAdminRoleAndPermissions.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtSecmanAdminRoleAndPermissions.java
@@ -23,10 +23,9 @@ import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._NullSafe;
-
-import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
import org.apache.causeway.core.config.CausewayConfiguration.Extensions.Secman;
import org.apache.causeway.core.config.CausewayConfiguration.Extensions.Secman.Seed.Admin;
import org.apache.causeway.core.config.CausewayConfiguration.Extensions.Secman.Seed.Admin.NamespacePermissions;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtSecmanRegularUserRoleAndPermissions.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtSecmanRegularUserRoleAndPermissions.java
index 5f98851247..e679562889 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtSecmanRegularUserRoleAndPermissions.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtSecmanRegularUserRoleAndPermissions.java
@@ -18,10 +18,9 @@
*/
package org.apache.causeway.extensions.secman.applib.role.seed;
-import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.config.CausewayConfiguration.Extensions.Secman;
import org.apache.causeway.core.security.CausewayModuleCoreSecurity;
import org.apache.causeway.core.security.authentication.logout.LogoutMenu;
@@ -31,7 +30,6 @@ import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRole;
import org.apache.causeway.extensions.secman.applib.role.fixtures.AbstractRoleAndPermissionsFixtureScript;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser;
import org.apache.causeway.extensions.secman.applib.user.menu.MeService;
-
import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib;
import lombok.val;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtSessionLogRoleAndPermissions.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtSessionLogRoleAndPermissions.java
index e0d76869fa..bd17ae0f67 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtSessionLogRoleAndPermissions.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtSessionLogRoleAndPermissions.java
@@ -18,11 +18,11 @@
*/
package org.apache.causeway.extensions.secman.applib.role.seed;
+import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionMode;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionRule;
import org.apache.causeway.extensions.secman.applib.role.fixtures.AbstractRoleAndPermissionsFixtureScript;
-import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
/**
* Access to the command replay primary menu.
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayPersistenceJdoMetaModelRoleAndPermissions.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayPersistenceJdoMetaModelRoleAndPermissions.java
index 41ec268e4c..78c4c187b9 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayPersistenceJdoMetaModelRoleAndPermissions.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayPersistenceJdoMetaModelRoleAndPermissions.java
@@ -18,11 +18,11 @@
*/
package org.apache.causeway.extensions.secman.applib.role.seed;
+import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionMode;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionRule;
import org.apache.causeway.extensions.secman.applib.role.fixtures.AbstractRoleAndPermissionsFixtureScript;
-import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
/**
* Provides access to download the JDO metamodel.
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewaySudoImpersonateRoleAndPermissions.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewaySudoImpersonateRoleAndPermissions.java
index 8c39c5fe5d..5f08c07629 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewaySudoImpersonateRoleAndPermissions.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewaySudoImpersonateRoleAndPermissions.java
@@ -18,12 +18,12 @@
*/
package org.apache.causeway.extensions.secman.applib.role.seed;
+import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
+import org.apache.causeway.applib.services.user.ImpersonateMenu;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionMode;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionRule;
import org.apache.causeway.extensions.secman.applib.role.fixtures.AbstractRoleAndPermissionsFixtureScript;
-import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
-import org.apache.causeway.applib.services.user.ImpersonateMenu;
/**
* @since 2.0 {@index}
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayViewerRestfulObjectsSwaggerRoleAndPermissions.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayViewerRestfulObjectsSwaggerRoleAndPermissions.java
index 7d7ca12c2d..5449771dfd 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayViewerRestfulObjectsSwaggerRoleAndPermissions.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayViewerRestfulObjectsSwaggerRoleAndPermissions.java
@@ -18,11 +18,11 @@
*/
package org.apache.causeway.extensions.secman.applib.role.seed;
+import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionMode;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionRule;
import org.apache.causeway.extensions.secman.applib.role.fixtures.AbstractRoleAndPermissionsFixtureScript;
-import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
/**
* Provides access to open up the Swagger UI.
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/seed/SeedSecurityModuleService.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/seed/SeedSecurityModuleService.java
index e78a00e66d..1e9bc54c2d 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/seed/SeedSecurityModuleService.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/seed/SeedSecurityModuleService.java
@@ -31,7 +31,6 @@ import org.apache.causeway.applib.events.metamodel.MetamodelEvent;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
import org.apache.causeway.extensions.secman.applib.seed.scripts.SeedUsersAndRolesFixtureScript;
-
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScripts;
import lombok.RequiredArgsConstructor;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/seed/scripts/SeedUsersAndRolesFixtureScript.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/seed/scripts/SeedUsersAndRolesFixtureScript.java
index 41e2e981f4..906d3c0f3e 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/seed/scripts/SeedUsersAndRolesFixtureScript.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/seed/scripts/SeedUsersAndRolesFixtureScript.java
@@ -37,7 +37,6 @@ import org.apache.causeway.extensions.secman.applib.role.seed.CausewayViewerRest
import org.apache.causeway.extensions.secman.applib.seed.SeedSecurityModuleService;
import org.apache.causeway.extensions.secman.applib.tenancy.seed.GlobalTenancy;
import org.apache.causeway.extensions.secman.applib.user.seed.CausewayExtSecmanAdminUser;
-
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
import lombok.val;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/tenancy/dom/ApplicationTenancyRepositoryAbstract.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/tenancy/dom/ApplicationTenancyRepositoryAbstract.java
index 79c1382cc1..85eecd64f2 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/tenancy/dom/ApplicationTenancyRepositoryAbstract.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/tenancy/dom/ApplicationTenancyRepositoryAbstract.java
@@ -24,13 +24,13 @@ import java.util.Collections;
import javax.inject.Inject;
import javax.inject.Provider;
-import org.apache.causeway.commons.internal.collections._Sets;
-import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser;
-import org.apache.causeway.extensions.secman.applib.util.RegexReplacer;
import org.apache.causeway.applib.query.Query;
import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.services.queryresultscache.QueryResultsCache;
import org.apache.causeway.applib.services.repository.RepositoryService;
+import org.apache.causeway.commons.internal.collections._Sets;
+import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser;
+import org.apache.causeway.extensions.secman.applib.util.RegexReplacer;
import lombok.NonNull;
import lombok.val;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/tenancy/dom/mixins/ApplicationTenancy_addChild.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/tenancy/dom/mixins/ApplicationTenancy_addChild.java
index 68d57d89c4..e68f0f2ea7 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/tenancy/dom/mixins/ApplicationTenancy_addChild.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/tenancy/dom/mixins/ApplicationTenancy_addChild.java
@@ -23,15 +23,15 @@ import java.util.Objects;
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.SemanticsOf;
import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
import org.apache.causeway.extensions.secman.applib.tenancy.dom.ApplicationTenancy;
import org.apache.causeway.extensions.secman.applib.tenancy.dom.ApplicationTenancyRepository;
import org.apache.causeway.extensions.secman.applib.tenancy.dom.mixins.ApplicationTenancy_addChild.DomainEvent;
-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 lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/tenancy/dom/mixins/ApplicationTenancy_addUser.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/tenancy/dom/mixins/ApplicationTenancy_addUser.java
index 1f312bd397..4939d7ec83 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/tenancy/dom/mixins/ApplicationTenancy_addUser.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/tenancy/dom/mixins/ApplicationTenancy_addUser.java
@@ -23,6 +23,11 @@ import java.util.List;
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.MinLength;
+import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
import org.apache.causeway.extensions.secman.applib.tenancy.dom.ApplicationTenancy;
@@ -30,11 +35,6 @@ import org.apache.causeway.extensions.secman.applib.tenancy.dom.ApplicationTenan
import org.apache.causeway.extensions.secman.applib.tenancy.dom.mixins.ApplicationTenancy_addUser.DomainEvent;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUserRepository;
-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.MinLength;
-import org.apache.causeway.applib.annotation.SemanticsOf;
import lombok.RequiredArgsConstructor;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/tenancy/fixtures/AbstractTenancyFixtureScript.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/tenancy/fixtures/AbstractTenancyFixtureScript.java
index 33499b4e8a..0d40491517 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/tenancy/fixtures/AbstractTenancyFixtureScript.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/tenancy/fixtures/AbstractTenancyFixtureScript.java
@@ -22,7 +22,6 @@ import javax.inject.Inject;
import org.apache.causeway.extensions.secman.applib.tenancy.dom.ApplicationTenancy;
import org.apache.causeway.extensions.secman.applib.tenancy.dom.ApplicationTenancyRepository;
-
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
public abstract class AbstractTenancyFixtureScript extends FixtureScript {
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/tenancy/seed/GlobalTenancy.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/tenancy/seed/GlobalTenancy.java
index 8db3a6ec0d..58d4a27e06 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/tenancy/seed/GlobalTenancy.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/tenancy/seed/GlobalTenancy.java
@@ -19,7 +19,6 @@
package org.apache.causeway.extensions.secman.applib.tenancy.seed;
import org.apache.causeway.extensions.secman.applib.tenancy.fixtures.AbstractTenancyFixtureScript;
-
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
/**
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/ApplicationUser.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/ApplicationUser.java
index d8679319a5..a5082835a8 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/ApplicationUser.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/ApplicationUser.java
@@ -29,13 +29,8 @@ import java.util.Set;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.collections._Lists;
-
import org.apache.causeway.applib.annotation.Collection;
import org.apache.causeway.applib.annotation.CollectionLayout;
-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;
@@ -54,6 +49,9 @@ import org.apache.causeway.applib.services.user.RoleMemento;
import org.apache.causeway.applib.services.user.UserMemento;
import org.apache.causeway.applib.services.user.UserService;
import org.apache.causeway.applib.util.ObjectContracts;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.CausewayConfiguration.Extensions.Secman;
import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/ApplicationUserRepositoryAbstract.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/ApplicationUserRepositoryAbstract.java
index c485285101..497fb2d1c9 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/ApplicationUserRepositoryAbstract.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/ApplicationUserRepositoryAbstract.java
@@ -27,9 +27,6 @@ import java.util.function.Consumer;
import javax.inject.Inject;
import javax.inject.Provider;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.collections._Sets;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.lang.Nullable;
@@ -40,6 +37,9 @@ import org.apache.causeway.applib.services.eventbus.EventBusService;
import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.services.queryresultscache.QueryResultsCache;
import org.apache.causeway.applib.services.repository.RepositoryService;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.commons.internal.base._NullSafe;
+import org.apache.causeway.commons.internal.collections._Sets;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRole;
import org.apache.causeway.extensions.secman.applib.tenancy.dom.ApplicationTenancy;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/mixins/ApplicationUser_addRole.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/mixins/ApplicationUser_addRole.java
index 5d48fdcc86..2e3702a707 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/mixins/ApplicationUser_addRole.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/mixins/ApplicationUser_addRole.java
@@ -22,16 +22,16 @@ import java.util.Collection;
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.SemanticsOf;
import org.apache.causeway.commons.internal.collections._Sets;
import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRole;
import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRoleRepository;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser;
import org.apache.causeway.extensions.secman.applib.user.dom.mixins.ApplicationUser_addRole.DomainEvent;
-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 lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/mixins/ApplicationUser_removeRoles.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/mixins/ApplicationUser_removeRoles.java
index cf04dfcef4..e652cc2147 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/mixins/ApplicationUser_removeRoles.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/mixins/ApplicationUser_removeRoles.java
@@ -22,6 +22,11 @@ import java.util.Collection;
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.SemanticsOf;
+import org.apache.causeway.applib.services.message.MessageService;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRole;
@@ -30,11 +35,6 @@ import org.apache.causeway.extensions.secman.applib.role.dom.mixins.ApplicationR
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUserRepository;
import org.apache.causeway.extensions.secman.applib.user.dom.mixins.ApplicationUser_removeRoles.DomainEvent;
-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 org.apache.causeway.applib.services.message.MessageService;
import lombok.RequiredArgsConstructor;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/mixins/ApplicationUser_timeZone.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/mixins/ApplicationUser_timeZone.java
index d8468dde8a..1fd508f0fb 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/mixins/ApplicationUser_timeZone.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/mixins/ApplicationUser_timeZone.java
@@ -20,8 +20,6 @@ package org.apache.causeway.extensions.secman.applib.user.dom.mixins;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.base._Temporals;
-import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.annotation.Editing;
@@ -30,6 +28,8 @@ 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.services.user.UserCurrentSessionTimeZoneHolder;
+import org.apache.causeway.commons.internal.base._Temporals;
+import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser;
import lombok.RequiredArgsConstructor;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/mixins/perms/UserPermissionViewModel.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/mixins/perms/UserPermissionViewModel.java
index 376e790bc3..c2b470a3c4 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/mixins/perms/UserPermissionViewModel.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/mixins/perms/UserPermissionViewModel.java
@@ -30,17 +30,6 @@ import java.util.function.Function;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.causeway.commons.internal.base._Bytes;
-import org.apache.causeway.commons.internal.resources._Serializables;
-import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
-import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermission;
-import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionMode;
-import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionRepository;
-import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionRule;
-import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionValue;
-import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionValueSet;
-import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser;
-import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUserRepository;
import org.apache.causeway.applib.ViewModel;
import org.apache.causeway.applib.annotation.BookmarkPolicy;
import org.apache.causeway.applib.annotation.DomainObject;
@@ -60,6 +49,17 @@ import org.apache.causeway.applib.services.appfeatui.ApplicationFeatureViewModel
import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.util.ObjectContracts;
import org.apache.causeway.applib.util.ToString;
+import org.apache.causeway.commons.internal.base._Bytes;
+import org.apache.causeway.commons.internal.resources._Serializables;
+import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
+import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermission;
+import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionMode;
+import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionRepository;
+import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionRule;
+import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionValue;
+import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionValueSet;
+import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser;
+import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUserRepository;
import lombok.Getter;
import lombok.Setter;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/fixtures/AbstractUserAndRolesFixtureScript.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/fixtures/AbstractUserAndRolesFixtureScript.java
index 524fbd9e55..e8c354c157 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/fixtures/AbstractUserAndRolesFixtureScript.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/fixtures/AbstractUserAndRolesFixtureScript.java
@@ -22,6 +22,8 @@ import java.util.function.Supplier;
import javax.inject.Inject;
+import org.apache.causeway.applib.services.inject.ServiceInjector;
+import org.apache.causeway.applib.value.Password;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRoleRepository;
@@ -29,9 +31,6 @@ import org.apache.causeway.extensions.secman.applib.user.dom.AccountType;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUserRepository;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUserStatus;
-import org.apache.causeway.applib.services.inject.ServiceInjector;
-import org.apache.causeway.applib.value.Password;
-
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
import lombok.Getter;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/seed/CausewayExtSecmanAdminUser.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/seed/CausewayExtSecmanAdminUser.java
index 3c9b257ddd..b4caad79f5 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/seed/CausewayExtSecmanAdminUser.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/seed/CausewayExtSecmanAdminUser.java
@@ -18,10 +18,7 @@
*/
package org.apache.causeway.extensions.secman.applib.user.seed;
-import java.util.Collection;
-
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.config.CausewayConfiguration.Extensions.Secman;
import org.apache.causeway.extensions.secman.applib.tenancy.seed.GlobalTenancy;
import org.apache.causeway.extensions.secman.applib.user.dom.AccountType;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/util/ApplicationSecurityDto.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/util/ApplicationSecurityDto.java
index f40522ae0c..0d2f944ad8 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/util/ApplicationSecurityDto.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/util/ApplicationSecurityDto.java
@@ -21,6 +21,7 @@ package org.apache.causeway.extensions.secman.applib.util;
import java.util.ArrayList;
import java.util.List;
+import org.apache.causeway.applib.services.appfeat.ApplicationFeatureSort;
import org.apache.causeway.commons.internal.resources._Yaml;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermission;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionMode;
@@ -29,7 +30,6 @@ import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRole;
import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRoleRepository;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUserRepository;
-import org.apache.causeway.applib.services.appfeat.ApplicationFeatureSort;
import lombok.Data;
import lombok.NonNull;
diff --git a/extensions/security/secman/applib/src/test/java/org/apache/causeway/extensions/secman/applib/ApplicationPermissionRepositoryIntegTestAbstract.java b/extensions/security/secman/applib/src/test/java/org/apache/causeway/extensions/secman/applib/ApplicationPermissionRepositoryIntegTestAbstract.java
index c6e4506b3d..dd536b47e2 100644
--- a/extensions/security/secman/applib/src/test/java/org/apache/causeway/extensions/secman/applib/ApplicationPermissionRepositoryIntegTestAbstract.java
+++ b/extensions/security/secman/applib/src/test/java/org/apache/causeway/extensions/secman/applib/ApplicationPermissionRepositoryIntegTestAbstract.java
@@ -36,7 +36,6 @@ import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRoleRepo
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUserRepository;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUserStatus;
-
import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
import static org.apache.causeway.applib.services.appfeat.ApplicationFeatureId.newType;
diff --git a/extensions/security/secman/applib/src/test/java/org/apache/causeway/extensions/secman/applib/mmm/MmmModule.java b/extensions/security/secman/applib/src/test/java/org/apache/causeway/extensions/secman/applib/mmm/MmmModule.java
index 0a3af2da15..381bcd733a 100644
--- a/extensions/security/secman/applib/src/test/java/org/apache/causeway/extensions/secman/applib/mmm/MmmModule.java
+++ b/extensions/security/secman/applib/src/test/java/org/apache/causeway/extensions/secman/applib/mmm/MmmModule.java
@@ -18,12 +18,13 @@
*/
package org.apache.causeway.extensions.secman.applib.mmm;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
import org.apache.causeway.extensions.secman.applib.mmm.dom.ChaseCatsService;
import org.apache.causeway.extensions.secman.applib.mmm.dom.EatCheeseService;
import org.apache.causeway.extensions.secman.applib.mmm.dom.PressLiftButtonService;
import org.apache.causeway.extensions.secman.applib.mmm.dom.RideLiftService;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
@Configuration
@Import({
diff --git a/extensions/security/secman/applib/src/test/java/org/apache/causeway/extensions/secman/applib/user/dom/mixins/perms/UserPermissionViewModelTest.java b/extensions/security/secman/applib/src/test/java/org/apache/causeway/extensions/secman/applib/user/dom/mixins/perms/UserPermissionViewModelTest.java
index ff08a87db9..b20586cd71 100644
--- a/extensions/security/secman/applib/src/test/java/org/apache/causeway/extensions/secman/applib/user/dom/mixins/perms/UserPermissionViewModelTest.java
+++ b/extensions/security/secman/applib/src/test/java/org/apache/causeway/extensions/secman/applib/user/dom/mixins/perms/UserPermissionViewModelTest.java
@@ -23,6 +23,10 @@ import java.util.List;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.id.LogicalType;
import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
@@ -33,11 +37,6 @@ import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPe
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionValueSet;
import org.apache.causeway.extensions.secman.applib.permission.spi.PermissionsEvaluationService;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser;
-import org.apache.causeway.extensions.secman.applib.user.dom.mixins.perms.UserPermissionViewModel;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
import lombok.val;
diff --git a/extensions/security/secman/delegated-shiro/src/main/java/org/apache/causeway/extensions/secman/delegated/shiro/realm/AuthInfoForApplicationUser.java b/extensions/security/secman/delegated-shiro/src/main/java/org/apache/causeway/extensions/secman/delegated/shiro/realm/AuthInfoForApplicationUser.java
index df5fd374cb..e88b107a05 100644
--- a/extensions/security/secman/delegated-shiro/src/main/java/org/apache/causeway/extensions/secman/delegated/shiro/realm/AuthInfoForApplicationUser.java
+++ b/extensions/security/secman/delegated-shiro/src/main/java/org/apache/causeway/extensions/secman/delegated/shiro/realm/AuthInfoForApplicationUser.java
@@ -21,14 +21,15 @@ package org.apache.causeway.extensions.secman.delegated.shiro.realm;
import java.util.Collection;
-import org.apache.causeway.commons.internal.base._Lazy;
-import org.apache.causeway.extensions.secman.delegated.shiro.util.ShiroUtils;
import org.apache.shiro.authc.AuthenticationInfo;
import org.apache.shiro.authz.AuthorizationInfo;
import org.apache.shiro.authz.Permission;
import org.apache.shiro.subject.PrincipalCollection;
import org.apache.shiro.subject.SimplePrincipalCollection;
+import org.apache.causeway.commons.internal.base._Lazy;
+import org.apache.causeway.extensions.secman.delegated.shiro.util.ShiroUtils;
+
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NonNull;
diff --git a/extensions/security/secman/delegated-shiro/src/main/java/org/apache/causeway/extensions/secman/delegated/shiro/realm/AuthenticationStrategyForSecMan.java b/extensions/security/secman/delegated-shiro/src/main/java/org/apache/causeway/extensions/secman/delegated/shiro/realm/AuthenticationStrategyForSecMan.java
index 41e5bbf963..ca7ce7ca64 100644
--- a/extensions/security/secman/delegated-shiro/src/main/java/org/apache/causeway/extensions/secman/delegated/shiro/realm/AuthenticationStrategyForSecMan.java
+++ b/extensions/security/secman/delegated-shiro/src/main/java/org/apache/causeway/extensions/secman/delegated/shiro/realm/AuthenticationStrategyForSecMan.java
@@ -28,7 +28,6 @@ import org.apache.shiro.authc.SimpleAuthenticationInfo;
import org.apache.shiro.authc.pam.AllSuccessfulStrategy;
import org.apache.shiro.realm.Realm;
-
import lombok.val;
public class AuthenticationStrategyForSecMan extends AllSuccessfulStrategy {
diff --git a/extensions/security/secman/delegated-shiro/src/main/java/org/apache/causeway/extensions/secman/delegated/shiro/realm/CausewayModuleExtSecmanShiroRealm.java b/extensions/security/secman/delegated-shiro/src/main/java/org/apache/causeway/extensions/secman/delegated/shiro/realm/CausewayModuleExtSecmanShiroRealm.java
index d6a428db3b..540625b379 100644
--- a/extensions/security/secman/delegated-shiro/src/main/java/org/apache/causeway/extensions/secman/delegated/shiro/realm/CausewayModuleExtSecmanShiroRealm.java
+++ b/extensions/security/secman/delegated-shiro/src/main/java/org/apache/causeway/extensions/secman/delegated/shiro/realm/CausewayModuleExtSecmanShiroRealm.java
@@ -24,9 +24,6 @@ import java.util.function.Supplier;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.assertions._Assert;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.collections._Arrays;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.AuthenticationInfo;
@@ -46,6 +43,9 @@ import org.springframework.transaction.support.TransactionTemplate;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.inject.ServiceInjector;
+import org.apache.causeway.commons.internal.assertions._Assert;
+import org.apache.causeway.commons.internal.base._NullSafe;
+import org.apache.causeway.commons.internal.collections._Arrays;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.CausewayConfiguration.Extensions.Secman.DelegatedUsers.AutoCreatePolicy;
import org.apache.causeway.core.security.authorization.Authorizor;
diff --git a/extensions/security/secman/delegated-shiro/src/main/java/org/apache/causeway/extensions/secman/delegated/shiro/realm/PrincipalCollectionForApplicationUserOnSingleRealm.java b/extensions/security/secman/delegated-shiro/src/main/java/org/apache/causeway/extensions/secman/delegated/shiro/realm/PrincipalCollectionForApplicationUserOnSingleRealm.java
index 9d8cd5aa28..a027a0e76c 100644
--- a/extensions/security/secman/delegated-shiro/src/main/java/org/apache/causeway/extensions/secman/delegated/shiro/realm/PrincipalCollectionForApplicationUserOnSingleRealm.java
+++ b/extensions/security/secman/delegated-shiro/src/main/java/org/apache/causeway/extensions/secman/delegated/shiro/realm/PrincipalCollectionForApplicationUserOnSingleRealm.java
@@ -25,9 +25,10 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import org.apache.causeway.commons.internal.base._Casts;
import org.apache.shiro.subject.PrincipalCollection;
+import org.apache.causeway.commons.internal.base._Casts;
+
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
diff --git a/extensions/security/secman/delegated-shiro/src/main/java/org/apache/causeway/extensions/secman/delegated/shiro/realm/PrincipalForApplicationUser.java b/extensions/security/secman/delegated-shiro/src/main/java/org/apache/causeway/extensions/secman/delegated/shiro/realm/PrincipalForApplicationUser.java
index 62d38d3c4b..38196e132e 100644
--- a/extensions/security/secman/delegated-shiro/src/main/java/org/apache/causeway/extensions/secman/delegated/shiro/realm/PrincipalForApplicationUser.java
+++ b/extensions/security/secman/delegated-shiro/src/main/java/org/apache/causeway/extensions/secman/delegated/shiro/realm/PrincipalForApplicationUser.java
@@ -25,14 +25,15 @@ import java.util.Set;
import java.util.TreeSet;
import java.util.stream.Collectors;
+import org.apache.shiro.authz.AuthorizationInfo;
+import org.apache.shiro.authz.Permission;
+
import org.apache.causeway.commons.internal.base._Lazy;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionValueSet;
import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRole;
import org.apache.causeway.extensions.secman.applib.user.dom.AccountType;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUserStatus;
-import org.apache.shiro.authz.AuthorizationInfo;
-import org.apache.shiro.authz.Permission;
import lombok.AccessLevel;
import lombok.Getter;
diff --git a/extensions/security/secman/delegated-shiro/src/main/java/org/apache/causeway/extensions/secman/delegated/shiro/util/ShiroUtils.java b/extensions/security/secman/delegated-shiro/src/main/java/org/apache/causeway/extensions/secman/delegated/shiro/util/ShiroUtils.java
index 1dc46a0045..3f97887830 100644
--- a/extensions/security/secman/delegated-shiro/src/main/java/org/apache/causeway/extensions/secman/delegated/shiro/util/ShiroUtils.java
+++ b/extensions/security/secman/delegated-shiro/src/main/java/org/apache/causeway/extensions/secman/delegated/shiro/util/ShiroUtils.java
@@ -21,13 +21,14 @@ package org.apache.causeway.extensions.secman.delegated.shiro.util;
import java.util.Collection;
-import org.apache.causeway.extensions.secman.delegated.shiro.realm.CausewayModuleExtSecmanShiroRealm;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.UnavailableSecurityManagerException;
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.mgt.RealmSecurityManager;
import org.apache.shiro.realm.Realm;
+import org.apache.causeway.extensions.secman.delegated.shiro.realm.CausewayModuleExtSecmanShiroRealm;
+
import lombok.experimental.UtilityClass;
/**
diff --git a/extensions/security/secman/delegated-springoauth2/src/main/java/org/apache/causeway/extensions/secman/delegated/springoauth2/CausewayModuleExtSecmanDelegatedSpringOauth2.java b/extensions/security/secman/delegated-springoauth2/src/main/java/org/apache/causeway/extensions/secman/delegated/springoauth2/CausewayModuleExtSecmanDelegatedSpringOauth2.java
index d2b80d5675..9ad4234c48 100644
--- a/extensions/security/secman/delegated-springoauth2/src/main/java/org/apache/causeway/extensions/secman/delegated/springoauth2/CausewayModuleExtSecmanDelegatedSpringOauth2.java
+++ b/extensions/security/secman/delegated-springoauth2/src/main/java/org/apache/causeway/extensions/secman/delegated/springoauth2/CausewayModuleExtSecmanDelegatedSpringOauth2.java
@@ -19,11 +19,12 @@
*/
package org.apache.causeway.extensions.secman.delegated.springoauth2;
-import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
-import org.apache.causeway.extensions.secman.delegated.springoauth2.dom.ApplicationUserAutoCreationService;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
+import org.apache.causeway.extensions.secman.delegated.springoauth2.dom.ApplicationUserAutoCreationService;
+
/**
* @since 2.0 {@index}
*/
diff --git a/extensions/security/secman/encryption-jbcrypt/src/main/java/org/apache/causeway/extensions/secman/encryption/jbcrypt/CausewayModuleExtSecmanEncryptionJbcrypt.java b/extensions/security/secman/encryption-jbcrypt/src/main/java/org/apache/causeway/extensions/secman/encryption/jbcrypt/CausewayModuleExtSecmanEncryptionJbcrypt.java
index 829026e213..88c2da6e83 100644
--- a/extensions/security/secman/encryption-jbcrypt/src/main/java/org/apache/causeway/extensions/secman/encryption/jbcrypt/CausewayModuleExtSecmanEncryptionJbcrypt.java
+++ b/extensions/security/secman/encryption-jbcrypt/src/main/java/org/apache/causeway/extensions/secman/encryption/jbcrypt/CausewayModuleExtSecmanEncryptionJbcrypt.java
@@ -18,10 +18,11 @@
*/
package org.apache.causeway.extensions.secman.encryption.jbcrypt;
-import org.apache.causeway.extensions.secman.encryption.jbcrypt.services.PasswordEncoderUsingJBcrypt;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.extensions.secman.encryption.jbcrypt.services.PasswordEncoderUsingJBcrypt;
+
/**
* @since 2.0 {@index}
*/
diff --git a/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/CausewayModuleExtSecmanIntegration.java b/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/CausewayModuleExtSecmanIntegration.java
index 977c7c8a2b..6e45015dcd 100644
--- a/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/CausewayModuleExtSecmanIntegration.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/CausewayModuleExtSecmanIntegration.java
@@ -18,6 +18,9 @@
*/
package org.apache.causeway.extensions.secman.integration;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
import org.apache.causeway.extensions.secman.integration.authorizor.AuthorizorSecman;
import org.apache.causeway.extensions.secman.integration.facets.TenantedAuthorizationPostProcessor;
@@ -26,8 +29,6 @@ import org.apache.causeway.extensions.secman.integration.spiimpl.ImpersonateMenu
import org.apache.causeway.extensions.secman.integration.spiimpl.TableColumnVisibilityServiceForSecman;
import org.apache.causeway.extensions.secman.integration.usermementorefiner.UserMementoRefinerFromApplicationUser;
import org.apache.causeway.extensions.secman.integration.userreg.UserRegistrationServiceForSecman;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
/**
* @since 2.0 {@index}
diff --git a/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/authorizor/AuthorizorSecman.java b/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/authorizor/AuthorizorSecman.java
index 73561a64d3..08972675ba 100644
--- a/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/authorizor/AuthorizorSecman.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/authorizor/AuthorizorSecman.java
@@ -26,7 +26,6 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Provider;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Component;
@@ -37,6 +36,7 @@ import org.apache.causeway.applib.annotation.InteractionScope;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.core.security.authorization.Authorizor;
import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionMode;
diff --git a/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/facets/TenantedAuthorizationPostProcessor.java b/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/facets/TenantedAuthorizationPostProcessor.java
index 86b22648e5..6f4a383dad 100644
--- a/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/facets/TenantedAuthorizationPostProcessor.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/facets/TenantedAuthorizationPostProcessor.java
@@ -25,7 +25,6 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
import javax.inject.Provider;
-import org.apache.causeway.commons.internal.base._NullSafe;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;
@@ -33,6 +32,7 @@ import org.springframework.stereotype.Component;
import org.apache.causeway.applib.services.queryresultscache.QueryResultsCache;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
import org.apache.causeway.applib.services.user.UserService;
+import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facetapi.FacetUtil;
diff --git a/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/permissions/PermissionsEvaluationServiceForSecman.java b/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/permissions/PermissionsEvaluationServiceForSecman.java
index a65ecf07f6..3496bb1b6a 100644
--- a/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/permissions/PermissionsEvaluationServiceForSecman.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/permissions/PermissionsEvaluationServiceForSecman.java
@@ -25,15 +25,15 @@ import java.util.Optional;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.causeway.commons.internal.assertions._Assert;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
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.appfeat.ApplicationFeatureId;
+import org.apache.causeway.commons.internal.assertions._Assert;
+import org.apache.causeway.commons.internal.base._NullSafe;
+import org.apache.causeway.commons.internal.collections._Lists;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.CausewayConfiguration.Extensions.Secman;
import org.apache.causeway.core.config.CausewayConfiguration.Extensions.Secman.PermissionsEvaluationPolicy;
diff --git a/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/userreg/UserRegistrationServiceForSecman.java b/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/userreg/UserRegistrationServiceForSecman.java
index cdf292ba98..2de125b263 100644
--- a/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/userreg/UserRegistrationServiceForSecman.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/userreg/UserRegistrationServiceForSecman.java
@@ -23,7 +23,6 @@ import java.util.Optional;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.causeway.commons.internal.base._Strings;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
@@ -31,6 +30,7 @@ import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.userreg.UserDetails;
import org.apache.causeway.applib.services.userreg.UserRegistrationService;
import org.apache.causeway.applib.value.Password;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRoleRepository;
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/CausewayModuleExtSecmanPersistenceJdo.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/CausewayModuleExtSecmanPersistenceJdo.java
index cb30892f2a..4a11044013 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/CausewayModuleExtSecmanPersistenceJdo.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/CausewayModuleExtSecmanPersistenceJdo.java
@@ -20,6 +20,7 @@ package org.apache.causeway.extensions.secman.jdo;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+
import org.apache.causeway.extensions.secman.integration.CausewayModuleExtSecmanIntegration;
import org.apache.causeway.extensions.secman.jdo.permission.dom.ApplicationPermission;
import org.apache.causeway.extensions.secman.jdo.permission.dom.ApplicationPermissionRepository;
@@ -34,7 +35,6 @@ import org.apache.causeway.persistence.jdo.datanucleus.CausewayModulePersistence
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.causeway.testing.fixtures.applib.modules.ModuleWithFixtures;
import org.apache.causeway.testing.fixtures.applib.teardown.jdo.TeardownFixtureJdoAbstract;
-import org.apache.causeway.testing.fixtures.applib.teardown.jpa.TeardownFixtureJpaAbstract;
/**
* @since 2.0 {@index}
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/permission/dom/ApplicationPermission.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/permission/dom/ApplicationPermission.java
index 13f177df94..1e1e00e7b0 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/permission/dom/ApplicationPermission.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/permission/dom/ApplicationPermission.java
@@ -34,16 +34,16 @@ import javax.jdo.annotations.Version;
import javax.jdo.annotations.VersionStrategy;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionMode;
-import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionRule;
-import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermission.Nq;
-import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRole;
import org.apache.causeway.applib.annotation.BookmarkPolicy;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
import org.apache.causeway.applib.services.appfeat.ApplicationFeatureSort;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermission.Nq;
+import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionMode;
+import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionRule;
+import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRole;
import lombok.Getter;
import lombok.Setter;
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/permission/dom/ApplicationPermissionRepository.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/permission/dom/ApplicationPermissionRepository.java
index d542788e9c..036cefaae1 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/permission/dom/ApplicationPermissionRepository.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/permission/dom/ApplicationPermissionRepository.java
@@ -20,9 +20,10 @@ package org.apache.causeway.extensions.secman.jdo.permission.dom;
import javax.inject.Named;
+import org.springframework.stereotype.Repository;
+
import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionRepositoryAbstract;
-import org.springframework.stereotype.Repository;
@Repository
@Named(CausewayModuleExtSecmanApplib.NAMESPACE + ".ApplicationPermissionRepository")
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/role/dom/ApplicationRole.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/role/dom/ApplicationRole.java
index d11d249898..e694dde12c 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/role/dom/ApplicationRole.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/role/dom/ApplicationRole.java
@@ -38,13 +38,13 @@ import javax.jdo.annotations.Version;
import javax.jdo.annotations.VersionStrategy;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRole.Nq;
import org.apache.causeway.applib.annotation.BookmarkPolicy;
import org.apache.causeway.applib.annotation.Bounding;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRole.Nq;
import lombok.Getter;
import lombok.Setter;
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/role/dom/ApplicationRoleRepository.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/role/dom/ApplicationRoleRepository.java
index c105dc4bd0..618aa793d4 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/role/dom/ApplicationRoleRepository.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/role/dom/ApplicationRoleRepository.java
@@ -20,9 +20,10 @@ package org.apache.causeway.extensions.secman.jdo.role.dom;
import javax.inject.Named;
+import org.springframework.stereotype.Repository;
+
import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRoleRepositoryAbstract;
-import org.springframework.stereotype.Repository;
@Repository
@Named(CausewayModuleExtSecmanApplib.NAMESPACE + ".ApplicationRoleRepository")
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/tenancy/dom/ApplicationTenancy.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/tenancy/dom/ApplicationTenancy.java
index 974dfea543..01de144253 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/tenancy/dom/ApplicationTenancy.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/tenancy/dom/ApplicationTenancy.java
@@ -39,12 +39,12 @@ import javax.jdo.annotations.Version;
import javax.jdo.annotations.VersionStrategy;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.extensions.secman.applib.tenancy.dom.ApplicationTenancy.Nq;
import org.apache.causeway.applib.annotation.BookmarkPolicy;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.extensions.secman.applib.tenancy.dom.ApplicationTenancy.Nq;
import lombok.Getter;
import lombok.Setter;
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/tenancy/dom/ApplicationTenancyRepository.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/tenancy/dom/ApplicationTenancyRepository.java
index 75eaef29d5..7eefae3a07 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/tenancy/dom/ApplicationTenancyRepository.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/tenancy/dom/ApplicationTenancyRepository.java
@@ -20,9 +20,10 @@ package org.apache.causeway.extensions.secman.jdo.tenancy.dom;
import javax.inject.Named;
+import org.springframework.stereotype.Repository;
+
import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
import org.apache.causeway.extensions.secman.applib.tenancy.dom.ApplicationTenancyRepositoryAbstract;
-import org.springframework.stereotype.Repository;
@Repository
@Named(CausewayModuleExtSecmanApplib.NAMESPACE + ".ApplicationTenancyRepository")
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/user/dom/ApplicationUser.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/user/dom/ApplicationUser.java
index 6efeb8dce6..77ca1882df 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/user/dom/ApplicationUser.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/user/dom/ApplicationUser.java
@@ -40,13 +40,13 @@ import javax.jdo.annotations.Version;
import javax.jdo.annotations.VersionStrategy;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUserStatus;
-import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser.Nq;
import org.apache.causeway.applib.annotation.BookmarkPolicy;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser.Nq;
+import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUserStatus;
import lombok.Getter;
import lombok.Setter;
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/user/dom/ApplicationUserRepository.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/user/dom/ApplicationUserRepository.java
index 63a643cc88..3784a23594 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/user/dom/ApplicationUserRepository.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/user/dom/ApplicationUserRepository.java
@@ -20,9 +20,10 @@ package org.apache.causeway.extensions.secman.jdo.user.dom;
import javax.inject.Named;
+import org.springframework.stereotype.Repository;
+
import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUserRepositoryAbstract;
-import org.springframework.stereotype.Repository;
@Repository
@Named(CausewayModuleExtSecmanApplib.NAMESPACE + ".ApplicationUserRepository")
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/util/RegexReplacer.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/util/RegexReplacer.java
index ffbb314973..78ae21ae2e 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/util/RegexReplacer.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/util/RegexReplacer.java
@@ -20,9 +20,10 @@ package org.apache.causeway.extensions.secman.jdo.util;
import javax.inject.Named;
+import org.springframework.stereotype.Component;
+
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
-import org.springframework.stereotype.Component;
import lombok.val;
diff --git a/extensions/security/secman/persistence-jdo/src/test/java/org/apache/causeway/extensions/secman/jdo/permission/dom/ApplicationPermissionRepository_IntegTest.java b/extensions/security/secman/persistence-jdo/src/test/java/org/apache/causeway/extensions/secman/jdo/permission/dom/ApplicationPermissionRepository_IntegTest.java
index 1a55518649..72310b9a93 100644
--- a/extensions/security/secman/persistence-jdo/src/test/java/org/apache/causeway/extensions/secman/jdo/permission/dom/ApplicationPermissionRepository_IntegTest.java
+++ b/extensions/security/secman/persistence-jdo/src/test/java/org/apache/causeway/extensions/secman/jdo/permission/dom/ApplicationPermissionRepository_IntegTest.java
@@ -27,11 +27,10 @@ import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
import org.apache.causeway.core.config.presets.CausewayPresets;
+import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.extensions.secman.applib.ApplicationPermissionRepositoryIntegTestAbstract;
import org.apache.causeway.extensions.secman.applib.mmm.MmmModule;
import org.apache.causeway.extensions.secman.jdo.CausewayModuleExtSecmanPersistenceJdo;
-
-import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
@SpringBootTest(
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/CausewayModuleExtSecmanPersistenceJpa.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/CausewayModuleExtSecmanPersistenceJpa.java
index f5130f204c..4b022861a0 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/CausewayModuleExtSecmanPersistenceJpa.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/CausewayModuleExtSecmanPersistenceJpa.java
@@ -21,6 +21,7 @@ package org.apache.causeway.extensions.secman.jpa;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+
import org.apache.causeway.extensions.secman.integration.CausewayModuleExtSecmanIntegration;
import org.apache.causeway.extensions.secman.jpa.permission.dom.ApplicationPermission;
import org.apache.causeway.extensions.secman.jpa.permission.dom.ApplicationPermissionRepository;
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/permission/dom/ApplicationPermission.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/permission/dom/ApplicationPermission.java
index 8b57ef935f..4cd43b6776 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/permission/dom/ApplicationPermission.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/permission/dom/ApplicationPermission.java
@@ -35,16 +35,16 @@ import javax.persistence.UniqueConstraint;
import javax.persistence.Version;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionMode;
-import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionRule;
-import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermission.Nq;
-import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRole;
import org.apache.causeway.applib.annotation.BookmarkPolicy;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
import org.apache.causeway.applib.services.appfeat.ApplicationFeatureSort;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermission.Nq;
+import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionMode;
+import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionRule;
+import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRole;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/permission/dom/ApplicationPermissionRepository.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/permission/dom/ApplicationPermissionRepository.java
index a66918080c..d1dd3e6916 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/permission/dom/ApplicationPermissionRepository.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/permission/dom/ApplicationPermissionRepository.java
@@ -20,9 +20,10 @@ package org.apache.causeway.extensions.secman.jpa.permission.dom;
import javax.inject.Named;
+import org.springframework.stereotype.Repository;
+
import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionRepositoryAbstract;
-import org.springframework.stereotype.Repository;
@Repository
@Named(CausewayModuleExtSecmanApplib.NAMESPACE + ".ApplicationPermissionRepository")
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/role/dom/ApplicationRole.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/role/dom/ApplicationRole.java
index cf1953e36d..b011166d02 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/role/dom/ApplicationRole.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/role/dom/ApplicationRole.java
@@ -36,14 +36,14 @@ import javax.persistence.UniqueConstraint;
import javax.persistence.Version;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRole.Nq;
-import org.apache.causeway.extensions.secman.jpa.user.dom.ApplicationUser;
import org.apache.causeway.applib.annotation.BookmarkPolicy;
import org.apache.causeway.applib.annotation.Bounding;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRole.Nq;
+import org.apache.causeway.extensions.secman.jpa.user.dom.ApplicationUser;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/role/dom/ApplicationRoleRepository.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/role/dom/ApplicationRoleRepository.java
index f07baf1673..799c5f15c4 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/role/dom/ApplicationRoleRepository.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/role/dom/ApplicationRoleRepository.java
@@ -20,9 +20,10 @@ package org.apache.causeway.extensions.secman.jpa.role.dom;
import javax.inject.Named;
+import org.springframework.stereotype.Repository;
+
import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRoleRepositoryAbstract;
-import org.springframework.stereotype.Repository;
@Repository
@Named(CausewayModuleExtSecmanApplib.NAMESPACE + ".ApplicationRoleRepository")
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/tenancy/dom/ApplicationTenancy.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/tenancy/dom/ApplicationTenancy.java
index 5e7fab6ca4..254fcce1de 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/tenancy/dom/ApplicationTenancy.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/tenancy/dom/ApplicationTenancy.java
@@ -36,12 +36,12 @@ import javax.persistence.UniqueConstraint;
import javax.persistence.Version;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.extensions.secman.applib.tenancy.dom.ApplicationTenancy.Nq;
import org.apache.causeway.applib.annotation.BookmarkPolicy;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.extensions.secman.applib.tenancy.dom.ApplicationTenancy.Nq;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/tenancy/dom/ApplicationTenancyRepository.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/tenancy/dom/ApplicationTenancyRepository.java
index 3c094b9d4c..0dbe701462 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/tenancy/dom/ApplicationTenancyRepository.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/tenancy/dom/ApplicationTenancyRepository.java
@@ -20,9 +20,10 @@ package org.apache.causeway.extensions.secman.jpa.tenancy.dom;
import javax.inject.Named;
+import org.springframework.stereotype.Repository;
+
import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
import org.apache.causeway.extensions.secman.applib.tenancy.dom.ApplicationTenancyRepositoryAbstract;
-import org.springframework.stereotype.Repository;
@Repository
@Named(CausewayModuleExtSecmanApplib.NAMESPACE + ".ApplicationTenancyRepository")
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/user/dom/ApplicationUser.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/user/dom/ApplicationUser.java
index 7f6e62669d..810caa6e47 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/user/dom/ApplicationUser.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/user/dom/ApplicationUser.java
@@ -40,14 +40,14 @@ import javax.persistence.UniqueConstraint;
import javax.persistence.Version;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUserStatus;
-import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser.Nq;
-import org.apache.causeway.extensions.secman.jpa.role.dom.ApplicationRole;
import org.apache.causeway.applib.annotation.BookmarkPolicy;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser.Nq;
+import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUserStatus;
+import org.apache.causeway.extensions.secman.jpa.role.dom.ApplicationRole;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/user/dom/ApplicationUserRepository.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/user/dom/ApplicationUserRepository.java
index e0cc662a15..e6b492c1cb 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/user/dom/ApplicationUserRepository.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/user/dom/ApplicationUserRepository.java
@@ -20,9 +20,10 @@ package org.apache.causeway.extensions.secman.jpa.user.dom;
import javax.inject.Named;
+import org.springframework.stereotype.Repository;
+
import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUserRepositoryAbstract;
-import org.springframework.stereotype.Repository;
@Repository
@Named(CausewayModuleExtSecmanApplib.NAMESPACE + ".ApplicationUserRepository")
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/util/RegexReplacer.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/util/RegexReplacer.java
index 37bec6754e..914a4ab441 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/util/RegexReplacer.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/util/RegexReplacer.java
@@ -20,9 +20,10 @@ package org.apache.causeway.extensions.secman.jpa.util;
import javax.inject.Named;
+import org.springframework.stereotype.Component;
+
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
-import org.springframework.stereotype.Component;
import lombok.val;
diff --git a/extensions/security/secman/persistence-jpa/src/test/java/org/apache/causeway/extensions/secman/jpa/permission/dom/ApplicationPermissionRepository_IntegTest.java b/extensions/security/secman/persistence-jpa/src/test/java/org/apache/causeway/extensions/secman/jpa/permission/dom/ApplicationPermissionRepository_IntegTest.java
index ab41957ad0..af8a49b55d 100644
--- a/extensions/security/secman/persistence-jpa/src/test/java/org/apache/causeway/extensions/secman/jpa/permission/dom/ApplicationPermissionRepository_IntegTest.java
+++ b/extensions/security/secman/persistence-jpa/src/test/java/org/apache/causeway/extensions/secman/jpa/permission/dom/ApplicationPermissionRepository_IntegTest.java
@@ -27,11 +27,10 @@ import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
import org.apache.causeway.core.config.presets.CausewayPresets;
+import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.extensions.secman.applib.ApplicationPermissionRepositoryIntegTestAbstract;
import org.apache.causeway.extensions.secman.applib.mmm.MmmModule;
import org.apache.causeway.extensions.secman.jpa.CausewayModuleExtSecmanPersistenceJpa;
-
-import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
@SpringBootTest(
diff --git a/extensions/security/sessionlog/applib/src/main/java/org/apache/causeway/extensions/sessionlog/applib/CausewayModuleExtSessionLogApplib.java b/extensions/security/sessionlog/applib/src/main/java/org/apache/causeway/extensions/sessionlog/applib/CausewayModuleExtSessionLogApplib.java
index 023188eb4c..a4f2d539df 100644
--- a/extensions/security/sessionlog/applib/src/main/java/org/apache/causeway/extensions/sessionlog/applib/CausewayModuleExtSessionLogApplib.java
+++ b/extensions/security/sessionlog/applib/src/main/java/org/apache/causeway/extensions/sessionlog/applib/CausewayModuleExtSessionLogApplib.java
@@ -20,11 +20,12 @@
package org.apache.causeway.extensions.sessionlog.applib;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
import org.apache.causeway.extensions.sessionlog.applib.app.SessionLogMenu;
import org.apache.causeway.extensions.sessionlog.applib.spiimpl.SessionLogServiceInitializer;
import org.apache.causeway.extensions.sessionlog.applib.spiimpl.SessionSubscriberForSessionLog;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
@Configuration
diff --git a/extensions/security/sessionlog/applib/src/main/java/org/apache/causeway/extensions/sessionlog/applib/dom/SessionLogEntry.java b/extensions/security/sessionlog/applib/src/main/java/org/apache/causeway/extensions/sessionlog/applib/dom/SessionLogEntry.java
index 1515c27860..974db0a1cf 100644
--- a/extensions/security/sessionlog/applib/src/main/java/org/apache/causeway/extensions/sessionlog/applib/dom/SessionLogEntry.java
+++ b/extensions/security/sessionlog/applib/src/main/java/org/apache/causeway/extensions/sessionlog/applib/dom/SessionLogEntry.java
@@ -31,13 +31,27 @@ import java.util.UUID;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.causeway.commons.internal.base._Temporals;
-import org.apache.causeway.extensions.sessionlog.applib.CausewayModuleExtSessionLogApplib;
-import org.apache.causeway.applib.annotation.*;
+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.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.ParameterLayout;
+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.SemanticsOf;
+import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.layout.component.CssClassFaPosition;
import org.apache.causeway.applib.mixins.security.HasUsername;
import org.apache.causeway.applib.services.session.SessionSubscriber;
import org.apache.causeway.applib.util.ObjectContracts;
+import org.apache.causeway.commons.internal.base._Temporals;
+import org.apache.causeway.extensions.sessionlog.applib.CausewayModuleExtSessionLogApplib;
import lombok.experimental.UtilityClass;
diff --git a/extensions/security/sessionlog/applib/src/test/java/org/apache/causeway/extensions/sessionlog/applib/integtests/SessionLogIntegTestAbstract.java b/extensions/security/sessionlog/applib/src/test/java/org/apache/causeway/extensions/sessionlog/applib/integtests/SessionLogIntegTestAbstract.java
index ea39ab0ada..ad703733cb 100644
--- a/extensions/security/sessionlog/applib/src/test/java/org/apache/causeway/extensions/sessionlog/applib/integtests/SessionLogIntegTestAbstract.java
+++ b/extensions/security/sessionlog/applib/src/test/java/org/apache/causeway/extensions/sessionlog/applib/integtests/SessionLogIntegTestAbstract.java
@@ -38,7 +38,6 @@ import org.apache.causeway.applib.annotation.Value;
import org.apache.causeway.applib.services.session.SessionSubscriber;
import org.apache.causeway.extensions.sessionlog.applib.dom.SessionLogEntry;
import org.apache.causeway.extensions.sessionlog.applib.dom.SessionLogEntryRepository;
-
import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
import lombok.Getter;
diff --git a/extensions/security/sessionlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/sessionlog/jdo/CausewayModuleExtSessionLogPersistenceJdo.java b/extensions/security/sessionlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/sessionlog/jdo/CausewayModuleExtSessionLogPersistenceJdo.java
index b9eed49037..378fb1fc92 100644
--- a/extensions/security/sessionlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/sessionlog/jdo/CausewayModuleExtSessionLogPersistenceJdo.java
+++ b/extensions/security/sessionlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/sessionlog/jdo/CausewayModuleExtSessionLogPersistenceJdo.java
@@ -22,11 +22,11 @@ package org.apache.causeway.extensions.sessionlog.jdo;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+
import org.apache.causeway.extensions.sessionlog.applib.CausewayModuleExtSessionLogApplib;
import org.apache.causeway.extensions.sessionlog.jdo.dom.SessionLogEntry;
import org.apache.causeway.extensions.sessionlog.jdo.dom.SessionLogEntryRepository;
import org.apache.causeway.persistence.jdo.datanucleus.CausewayModulePersistenceJdoDatanucleus;
-
import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib;
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.causeway.testing.fixtures.applib.modules.ModuleWithFixtures;
diff --git a/extensions/security/sessionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/sessionlog/jdo/integtests/SessionLog_IntegTest.java b/extensions/security/sessionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/sessionlog/jdo/integtests/SessionLog_IntegTest.java
index a2d20104fb..58c3ecbb00 100644
--- a/extensions/security/sessionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/sessionlog/jdo/integtests/SessionLog_IntegTest.java
+++ b/extensions/security/sessionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/sessionlog/jdo/integtests/SessionLog_IntegTest.java
@@ -27,10 +27,9 @@ import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
import org.apache.causeway.core.config.presets.CausewayPresets;
+import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.extensions.sessionlog.applib.integtests.SessionLogIntegTestAbstract;
import org.apache.causeway.extensions.sessionlog.jdo.CausewayModuleExtSessionLogPersistenceJdo;
-
-import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
@SpringBootTest(
diff --git a/extensions/security/sessionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/sessionlog/jpa/CausewayModuleExtSessionLogPersistenceJpa.java b/extensions/security/sessionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/sessionlog/jpa/CausewayModuleExtSessionLogPersistenceJpa.java
index d21143d576..1743f4cf62 100644
--- a/extensions/security/sessionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/sessionlog/jpa/CausewayModuleExtSessionLogPersistenceJpa.java
+++ b/extensions/security/sessionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/sessionlog/jpa/CausewayModuleExtSessionLogPersistenceJpa.java
@@ -23,12 +23,12 @@ package org.apache.causeway.extensions.sessionlog.jpa;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+
import org.apache.causeway.extensions.sessionlog.applib.CausewayModuleExtSessionLogApplib;
import org.apache.causeway.extensions.sessionlog.jpa.dom.SessionLogEntry;
import org.apache.causeway.extensions.sessionlog.jpa.dom.SessionLogEntryPK;
import org.apache.causeway.extensions.sessionlog.jpa.dom.SessionLogEntryRepository;
import org.apache.causeway.persistence.jpa.eclipselink.CausewayModulePersistenceJpaEclipselink;
-
import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib;
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.causeway.testing.fixtures.applib.modules.ModuleWithFixtures;
diff --git a/extensions/security/sessionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/sessionlog/jpa/integtests/SessionLog_IntegTest.java b/extensions/security/sessionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/sessionlog/jpa/integtests/SessionLog_IntegTest.java
index 0c9536eff2..885a19025d 100644
--- a/extensions/security/sessionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/sessionlog/jpa/integtests/SessionLog_IntegTest.java
+++ b/extensions/security/sessionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/sessionlog/jpa/integtests/SessionLog_IntegTest.java
@@ -27,10 +27,9 @@ import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
import org.apache.causeway.core.config.presets.CausewayPresets;
+import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.extensions.sessionlog.applib.integtests.SessionLogIntegTestAbstract;
import org.apache.causeway.extensions.sessionlog.jpa.CausewayModuleExtSessionLogPersistenceJpa;
-
-import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
@SpringBootTest(
diff --git a/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/causeway/extensions/shirorealmldap/realm/impl/CausewayLdapRealm.java b/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/causeway/extensions/shirorealmldap/realm/impl/CausewayLdapRealm.java
index d68701e10d..1bfe0f5f54 100644
--- a/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/causeway/extensions/shirorealmldap/realm/impl/CausewayLdapRealm.java
+++ b/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/causeway/extensions/shirorealmldap/realm/impl/CausewayLdapRealm.java
@@ -32,8 +32,6 @@ import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
import javax.naming.ldap.LdapContext;
-import org.apache.causeway.commons.internal.collections._Maps;
-import org.apache.causeway.commons.internal.collections._Sets;
import org.apache.shiro.authz.AuthorizationInfo;
import org.apache.shiro.authz.SimpleAuthorizationInfo;
import org.apache.shiro.config.Ini;
@@ -43,11 +41,13 @@ import org.apache.shiro.realm.ldap.LdapUtils;
import org.apache.shiro.subject.PrincipalCollection;
import org.apache.shiro.util.StringUtils;
-import static org.apache.causeway.commons.internal.base._NullSafe.stream;
-
+import org.apache.causeway.commons.internal.collections._Maps;
+import org.apache.causeway.commons.internal.collections._Sets;
import org.apache.causeway.security.shiro.permrolemapper.PermissionToRoleMapper;
import org.apache.causeway.security.shiro.permrolemapper.PermissionToRoleMapperFromIni;
+import static org.apache.causeway.commons.internal.base._NullSafe.stream;
+
/**
* Implementation of {@link org.apache.shiro.realm.ldap.JndiLdapRealm} that also
* returns each user's groups.
diff --git a/extensions/security/spring-oauth2/src/main/java/org/apache/causeway/extensions/spring/security/oauth2/CausewayModuleExtSpringSecurityOAuth2.java b/extensions/security/spring-oauth2/src/main/java/org/apache/causeway/extensions/spring/security/oauth2/CausewayModuleExtSpringSecurityOAuth2.java
index 03e9a1bb1c..ed5a86c1d9 100644
--- a/extensions/security/spring-oauth2/src/main/java/org/apache/causeway/extensions/spring/security/oauth2/CausewayModuleExtSpringSecurityOAuth2.java
+++ b/extensions/security/spring-oauth2/src/main/java/org/apache/causeway/extensions/spring/security/oauth2/CausewayModuleExtSpringSecurityOAuth2.java
@@ -18,10 +18,10 @@
*/
package org.apache.causeway.extensions.spring.security.oauth2;
-import org.apache.causeway.extensions.spring.security.oauth2.authconverters.AuthenticationConverterOfOAuth2UserPrincipal;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.extensions.spring.security.oauth2.authconverters.AuthenticationConverterOfOAuth2UserPrincipal;
import org.apache.causeway.security.spring.CausewayModuleSecuritySpring;
/**
diff --git a/extensions/security/spring-oauth2/src/test/java/org/apache/causeway/security/spring/authconverters/AuthenticationConverterOfOAuth2UserPrincipal_Test.java b/extensions/security/spring-oauth2/src/test/java/org/apache/causeway/security/spring/authconverters/AuthenticationConverterOfOAuth2UserPrincipal_Test.java
index ebfd8d027b..09b4fe2d14 100644
--- a/extensions/security/spring-oauth2/src/test/java/org/apache/causeway/security/spring/authconverters/AuthenticationConverterOfOAuth2UserPrincipal_Test.java
+++ b/extensions/security/spring-oauth2/src/test/java/org/apache/causeway/security/spring/authconverters/AuthenticationConverterOfOAuth2UserPrincipal_Test.java
@@ -23,7 +23,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Map;
-import org.apache.causeway.extensions.spring.security.oauth2.authconverters.AuthenticationConverterOfOAuth2UserPrincipal;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
@@ -36,6 +35,8 @@ import org.springframework.security.core.Authentication;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.oauth2.core.user.OAuth2User;
+import org.apache.causeway.extensions.spring.security.oauth2.authconverters.AuthenticationConverterOfOAuth2UserPrincipal;
+
import lombok.val;
@ExtendWith(MockitoExtension.class)
diff --git a/extensions/vro/cors/impl/src/test/java/org/apache/causeway/extensions/cors/impl/CausewayModuleExtCorsImplTest.java b/extensions/vro/cors/impl/src/test/java/org/apache/causeway/extensions/cors/impl/CausewayModuleExtCorsImplTest.java
index ab261e5f1e..bf80d629e1 100644
--- a/extensions/vro/cors/impl/src/test/java/org/apache/causeway/extensions/cors/impl/CausewayModuleExtCorsImplTest.java
+++ b/extensions/vro/cors/impl/src/test/java/org/apache/causeway/extensions/cors/impl/CausewayModuleExtCorsImplTest.java
@@ -26,7 +26,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.RestEasyConfiguration;
import org.apache.causeway.core.metamodel._testing.MetaModelContext_forTesting;
-import org.apache.causeway.extensions.cors.impl.CausewayModuleExtCors;
import lombok.val;
diff --git a/extensions/vw/exceldownload/wicket-ui/src/main/java/org/apache/causeway/extensions/viewer/wicket/exceldownload/ui/CausewayModuleExtExcelDownloadWicketUi.java b/extensions/vw/exceldownload/wicket-ui/src/main/java/org/apache/causeway/extensions/viewer/wicket/exceldownload/ui/CausewayModuleExtExcelDownloadWicketUi.java
index aeb730281e..8abb965db5 100644
--- a/extensions/vw/exceldownload/wicket-ui/src/main/java/org/apache/causeway/extensions/viewer/wicket/exceldownload/ui/CausewayModuleExtExcelDownloadWicketUi.java
+++ b/extensions/vw/exceldownload/wicket-ui/src/main/java/org/apache/causeway/extensions/viewer/wicket/exceldownload/ui/CausewayModuleExtExcelDownloadWicketUi.java
@@ -18,10 +18,11 @@
*/
package org.apache.causeway.extensions.viewer.wicket.exceldownload.ui;
-import org.apache.causeway.extensions.viewer.wicket.exceldownload.ui.components.CollectionContentsAsExcelFactory;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.extensions.viewer.wicket.exceldownload.ui.components.CollectionContentsAsExcelFactory;
+
/**
* @since 2.0 {@index}
*/
diff --git a/extensions/vw/exceldownload/wicket-ui/src/main/java/org/apache/causeway/extensions/viewer/wicket/exceldownload/ui/components/CollectionContentsAsExcelFactory.java b/extensions/vw/exceldownload/wicket-ui/src/main/java/org/apache/causeway/extensions/viewer/wicket/exceldownload/ui/components/CollectionContentsAsExcelFactory.java
index 19a1a55a16..08649efcae 100644
--- a/extensions/vw/exceldownload/wicket-ui/src/main/java/org/apache/causeway/extensions/viewer/wicket/exceldownload/ui/components/CollectionContentsAsExcelFactory.java
+++ b/extensions/vw/exceldownload/wicket-ui/src/main/java/org/apache/causeway/extensions/viewer/wicket/exceldownload/ui/components/CollectionContentsAsExcelFactory.java
@@ -30,6 +30,7 @@ import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel;
import org.apache.causeway.viewer.wicket.ui.CollectionContentsAsFactory;
import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory.ApplicationAdvice;
import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
/**
diff --git a/extensions/vw/fullcalendar/applib/src/main/java/org/apache/causeway/extensions/fullcalendar/applib/CausewayModuleExtFullCalendarApplib.java b/extensions/vw/fullcalendar/applib/src/main/java/org/apache/causeway/extensions/fullcalendar/applib/CausewayModuleExtFullCalendarApplib.java
index dd816dbf4b..6de0223170 100644
--- a/extensions/vw/fullcalendar/applib/src/main/java/org/apache/causeway/extensions/fullcalendar/applib/CausewayModuleExtFullCalendarApplib.java
+++ b/extensions/vw/fullcalendar/applib/src/main/java/org/apache/causeway/extensions/fullcalendar/applib/CausewayModuleExtFullCalendarApplib.java
@@ -18,10 +18,11 @@
*/
package org.apache.causeway.extensions.fullcalendar.applib;
-import org.apache.causeway.extensions.fullcalendar.applib.value.CalendarEventSemantics;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.extensions.fullcalendar.applib.value.CalendarEventSemantics;
+
/**
* @since 2.0 {@index}
*/
diff --git a/extensions/vw/fullcalendar/applib/src/main/java/org/apache/causeway/extensions/fullcalendar/applib/value/CalendarEventSemantics.java b/extensions/vw/fullcalendar/applib/src/main/java/org/apache/causeway/extensions/fullcalendar/applib/value/CalendarEventSemantics.java
index 5caa9d7297..749e11d392 100644
--- a/extensions/vw/fullcalendar/applib/src/main/java/org/apache/causeway/extensions/fullcalendar/applib/value/CalendarEventSemantics.java
+++ b/extensions/vw/fullcalendar/applib/src/main/java/org/apache/causeway/extensions/fullcalendar/applib/value/CalendarEventSemantics.java
@@ -29,10 +29,6 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.base._StringInterpolation;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.base._Text;
import org.springframework.context.annotation.Import;
import org.springframework.stereotype.Component;
@@ -50,6 +46,10 @@ import org.apache.causeway.applib.value.semantics.Renderer;
import org.apache.causeway.applib.value.semantics.TemporalValueSemantics;
import org.apache.causeway.applib.value.semantics.ValueDecomposition;
import org.apache.causeway.applib.value.semantics.ValueSemanticsAbstract;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.base._StringInterpolation;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.base._Text;
import org.apache.causeway.schema.common.v2.TypedTupleDto;
import org.apache.causeway.schema.common.v2.ValueType;
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/AbstractFullCalendar.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/AbstractFullCalendar.java
index e8cce3f340..a79baea4d2 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/AbstractFullCalendar.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/AbstractFullCalendar.java
@@ -18,13 +18,14 @@
*/
package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.res.FullCalendarCssReference;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.res.FullCalendarIntegrationJsReference;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.res.FullCalendarJsReference;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.IHeaderContributor;
+import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.res.FullCalendarCssReference;
+import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.res.FullCalendarIntegrationJsReference;
+import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.res.FullCalendarJsReference;
+
abstract class AbstractFullCalendar extends MarkupContainer implements IHeaderContributor {
private static final long serialVersionUID = 1L;
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/CalendarResponse.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/CalendarResponse.java
index 1cd6812695..86f7985a2f 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/CalendarResponse.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/CalendarResponse.java
@@ -20,9 +20,10 @@ package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar;
import java.util.Date;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.res.FullCalendarIntegrationJsReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.res.FullCalendarIntegrationJsReference;
+
public class CalendarResponse {
private final FullCalendar calendar;
private final AjaxRequestTarget target;
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/FullCalendar.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/FullCalendar.java
index 314c338ca4..6d75d3b2cf 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/FullCalendar.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/FullCalendar.java
@@ -24,6 +24,10 @@ import java.util.NoSuchElementException;
import java.util.Optional;
import java.util.UUID;
+import org.apache.wicket.IRequestListener;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.util.lang.Objects;
+
import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback.AjaxConcurrency;
import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback.ClickedEvent;
import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback.DateRangeSelectedCallback;
@@ -35,9 +39,6 @@ import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback.Sel
import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback.View;
import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.res.FullCalendarEventSourceEvents;
import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.res.FullCalendarIntegrationJsReference;
-import org.apache.wicket.IRequestListener;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.util.lang.Objects;
import lombok.val;
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/AbstractAjaxCallback.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/AbstractAjaxCallback.java
index 1e0cf24490..becada3b42 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/AbstractAjaxCallback.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/AbstractAjaxCallback.java
@@ -18,9 +18,10 @@
*/
package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.FullCalendar;
import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
+import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.FullCalendar;
+
import lombok.NonNull;
abstract class AbstractAjaxCallback extends AbstractDefaultAjaxBehavior {
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/AbstractCallback.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/AbstractCallback.java
index 1f8f103c3c..8825bb5338 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/AbstractCallback.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/AbstractCallback.java
@@ -20,12 +20,13 @@ package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback;
import java.util.Map;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.FullCalendar;
import org.apache.wicket.Component;
import org.apache.wicket.IRequestListener;
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.FullCalendar;
+
import lombok.Getter;
abstract class AbstractCallback extends Behavior implements IRequestListener {
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/AbstractShiftedEventParam.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/AbstractShiftedEventParam.java
index 90fc08db6a..ad8f161665 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/AbstractShiftedEventParam.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/AbstractShiftedEventParam.java
@@ -18,9 +18,10 @@
*/
package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback;
+import org.joda.time.DateTime;
+
import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.Event;
import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.EventSource;
-import org.joda.time.DateTime;
import lombok.Getter;
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/DateRangeSelectedCallback.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/DateRangeSelectedCallback.java
index 0be5b20a95..802db535be 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/DateRangeSelectedCallback.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/DateRangeSelectedCallback.java
@@ -18,11 +18,12 @@
*/
package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.CalendarResponse;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.request.Request;
import org.joda.time.DateTime;
+import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.CalendarResponse;
+
public abstract class DateRangeSelectedCallback
extends AbstractAjaxCallback
implements CallbackWithHandler {
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/EventClickedCallback.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/EventClickedCallback.java
index 061bcd93ca..a96947f222 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/EventClickedCallback.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/EventClickedCallback.java
@@ -18,11 +18,12 @@
*/
package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.request.Request;
+
import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.CalendarResponse;
import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.Event;
import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.EventSource;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.request.Request;
public abstract class EventClickedCallback
extends AbstractAjaxCallback
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/EventDroppedCallback.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/EventDroppedCallback.java
index 0ccf936139..89d66c63dd 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/EventDroppedCallback.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/EventDroppedCallback.java
@@ -18,11 +18,12 @@
*/
package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.request.Request;
+
import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.CalendarResponse;
import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.Event;
import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.EventSource;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.request.Request;
public abstract class EventDroppedCallback
extends AbstractAjaxCallbackWithClientsideRevert
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/EventResizedCallback.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/EventResizedCallback.java
index 024ebac9de..8827d8ef44 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/EventResizedCallback.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/EventResizedCallback.java
@@ -18,11 +18,12 @@
*/
package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.request.Request;
+
import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.CalendarResponse;
import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.Event;
import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.EventSource;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.request.Request;
public abstract class EventResizedCallback
extends AbstractAjaxCallbackWithClientsideRevert
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/GetEventsCallback.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/GetEventsCallback.java
index 22e38a2883..9bb6964b4a 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/GetEventsCallback.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/GetEventsCallback.java
@@ -20,9 +20,10 @@ package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback;
import java.util.Map;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.EventSource;
import org.apache.wicket.request.handler.TextRequestHandler;
+import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.EventSource;
+
import lombok.val;
public class GetEventsCallback extends AbstractCallback {
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/View.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/View.java
index 22bf24fc14..421af2a9d1 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/View.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/View.java
@@ -19,9 +19,10 @@
package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.ViewType;
import org.joda.time.DateMidnight;
+import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.ViewType;
+
import lombok.AllArgsConstructor;
import lombok.Getter;
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/ViewDisplayCallback.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/ViewDisplayCallback.java
index f477806011..5d79621b9e 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/ViewDisplayCallback.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/ViewDisplayCallback.java
@@ -18,8 +18,6 @@
*/
package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.CalendarResponse;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.ViewType;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.request.Request;
import org.joda.time.DateMidnight;
@@ -27,6 +25,9 @@ import org.joda.time.DateTimeZone;
import org.joda.time.format.DateTimeFormatter;
import org.joda.time.format.ISODateTimeFormat;
+import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.CalendarResponse;
+import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.ViewType;
+
/**
* A base callback that passes back calendar's starting date
*/
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarCssReference.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarCssReference.java
index 9dfaa5fbd6..9c4e91072b 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarCssReference.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarCssReference.java
@@ -21,11 +21,10 @@ package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.res;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
+import de.agilecoders.wicket.webjars.request.resource.WebjarsCssResourceReference;
import lombok.Getter;
import lombok.experimental.Accessors;
-import de.agilecoders.wicket.webjars.request.resource.WebjarsCssResourceReference;
-
public class FullCalendarCssReference
extends WebjarsCssResourceReference {
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarEventSourceEvents.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarEventSourceEvents.java
index a401a8bddd..31d8e7f84f 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarEventSourceEvents.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarEventSourceEvents.java
@@ -23,7 +23,6 @@ import java.util.function.Function;
import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.CalendarConfig;
import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.EventSource;
-
import org.apache.causeway.viewer.wicket.ui.util.LicensedTextTemplate;
import lombok.Getter;
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarIntegrationJsReference.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarIntegrationJsReference.java
index be4ee8f994..3abcefcc16 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarIntegrationJsReference.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarIntegrationJsReference.java
@@ -18,13 +18,14 @@
*/
package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.res;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.CalendarConfig;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.util.string.Strings;
+import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.CalendarConfig;
+
import lombok.Getter;
import lombok.experimental.Accessors;
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarJsReference.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarJsReference.java
index 72e5154fd0..ec95e910db 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarJsReference.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarJsReference.java
@@ -21,11 +21,10 @@ package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.res;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference;
import lombok.Getter;
import lombok.experimental.Accessors;
-import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference;
-
public class FullCalendarJsReference
extends WebjarsJavaScriptResourceReference {
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/selector/EventSourceSelector.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/selector/EventSourceSelector.java
index 2a78e89a14..c6ae66c482 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/selector/EventSourceSelector.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/selector/EventSourceSelector.java
@@ -18,10 +18,10 @@
*/
package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.selector;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.FullCalendar;
import org.apache.wicket.markup.html.IHeaderContributor;
import org.apache.wicket.markup.html.WebComponent;
+import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.FullCalendar;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
public class EventSourceSelector extends WebComponent implements IHeaderContributor {
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/CalendaredCollectionAbstract.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/CalendaredCollectionAbstract.java
index edeb8a1d03..282dab5ff9 100644
--- a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/CalendaredCollectionAbstract.java
+++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/CalendaredCollectionAbstract.java
@@ -31,7 +31,6 @@ import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.EventProvide
import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.EventSource;
import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.FullCalendar;
import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.selector.EventSourceSelector;
-
import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel;
import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.causeway.viewer.wicket.ui.panels.PanelUtil;
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/CalendaredCollectionFactoryAbstract.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/CalendaredCollectionFactoryAbstract.java
index 4e11d76d8b..e7bd5995f5 100644
--- a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/CalendaredCollectionFactoryAbstract.java
+++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/CalendaredCollectionFactoryAbstract.java
@@ -26,6 +26,7 @@ import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel;
import org.apache.causeway.viewer.wicket.ui.CollectionContentsAsFactory;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory.ApplicationAdvice;
import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
public abstract class CalendaredCollectionFactoryAbstract<T>
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/CausewayModuleExtFullCalendarWicketUi.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/CausewayModuleExtFullCalendarWicketUi.java
index 07566480fe..fab5b01ed9 100644
--- a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/CausewayModuleExtFullCalendarWicketUi.java
+++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/CausewayModuleExtFullCalendarWicketUi.java
@@ -18,11 +18,12 @@
*/
package org.apache.causeway.extensions.fullcalendar.wkt.viewer;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
import org.apache.causeway.extensions.fullcalendar.applib.CausewayModuleExtFullCalendarApplib;
import org.apache.causeway.extensions.fullcalendar.wkt.viewer.calendarable.CalendarableCollectionAsFullCalendarFactory;
import org.apache.causeway.extensions.fullcalendar.wkt.viewer.calendareventable.CalendarEventableCollectionAsFullCalendarFactory;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
/**
* @since 2.0 {@index}
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/EventProviderAbstract.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/EventProviderAbstract.java
index 6a3c500c5a..8cdeeeb082 100644
--- a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/EventProviderAbstract.java
+++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/EventProviderAbstract.java
@@ -27,9 +27,8 @@ import java.util.Objects;
import java.util.function.Function;
import java.util.stream.Collectors;
-import org.apache.causeway.commons.internal.collections._Maps;
-
import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.ManagedObjects;
@@ -37,7 +36,6 @@ import org.apache.causeway.extensions.fullcalendar.applib.spi.CalendarableDerefe
import org.apache.causeway.extensions.fullcalendar.applib.value.CalendarEvent;
import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.Event;
import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.EventProvider;
-
import org.apache.causeway.valuetypes.jodatime.applib.value.JodaTimeConverters;
import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel;
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/FullCalendarWithEventHandling.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/FullCalendarWithEventHandling.java
index a63ff10cb0..750043c0ad 100644
--- a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/FullCalendarWithEventHandling.java
+++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/FullCalendarWithEventHandling.java
@@ -29,14 +29,12 @@ import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.CalendarConf
import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.CalendarResponse;
import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.FullCalendar;
import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback.ClickedEvent;
-
import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
import org.apache.causeway.viewer.wicket.model.util.WktContext;
import org.apache.causeway.viewer.wicket.ui.pages.entity.EntityPage;
-import lombok.val;
-
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+import lombok.val;
final class FullCalendarWithEventHandling extends FullCalendar {
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/_Sample.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/_Sample.java
index 5e40021f26..f3ed60a20d 100644
--- a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/_Sample.java
+++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/_Sample.java
@@ -20,6 +20,9 @@ import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Random;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.panel.FeedbackPanel;
+
import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.CalendarConfig;
import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.CalendarResponse;
import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.Event;
@@ -32,9 +35,6 @@ import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback.Res
import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback.SelectedRange;
import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback.View;
import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.selector.EventSourceSelector;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.panel.FeedbackPanel;
-
import org.apache.causeway.valuetypes.jodatime.applib.value.JodaTimeConverters;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendarable/CalendarableCollectionAsFullCalendar.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendarable/CalendarableCollectionAsFullCalendar.java
index 5b8caf32b5..1d81b388bf 100644
--- a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendarable/CalendarableCollectionAsFullCalendar.java
+++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendarable/CalendarableCollectionAsFullCalendar.java
@@ -23,11 +23,9 @@ import java.util.Set;
import java.util.stream.Collectors;
import org.apache.causeway.commons.internal.base._NullSafe;
-
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.EventProvider;
import org.apache.causeway.extensions.fullcalendar.wkt.viewer.CalendaredCollectionAbstract;
-
import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel;
public class CalendarableCollectionAsFullCalendar
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendarable/CalendarableCollectionAsFullCalendarFactory.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendarable/CalendarableCollectionAsFullCalendarFactory.java
index 4b2cf306d4..8cb27fe598 100644
--- a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendarable/CalendarableCollectionAsFullCalendarFactory.java
+++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendarable/CalendarableCollectionAsFullCalendarFactory.java
@@ -18,11 +18,11 @@
*/
package org.apache.causeway.extensions.fullcalendar.wkt.viewer.calendarable;
-import org.apache.causeway.extensions.fullcalendar.applib.Calendarable;
-import org.apache.causeway.extensions.fullcalendar.wkt.viewer.CalendaredCollectionFactoryAbstract;
import org.apache.wicket.Component;
import org.springframework.stereotype.Service;
+import org.apache.causeway.extensions.fullcalendar.applib.Calendarable;
+import org.apache.causeway.extensions.fullcalendar.wkt.viewer.CalendaredCollectionFactoryAbstract;
import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel;
import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendarable/CalendarableEventProvider.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendarable/CalendarableEventProvider.java
index 0e9c876015..c8de5bffa2 100644
--- a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendarable/CalendarableEventProvider.java
+++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendarable/CalendarableEventProvider.java
@@ -21,13 +21,11 @@ package org.apache.causeway.extensions.fullcalendar.wkt.viewer.calendarable;
import java.util.Set;
import org.apache.causeway.commons.internal.base._Casts;
-
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.extensions.fullcalendar.applib.CalendarEventable;
import org.apache.causeway.extensions.fullcalendar.applib.Calendarable;
import org.apache.causeway.extensions.fullcalendar.applib.value.CalendarEvent;
import org.apache.causeway.extensions.fullcalendar.wkt.viewer.EventProviderAbstract;
-
import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel;
public class CalendarableEventProvider extends EventProviderAbstract {
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendareventable/CalendarEventableCollectionAsFullCalendar.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendareventable/CalendarEventableCollectionAsFullCalendar.java
index 52dafeb2f8..5bd40c2c2f 100644
--- a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendareventable/CalendarEventableCollectionAsFullCalendar.java
+++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendareventable/CalendarEventableCollectionAsFullCalendar.java
@@ -23,11 +23,9 @@ import java.util.Set;
import java.util.stream.Collectors;
import org.apache.causeway.commons.internal.base._NullSafe;
-
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.EventProvider;
import org.apache.causeway.extensions.fullcalendar.wkt.viewer.CalendaredCollectionAbstract;
-
import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel;
public class CalendarEventableCollectionAsFullCalendar
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendareventable/CalendarEventableCollectionAsFullCalendarFactory.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendareventable/CalendarEventableCollectionAsFullCalendarFactory.java
index c3f7ec06e1..5792637ea6 100644
--- a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendareventable/CalendarEventableCollectionAsFullCalendarFactory.java
+++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendareventable/CalendarEventableCollectionAsFullCalendarFactory.java
@@ -18,11 +18,11 @@
*/
package org.apache.causeway.extensions.fullcalendar.wkt.viewer.calendareventable;
-import org.apache.causeway.extensions.fullcalendar.applib.CalendarEventable;
-import org.apache.causeway.extensions.fullcalendar.wkt.viewer.CalendaredCollectionFactoryAbstract;
import org.apache.wicket.Component;
import org.springframework.stereotype.Service;
+import org.apache.causeway.extensions.fullcalendar.applib.CalendarEventable;
+import org.apache.causeway.extensions.fullcalendar.wkt.viewer.CalendaredCollectionFactoryAbstract;
import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel;
import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendareventable/CalendarEventableEventProvider.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendareventable/CalendarEventableEventProvider.java
index b1743ccfea..aa245e00ba 100644
--- a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendareventable/CalendarEventableEventProvider.java
+++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendareventable/CalendarEventableEventProvider.java
@@ -21,12 +21,10 @@ package org.apache.causeway.extensions.fullcalendar.wkt.viewer.calendareventable
import java.util.Objects;
import org.apache.causeway.commons.internal.base._Casts;
-
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.extensions.fullcalendar.applib.CalendarEventable;
import org.apache.causeway.extensions.fullcalendar.applib.value.CalendarEvent;
import org.apache.causeway.extensions.fullcalendar.wkt.viewer.EventProviderAbstract;
-
import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel;
public class CalendarEventableEventProvider extends EventProviderAbstract {
diff --git a/extensions/vw/pdfjs/applib/src/main/java/org/apache/causeway/extensions/pdfjs/applib/CausewayModuleExtPdfjsApplibModel.java b/extensions/vw/pdfjs/applib/src/main/java/org/apache/causeway/extensions/pdfjs/applib/CausewayModuleExtPdfjsApplibModel.java
index aad824f68f..47d68f3a9a 100644
--- a/extensions/vw/pdfjs/applib/src/main/java/org/apache/causeway/extensions/pdfjs/applib/CausewayModuleExtPdfjsApplibModel.java
+++ b/extensions/vw/pdfjs/applib/src/main/java/org/apache/causeway/extensions/pdfjs/applib/CausewayModuleExtPdfjsApplibModel.java
@@ -18,10 +18,11 @@
*/
package org.apache.causeway.extensions.pdfjs.applib;
-import org.apache.causeway.extensions.pdfjs.applib.spi.PdfJsViewerAdvisor;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.extensions.pdfjs.applib.spi.PdfJsViewerAdvisor;
+
@Configuration
@Import({
PdfJsViewerAdvisor.Default.class
diff --git a/extensions/vw/pdfjs/applib/src/main/java/org/apache/causeway/extensions/pdfjs/applib/config/PdfJsConfig.java b/extensions/vw/pdfjs/applib/src/main/java/org/apache/causeway/extensions/pdfjs/applib/config/PdfJsConfig.java
index 8d5401148b..e3d7201305 100644
--- a/extensions/vw/pdfjs/applib/src/main/java/org/apache/causeway/extensions/pdfjs/applib/config/PdfJsConfig.java
+++ b/extensions/vw/pdfjs/applib/src/main/java/org/apache/causeway/extensions/pdfjs/applib/config/PdfJsConfig.java
@@ -20,9 +20,10 @@ package org.apache.causeway.extensions.pdfjs.applib.config;
import java.io.Serializable;
-import org.apache.causeway.commons.internal.resources._Json;
import org.springframework.util.Assert;
+import org.apache.causeway.commons.internal.resources._Json;
+
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
diff --git a/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/causeway/extensions/pdfjs/metamodel/CausewayModuleExtPdfjsMetaModel.java b/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/causeway/extensions/pdfjs/metamodel/CausewayModuleExtPdfjsMetaModel.java
index 71817ec6fa..635a5e1682 100644
--- a/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/causeway/extensions/pdfjs/metamodel/CausewayModuleExtPdfjsMetaModel.java
+++ b/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/causeway/extensions/pdfjs/metamodel/CausewayModuleExtPdfjsMetaModel.java
@@ -18,10 +18,11 @@
*/
package org.apache.causeway.extensions.pdfjs.metamodel;
-import org.apache.causeway.extensions.pdfjs.metamodel.facet.PdfJsViewerFacetFromAnnotationFactory;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.extensions.pdfjs.metamodel.facet.PdfJsViewerFacetFromAnnotationFactory;
+
@Configuration
@Import({
// @Component's
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 2f02366d8e..20ec3c7a6e 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
@@ -26,6 +26,8 @@ import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FacetUtil;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
import org.apache.causeway.core.metamodel.facetapi.MetaModelRefiner;
+import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext;
+import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessParameterContext;
import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.causeway.core.metamodel.progmodel.ProgrammingModel;
import org.apache.causeway.extensions.pdfjs.applib.annotations.PdfJsViewer;
diff --git a/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/integration/components/PdfJsPanel.java b/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/integration/components/PdfJsPanel.java
index 304993118b..7e271ee06c 100644
--- a/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/integration/components/PdfJsPanel.java
+++ b/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/integration/components/PdfJsPanel.java
@@ -18,15 +18,15 @@
*/
package org.apache.causeway.extensions.pdfjs.wkt.integration.components;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.WebComponent;
+import org.apache.wicket.markup.html.panel.Panel;
+
import org.apache.causeway.extensions.pdfjs.applib.config.PdfJsConfig;
import org.apache.causeway.extensions.pdfjs.wkt.integration.res.PdfJsCmapsReference;
import org.apache.causeway.extensions.pdfjs.wkt.integration.res.PdfJsIntegrationReference;
import org.apache.causeway.extensions.pdfjs.wkt.integration.res.PdfJsReference;
import org.apache.causeway.extensions.pdfjs.wkt.integration.res.PdfJsWorkerReference;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.WebComponent;
-import org.apache.wicket.markup.html.panel.Panel;
-
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import lombok.NonNull;
diff --git a/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/integration/res/PdfJsCmapsReference.java b/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/integration/res/PdfJsCmapsReference.java
index 24d7a0308a..cb04623f99 100644
--- a/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/integration/res/PdfJsCmapsReference.java
+++ b/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/integration/res/PdfJsCmapsReference.java
@@ -18,17 +18,17 @@
*/
package org.apache.causeway.extensions.pdfjs.wkt.integration.res;
-import org.apache.causeway.extensions.pdfjs.wkt.integration.CausewayModuleExtPdfjsWicketIntegration;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.util.string.Strings;
+import org.apache.causeway.extensions.pdfjs.wkt.integration.CausewayModuleExtPdfjsWicketIntegration;
+
+import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference;
import lombok.Getter;
import lombok.val;
import lombok.experimental.Accessors;
-import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference;
-
public class PdfJsCmapsReference
extends WebjarsJavaScriptResourceReference {
diff --git a/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/integration/res/PdfJsIntegrationReference.java b/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/integration/res/PdfJsIntegrationReference.java
index d85815dcfb..ab3081d3ed 100644
--- a/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/integration/res/PdfJsIntegrationReference.java
+++ b/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/integration/res/PdfJsIntegrationReference.java
@@ -18,13 +18,14 @@
*/
package org.apache.causeway.extensions.pdfjs.wkt.integration.res;
-import org.apache.causeway.extensions.pdfjs.applib.config.PdfJsConfig;
-import org.apache.causeway.extensions.pdfjs.wkt.integration.CausewayModuleExtPdfjsWicketIntegration;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
+import org.apache.causeway.extensions.pdfjs.applib.config.PdfJsConfig;
+import org.apache.causeway.extensions.pdfjs.wkt.integration.CausewayModuleExtPdfjsWicketIntegration;
+
import lombok.Getter;
import lombok.experimental.Accessors;
diff --git a/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/integration/res/PdfJsReference.java b/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/integration/res/PdfJsReference.java
index 6ae4a233b4..3220ff7753 100644
--- a/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/integration/res/PdfJsReference.java
+++ b/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/integration/res/PdfJsReference.java
@@ -18,14 +18,14 @@
*/
package org.apache.causeway.extensions.pdfjs.wkt.integration.res;
-import org.apache.causeway.extensions.pdfjs.wkt.integration.CausewayModuleExtPdfjsWicketIntegration;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import lombok.Getter;
-import lombok.experimental.Accessors;
+import org.apache.causeway.extensions.pdfjs.wkt.integration.CausewayModuleExtPdfjsWicketIntegration;
import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference;
+import lombok.Getter;
+import lombok.experimental.Accessors;
public class PdfJsReference
extends WebjarsJavaScriptResourceReference {
diff --git a/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/integration/res/PdfJsWorkerReference.java b/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/integration/res/PdfJsWorkerReference.java
index a9625e1952..59cebac573 100644
--- a/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/integration/res/PdfJsWorkerReference.java
+++ b/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/integration/res/PdfJsWorkerReference.java
@@ -18,18 +18,18 @@
*/
package org.apache.causeway.extensions.pdfjs.wkt.integration.res;
-import org.apache.causeway.extensions.pdfjs.wkt.integration.CausewayModuleExtPdfjsWicketIntegration;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.causeway.extensions.pdfjs.wkt.integration.CausewayModuleExtPdfjsWicketIntegration;
+
+import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference;
import lombok.Getter;
import lombok.val;
import lombok.experimental.Accessors;
-import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference;
-
public class PdfJsWorkerReference
extends WebjarsJavaScriptResourceReference {
diff --git a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/ui/CausewayModuleExtPdfjsWicketUi.java b/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/ui/CausewayModuleExtPdfjsWicketUi.java
index 76179201c2..6907575fce 100644
--- a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/ui/CausewayModuleExtPdfjsWicketUi.java
+++ b/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/ui/CausewayModuleExtPdfjsWicketUi.java
@@ -18,11 +18,12 @@
*/
package org.apache.causeway.extensions.pdfjs.wkt.ui;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
import org.apache.causeway.extensions.pdfjs.metamodel.CausewayModuleExtPdfjsMetaModel;
import org.apache.causeway.extensions.pdfjs.wkt.integration.CausewayModuleExtPdfjsWicketIntegration;
import org.apache.causeway.extensions.pdfjs.wkt.ui.components.PdfJsViewerPanelComponentFactory;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
/**
* @since 2.0 {@index}
diff --git a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanel.java b/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanel.java
index f665e8ef22..7d268178f9 100644
--- a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanel.java
+++ b/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanel.java
@@ -45,16 +45,14 @@ import org.apache.causeway.extensions.pdfjs.applib.config.Scale;
import org.apache.causeway.extensions.pdfjs.applib.spi.PdfJsViewerAdvisor;
import org.apache.causeway.extensions.pdfjs.metamodel.facet.PdfJsViewerFacet;
import org.apache.causeway.extensions.pdfjs.wkt.integration.components.PdfJsPanel;
-
import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.causeway.viewer.wicket.ui.util.WktComponents;
+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import lombok.NonNull;
import lombok.val;
-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
-
/**
*
*/
diff --git a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanelComponentFactory.java b/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanelComponentFactory.java
index 6f397ba0f4..0f04e33b9b 100644
--- a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanelComponentFactory.java
+++ b/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanelComponentFactory.java
@@ -29,6 +29,7 @@ import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.extensions.pdfjs.metamodel.facet.PdfJsViewerFacet;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory.ApplicationAdvice;
import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
import lombok.val;
diff --git a/extensions/vw/sse/metamodel/src/main/java/org/apache/causeway/extensions/sse/metamodel/CausewayModuleExtSseMetaModel.java b/extensions/vw/sse/metamodel/src/main/java/org/apache/causeway/extensions/sse/metamodel/CausewayModuleExtSseMetaModel.java
index 3141634f65..94686b0070 100644
--- a/extensions/vw/sse/metamodel/src/main/java/org/apache/causeway/extensions/sse/metamodel/CausewayModuleExtSseMetaModel.java
+++ b/extensions/vw/sse/metamodel/src/main/java/org/apache/causeway/extensions/sse/metamodel/CausewayModuleExtSseMetaModel.java
@@ -18,11 +18,12 @@
*/
package org.apache.causeway.extensions.sse.metamodel;
-import org.apache.causeway.extensions.sse.applib.CausewayModuleExtSseApplib;
-import org.apache.causeway.extensions.sse.metamodel.facets.SseAnnotationFacetFactory;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.extensions.sse.applib.CausewayModuleExtSseApplib;
+import org.apache.causeway.extensions.sse.metamodel.facets.SseAnnotationFacetFactory;
+
@Configuration
@Import({
// module dependencies
diff --git a/extensions/vw/sse/metamodel/src/main/java/org/apache/causeway/extensions/sse/metamodel/facets/SseAnnotationFacetFactory.java b/extensions/vw/sse/metamodel/src/main/java/org/apache/causeway/extensions/sse/metamodel/facets/SseAnnotationFacetFactory.java
index defbf35700..b86465ae3e 100644
--- a/extensions/vw/sse/metamodel/src/main/java/org/apache/causeway/extensions/sse/metamodel/facets/SseAnnotationFacetFactory.java
+++ b/extensions/vw/sse/metamodel/src/main/java/org/apache/causeway/extensions/sse/metamodel/facets/SseAnnotationFacetFactory.java
@@ -26,6 +26,7 @@ import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FacetUtil;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
import org.apache.causeway.core.metamodel.facetapi.MetaModelRefiner;
+import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.causeway.core.metamodel.progmodel.ProgrammingModel;
import org.apache.causeway.extensions.sse.applib.annotations.ServerSentEvents;
diff --git a/extensions/vw/sse/metamodel/src/main/java/org/apache/causeway/extensions/sse/metamodel/facets/SseObserveFacetAbstract.java b/extensions/vw/sse/metamodel/src/main/java/org/apache/causeway/extensions/sse/metamodel/facets/SseObserveFacetAbstract.java
index b6542af27c..d86480ddf8 100644
--- a/extensions/vw/sse/metamodel/src/main/java/org/apache/causeway/extensions/sse/metamodel/facets/SseObserveFacetAbstract.java
+++ b/extensions/vw/sse/metamodel/src/main/java/org/apache/causeway/extensions/sse/metamodel/facets/SseObserveFacetAbstract.java
@@ -19,7 +19,6 @@
package org.apache.causeway.extensions.sse.metamodel.facets;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
-
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.SingleClassValueFacetAbstract;
diff --git a/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/CausewayModuleExtSseWicket.java b/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/CausewayModuleExtSseWicket.java
index 2cd3f3df51..144b966c8f 100644
--- a/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/CausewayModuleExtSseWicket.java
+++ b/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/CausewayModuleExtSseWicket.java
@@ -18,12 +18,13 @@
*/
package org.apache.causeway.extensions.sse.wicket;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
import org.apache.causeway.extensions.sse.metamodel.CausewayModuleExtSseMetaModel;
import org.apache.causeway.extensions.sse.wicket.markup.ListeningMarkupPanelFactoriesForWicket;
import org.apache.causeway.extensions.sse.wicket.services.SseServiceDefault;
import org.apache.causeway.extensions.sse.wicket.webmodule.WebModuleServerSentEvents;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
/**
* @since 2.0 {@index}
diff --git a/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/markup/ListeningMarkupComponent_observing.java b/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/markup/ListeningMarkupComponent_observing.java
index c72bf8fd7e..725d906b6f 100644
--- a/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/markup/ListeningMarkupComponent_observing.java
+++ b/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/markup/ListeningMarkupComponent_observing.java
@@ -21,13 +21,12 @@ package org.apache.causeway.extensions.sse.wicket.markup;
import java.io.IOException;
import java.util.UUID;
+import org.apache.causeway.applib.value.LocalResourcePath;
import org.apache.causeway.commons.internal.resources._Resources;
+import org.apache.causeway.core.config.viewer.web.WebAppContextPath;
import static org.apache.causeway.commons.internal.base._Strings.isNullOrEmpty;
-import org.apache.causeway.applib.value.LocalResourcePath;
-import org.apache.causeway.core.config.viewer.web.WebAppContextPath;
-
import lombok.extern.log4j.Log4j2;
@Log4j2
diff --git a/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/markup/ListeningMarkupPanelFactoriesForWicket.java b/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/markup/ListeningMarkupPanelFactoriesForWicket.java
index c6d5086416..49d981db53 100644
--- a/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/markup/ListeningMarkupPanelFactoriesForWicket.java
+++ b/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/markup/ListeningMarkupPanelFactoriesForWicket.java
@@ -23,7 +23,6 @@ import org.springframework.stereotype.Component;
import org.apache.causeway.applib.value.LocalResourcePath;
import org.apache.causeway.applib.value.Markup;
import org.apache.causeway.extensions.sse.metamodel.facets.SseObserveFacet;
-
import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
import org.apache.causeway.viewer.wicket.model.models.ValueModel;
import org.apache.causeway.viewer.wicket.ui.components.scalars.markup.MarkupComponent;
diff --git a/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/services/SseServiceDefault.java b/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/services/SseServiceDefault.java
index 1ea02ccd1d..a5187b8fc4 100644
--- a/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/services/SseServiceDefault.java
+++ b/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/services/SseServiceDefault.java
@@ -35,16 +35,16 @@ import javax.annotation.Priority;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.extensions.sse.applib.annotations.SseSource;
-import org.apache.causeway.extensions.sse.applib.service.SseChannel;
-import org.apache.causeway.extensions.sse.applib.service.SseService;
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.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.xactn.TransactionService;
+import org.apache.causeway.commons.internal.collections._Lists;
+import org.apache.causeway.extensions.sse.applib.annotations.SseSource;
+import org.apache.causeway.extensions.sse.applib.service.SseChannel;
+import org.apache.causeway.extensions.sse.applib.service.SseService;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/webmodule/ServerSentEventsServlet.java b/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/webmodule/ServerSentEventsServlet.java
index 106584bb17..4304909632 100644
--- a/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/webmodule/ServerSentEventsServlet.java
+++ b/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/webmodule/ServerSentEventsServlet.java
@@ -29,13 +29,13 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.apache.causeway.applib.value.Markup;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.context._Context;
import org.apache.causeway.extensions.sse.applib.service.SseChannel;
import org.apache.causeway.extensions.sse.applib.service.SseService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import org.apache.causeway.applib.value.Markup;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/webmodule/WebModuleServerSentEvents.java b/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/webmodule/WebModuleServerSentEvents.java
index a73b32f2e4..c4783e34eb 100644
--- a/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/webmodule/WebModuleServerSentEvents.java
+++ b/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/webmodule/WebModuleServerSentEvents.java
@@ -24,12 +24,12 @@ import javax.servlet.ServletContext;
import javax.servlet.ServletContextListener;
import javax.servlet.ServletException;
-import org.apache.causeway.commons.collections.Can;
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.inject.ServiceInjector;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.webapp.modules.WebModuleAbstract;
import lombok.Getter;
diff --git a/incubator/extensions/core/commandreplay/primary/src/main/java/org/apache/causeway/extensions/commandreplay/primary/CausewayModuleExtCommandReplayPrimary.java b/incubator/extensions/core/commandreplay/primary/src/main/java/org/apache/causeway/extensions/commandreplay/primary/CausewayModuleExtCommandReplayPrimary.java
index 97e748744e..ec55203191 100644
--- a/incubator/extensions/core/commandreplay/primary/src/main/java/org/apache/causeway/extensions/commandreplay/primary/CausewayModuleExtCommandReplayPrimary.java
+++ b/incubator/extensions/core/commandreplay/primary/src/main/java/org/apache/causeway/extensions/commandreplay/primary/CausewayModuleExtCommandReplayPrimary.java
@@ -18,15 +18,16 @@
*/
package org.apache.causeway.extensions.commandreplay.primary;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.Profile;
+
import org.apache.causeway.extensions.commandlog.applib.CausewayModuleExtCommandLogApplib;
import org.apache.causeway.extensions.commandreplay.primary.config.PrimaryConfig;
import org.apache.causeway.extensions.commandreplay.primary.mixins.Object_openOnSecondary;
import org.apache.causeway.extensions.commandreplay.primary.restapi.CommandRetrievalOnPrimaryService;
import org.apache.causeway.extensions.commandreplay.primary.spiimpl.CaptureResultOfCommand;
import org.apache.causeway.extensions.commandreplay.primary.ui.CommandReplayOnPrimaryService;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.Profile;
/**
* Activates with <i>Spring profile</i> 'commandreplay-primary'.
diff --git a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserException.java b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserException.java
index 4a0e510e6a..2cee28b78b 100644
--- a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserException.java
+++ b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserException.java
@@ -23,12 +23,12 @@ import java.util.Objects;
import javax.annotation.PostConstruct;
import javax.inject.Named;
-import org.apache.causeway.commons.internal.base._Strings;
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.commanddto.conmap.UserDataKeys;
import org.apache.causeway.applib.util.schema.CommandDtoUtils;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.extensions.commandlog.applib.dom.CommandLogEntry;
import org.apache.causeway.extensions.commandreplay.secondary.CausewayModuleExtCommandReplaySecondary;
diff --git a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/fetch/CommandFetcher.java b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/fetch/CommandFetcher.java
index a3bd802f23..ab022ac5c2 100644
--- a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/fetch/CommandFetcher.java
+++ b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/fetch/CommandFetcher.java
@@ -26,17 +26,17 @@ import javax.inject.Named;
import javax.ws.rs.core.GenericType;
import javax.ws.rs.core.Response;
+import org.springframework.lang.Nullable;
+import org.springframework.stereotype.Service;
+
+import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.applib.client.SuppressionType;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.extensions.commandlog.applib.CausewayModuleExtCommandLogApplib;
import org.apache.causeway.extensions.commandlog.applib.dom.CommandLogEntry;
import org.apache.causeway.extensions.commandreplay.secondary.config.SecondaryConfig;
import org.apache.causeway.extensions.commandreplay.secondary.status.SecondaryStatus;
import org.apache.causeway.extensions.commandreplay.secondary.status.StatusException;
-import org.springframework.lang.Nullable;
-import org.springframework.stereotype.Service;
-
-import org.apache.causeway.applib.annotation.PriorityPrecedence;
-import org.apache.causeway.applib.client.SuppressionType;
import org.apache.causeway.schema.cmd.v2.CommandDto;
import org.apache.causeway.viewer.restfulobjects.client.RestfulClient;
import org.apache.causeway.viewer.restfulobjects.client.RestfulClientConfig;
diff --git a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/job/SecondaryStatusData.java b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/job/SecondaryStatusData.java
index bcaa18edd2..a3ff4f799e 100644
--- a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/job/SecondaryStatusData.java
+++ b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/job/SecondaryStatusData.java
@@ -18,9 +18,10 @@
*/
package org.apache.causeway.extensions.commandreplay.secondary.job;
+import org.quartz.JobExecutionContext;
+
import org.apache.causeway.extensions.commandreplay.secondary.status.SecondaryStatus;
import org.apache.causeway.extensions.quartz.context.JobExecutionData;
-import org.quartz.JobExecutionContext;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/incubator/extensions/core/commandreplay/secondary/src/test/java/org/apache/causeway/extensions/commandreplay/secondary/fetch/CommandFetcher_Test.java b/incubator/extensions/core/commandreplay/secondary/src/test/java/org/apache/causeway/extensions/commandreplay/secondary/fetch/CommandFetcher_Test.java
index 7bfdfe30f2..82b6989230 100644
--- a/incubator/extensions/core/commandreplay/secondary/src/test/java/org/apache/causeway/extensions/commandreplay/secondary/fetch/CommandFetcher_Test.java
+++ b/incubator/extensions/core/commandreplay/secondary/src/test/java/org/apache/causeway/extensions/commandreplay/secondary/fetch/CommandFetcher_Test.java
@@ -26,14 +26,13 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.TestPropertySource;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel._testing.MetaModelContext_forTesting;
import org.apache.causeway.extensions.commandreplay.secondary.config.SecondaryConfig;
-import org.apache.causeway.extensions.commandreplay.secondary.fetch.CommandFetcher;
import org.apache.causeway.extensions.commandreplay.secondary.status.StatusException;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
import lombok.val;
@SpringBootTest(