You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2024/02/25 09:28:06 UTC
(causeway) branch master updated: CAUSEWAY-2297: batch org. imports (vwr. packages)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/master by this push:
new e76e8bf8b6 CAUSEWAY-2297: batch org. imports (vwr. packages)
e76e8bf8b6 is described below
commit e76e8bf8b6170ac361fb94842bc2ffbce88b2d53
Author: andi-huber <ah...@apache.org>
AuthorDate: Sun Feb 25 10:28:00 2024 +0100
CAUSEWAY-2297: batch org. imports (vwr. packages)
---
.../causeway/viewer/graphql/model/context/Context.java | 3 ++-
.../viewer/graphql/model/domain/Environment.java | 1 +
.../viewer/graphql/model/domain/GqlvAbstract.java | 5 +++--
.../viewer/graphql/model/domain/GqlvAbstractCustom.java | 7 ++++---
.../domain/common/interactors/ActionInteractor.java | 4 ++--
.../common/interactors/ActionParamInteractor.java | 4 ++--
.../domain/common/interactors/PropertyInteractor.java | 4 ++--
.../model/domain/common/query/GqlvDomainObject.java | 17 +++++++++--------
.../model/domain/common/query/GqlvDomainService.java | 3 ++-
.../graphql/model/domain/common/query/GqlvMeta.java | 3 ++-
.../common/query/GqlvTopLevelQueryAbstractSchema.java | 3 ++-
.../domain/common/query/meta/GqlvMetaCssClass.java | 6 +++---
.../model/domain/common/query/meta/GqlvMetaGrid.java | 6 +++---
.../model/domain/common/query/meta/GqlvMetaIcon.java | 6 +++---
.../model/domain/common/query/meta/GqlvMetaId.java | 6 +++---
.../model/domain/common/query/meta/GqlvMetaLayout.java | 6 +++---
.../common/query/meta/GqlvMetaLogicalTypeName.java | 6 +++---
.../model/domain/common/query/meta/GqlvMetaSaveAs.java | 10 +++++-----
.../model/domain/common/query/meta/GqlvMetaTitle.java | 6 +++---
.../model/domain/common/query/meta/GqlvMetaVersion.java | 6 +++---
.../domain/rich/mutation/GqlvMutationForAction.java | 17 +++++++++--------
.../domain/rich/mutation/GqlvMutationForProperty.java | 13 +++++++------
.../rich/mutation/GqlvTopLevelMutationRichSchema.java | 5 +++--
.../graphql/model/domain/rich/query/GqlvAction.java | 5 +++--
.../model/domain/rich/query/GqlvActionInvoke.java | 3 ++-
.../model/domain/rich/query/GqlvActionInvokeArgs.java | 3 ++-
.../domain/rich/query/GqlvActionInvokeArgsArg.java | 5 +++--
.../model/domain/rich/query/GqlvActionInvokeResult.java | 9 +++++----
.../model/domain/rich/query/GqlvActionParams.java | 3 ++-
.../model/domain/rich/query/GqlvActionParamsParam.java | 5 +++--
.../rich/query/GqlvActionParamsParamAutoComplete.java | 15 ++++++++-------
.../domain/rich/query/GqlvActionParamsParamChoices.java | 11 ++++++-----
.../rich/query/GqlvActionParamsParamDatatype.java | 5 +++--
.../domain/rich/query/GqlvActionParamsParamDefault.java | 7 ++++---
.../rich/query/GqlvActionParamsParamDisabled.java | 5 +++--
.../domain/rich/query/GqlvActionParamsParamHidden.java | 7 ++++---
.../rich/query/GqlvActionParamsParamValidate.java | 5 +++--
.../model/domain/rich/query/GqlvActionValidity.java | 9 +++++----
.../domain/rich/query/GqlvAssociationDatatype.java | 5 +++--
.../model/domain/rich/query/GqlvAssociationGet.java | 5 +++--
.../model/domain/rich/query/GqlvCollectionGet.java | 3 ++-
.../graphql/model/domain/rich/query/GqlvMember.java | 3 ++-
.../model/domain/rich/query/GqlvMemberDisabled.java | 5 +++--
.../model/domain/rich/query/GqlvMemberHidden.java | 5 +++--
.../graphql/model/domain/rich/query/GqlvProperty.java | 5 +++--
.../domain/rich/query/GqlvPropertyAutoComplete.java | 11 ++++++-----
.../model/domain/rich/query/GqlvPropertyChoices.java | 9 +++++----
.../model/domain/rich/query/GqlvPropertyGet.java | 3 ++-
.../model/domain/rich/query/GqlvPropertyGetBlob.java | 4 ++--
.../domain/rich/query/GqlvPropertyGetBlobAbstract.java | 7 ++++---
.../domain/rich/query/GqlvPropertyGetBlobBytes.java | 3 ++-
.../domain/rich/query/GqlvPropertyGetBlobMimeType.java | 4 ++--
.../domain/rich/query/GqlvPropertyGetBlobName.java | 4 ++--
.../model/domain/rich/query/GqlvPropertyGetClob.java | 4 ++--
.../domain/rich/query/GqlvPropertyGetClobAbstract.java | 7 ++++---
.../domain/rich/query/GqlvPropertyGetClobChars.java | 3 ++-
.../domain/rich/query/GqlvPropertyGetClobMimeType.java | 4 ++--
.../domain/rich/query/GqlvPropertyGetClobName.java | 4 ++--
.../model/domain/rich/query/GqlvPropertySet.java | 7 ++++---
.../model/domain/rich/query/GqlvPropertyValidate.java | 5 +++--
.../model/domain/rich/scenario/GqlvScenario.java | 8 ++++----
.../model/domain/rich/scenario/GqlvScenarioName.java | 5 +++--
.../model/domain/rich/scenario/GqlvScenarioStep.java | 3 ++-
.../domain/simple/mutation/GqlvMutationForAction.java | 17 +++++++++--------
.../domain/simple/mutation/GqlvMutationForProperty.java | 13 +++++++------
.../mutation/GqlvTopLevelMutationSimpleSchema.java | 5 +++--
.../graphql/model/domain/simple/query/SimpleAction.java | 17 +++++++++--------
.../model/domain/simple/query/SimpleCollection.java | 3 ++-
.../model/domain/simple/query/SimpleProperty.java | 11 ++++++-----
.../domain/simple/query/SimplePropertyLobAbstract.java | 7 ++++---
.../domain/simple/query/SimplePropertyLobBytes.java | 3 ++-
.../domain/simple/query/SimplePropertyLobChars.java | 3 ++-
.../domain/simple/query/SimplePropertyLobMimeType.java | 4 ++--
.../domain/simple/query/SimplePropertyLobName.java | 4 ++--
.../viewer/graphql/model/fetcher/BookmarkedPojo.java | 3 ++-
.../graphql/model/fetcher/BookmarkedPojoFetcher.java | 5 +++--
.../model/marshallers/ScalarMarshallerBigDecimal.java | 4 ++--
.../model/marshallers/ScalarMarshallerBigInteger.java | 4 ++--
.../marshallers/ScalarMarshallerBooleanPrimitive.java | 4 ++--
.../marshallers/ScalarMarshallerBooleanWrapper.java | 4 ++--
.../marshallers/ScalarMarshallerBytePrimitive.java | 4 ++--
.../model/marshallers/ScalarMarshallerByteWrapper.java | 4 ++--
.../marshallers/ScalarMarshallerCharPrimitive.java | 4 ++--
.../marshallers/ScalarMarshallerCharacterWrapper.java | 4 ++--
.../marshallers/ScalarMarshallerDoublePrimitive.java | 4 ++--
.../marshallers/ScalarMarshallerDoubleWrapper.java | 4 ++--
.../marshallers/ScalarMarshallerFloatPrimitive.java | 4 ++--
.../model/marshallers/ScalarMarshallerFloatWrapper.java | 4 ++--
.../model/marshallers/ScalarMarshallerIntPrimitive.java | 4 ++--
.../marshallers/ScalarMarshallerIntegerWrapper.java | 4 ++--
.../marshallers/ScalarMarshallerJdk8LocalDate.java | 4 ++--
.../marshallers/ScalarMarshallerJdk8LocalTime.java | 4 ++--
.../marshallers/ScalarMarshallerJdk8OffsetDateTime.java | 4 ++--
.../marshallers/ScalarMarshallerJdk8OffsetTime.java | 4 ++--
.../marshallers/ScalarMarshallerJdk8ZonedDateTime.java | 4 ++--
.../model/marshallers/ScalarMarshallerJodaDateTime.java | 5 +++--
.../marshallers/ScalarMarshallerJodaLocalDate.java | 7 ++++---
.../marshallers/ScalarMarshallerJodaLocalTime.java | 7 ++++---
.../marshallers/ScalarMarshallerLongPrimitive.java | 4 ++--
.../model/marshallers/ScalarMarshallerLongWrapper.java | 4 ++--
.../model/marshallers/ScalarMarshallerObject.java | 4 ++--
.../marshallers/ScalarMarshallerShortPrimitive.java | 4 ++--
.../model/marshallers/ScalarMarshallerShortWrapper.java | 4 ++--
.../model/marshallers/ScalarMarshallerString.java | 4 ++--
.../graphql/model/marshallers/ScalarMarshallerUuid.java | 4 ++--
.../marshallers/ScalarMarshallerVoidPrimitive.java | 4 ++--
.../model/marshallers/ScalarMarshallerVoidWrapper.java | 4 ++--
.../graphql/model/registry/GraphQLTypeRegistry.java | 17 +++++++++--------
.../model/toplevel/GqlvTopLevelQueryBothSchemas.java | 4 ++--
.../model/types/ScalarMapperUsingScalarMarshallers.java | 3 ++-
.../causeway/viewer/graphql/model/types/TypeMapper.java | 8 ++++----
.../viewer/graphql/model/types/TypeMapperDefault.java | 17 +++++++++--------
...ausewayViewerGraphqlTestModuleIntegTestAbstract.java | 1 +
.../graphql/viewer/test/e2e/Abstract_IntegTest.java | 1 +
.../viewer/graphql/viewer/test/e2e/Admin_IntegTest.java | 1 +
.../graphql/viewer/test/e2e/Calculator_IntegTest.java | 1 +
.../graphql/viewer/test/e2e/Department_IntegTest.java | 1 +
.../graphql/viewer/test/e2e/DeptHead_IntegTest.java | 1 +
.../graphql/viewer/test/e2e/People_IntegTest.java | 1 +
.../graphql/viewer/test/e2e/Person_IntegTest.java | 1 +
.../viewer/test/e2e/StaffMutating_IntegTest.java | 1 +
.../viewer/graphql/viewer/test/e2e/Staff_IntegTest.java | 1 +
.../test/e2e/simple/SimpleDepartment_IntegTest.java | 1 +
.../test/e2e/special/DepartmentMutating_IntegTest.java | 1 +
.../test/e2e/special/DeptHeadMutating_IntegTest.java | 1 +
.../viewer/test/e2e/special/DeptHead_2_IntegTest.java | 5 +++--
.../viewer/test/e2e/special/Person_2_IntegTest.java | 1 +
.../viewer/test/e2e/special/Staff_2_IntegTest.java | 3 ++-
.../viewer/test/schema/GqlSchema_print_IntegTest.java | 4 +++-
.../graphql/viewer/auth/UserMementoProviderDefault.java | 5 +++--
...syncExecutionStrategyResolvingWithinInteraction.java | 9 +++++----
.../integration/ExecutionGraphQlServiceForCauseway.java | 1 +
.../viewer/integration/GraphQlSourceForCauseway.java | 7 ++++---
.../restfulobjects/applib/JsonRepresentation.java | 1 +
.../viewer/restfulobjects/client/RestfulClient.java | 2 +-
.../azure/AuthorizationHeaderFactoryOauth2Azure.java | 6 +++---
.../client/auth/oauth2/azure/TokenCache.java | 4 ++--
.../client/auth/oauth2/azure/TokenParser.java | 4 ++--
.../conneg/RestfulObjectsJaxbWriterForXml.java | 1 +
.../jaxrsresteasy/webmodule/WebModuleJaxrsResteasy.java | 1 +
.../service/swagger/internal/TaggerDefault.java | 10 +++++-----
.../swagger/internal/ValueSchemaFactoryDefault.java | 4 +++-
.../rendering/service/swagger/internal/_OpenApi.java | 7 ++++---
.../service/swagger/internal/_OpenApiModelFactory.java | 3 ++-
...ntext_ensureCompatibleAcceptHeader_ContractTest.java | 3 ++-
.../viewer/context/ResourceContext_getArg_Test.java | 3 ++-
.../wicket/model/models/EntityCollectionModel.java | 2 +-
.../viewer/wicket/model/models/FileUploadModels.java | 1 +
.../wicket/model/models/ScalarConvertingModel.java | 1 +
.../viewer/wicket/model/models/ScalarModel.java | 1 +
.../wicket/model/models/ScalarUnwrappingModel.java | 1 +
.../viewer/wicket/model/models/UiObjectWkt.java | 1 +
.../wicket/model/models/binding/BooleanBinding.java | 1 +
.../models/interaction/act/ActionInteractionWkt.java | 1 +
.../model/models/interaction/coll/DataRowToggleWkt.java | 1 +
.../viewer/wicket/model/util/PageParameterUtils.java | 1 +
.../ui/test/components/scalars/ConverterTester.java | 3 +--
.../scalars/jdkmath/BigDecimalConverterTest.java | 4 ++--
.../ui/actionresponse/ActionResultResponseType.java | 1 +
.../wicket/ui/actionresponse/PageRedirectRequest.java | 1 +
.../viewer/wicket/ui/app/logout/LogoutHandlerWkt.java | 1 +
.../ui/app/registry/ComponentFactoryRegistry.java | 1 +
.../ui/components/actions/ActionParametersForm.java | 3 ++-
.../ui/components/collection/CollectionPanel.java | 3 ++-
.../selector/CollectionPresentationSelectorHelper.java | 1 +
.../ajaxtable/columns/BulkToggleWkt.java | 1 +
.../ajaxtable/columns/ColumnAbbreviationOptions.java | 1 +
.../ajaxtable/columns/TitleColumn.java | 1 +
.../summary/CollectionContentsAsSummary.java | 3 ++-
.../ui/components/layout/bs/tabs/TabGroupPanel.java | 3 ++-
.../ui/components/scalars/ScalarFragmentFactory.java | 1 +
.../ui/components/scalars/ScalarPanelAbstract.java | 4 +++-
.../ui/components/scalars/ScalarPanelAbstract2.java | 4 +++-
.../scalars/ScalarPanelFormFieldAbstract.java | 1 +
.../components/scalars/ScalarPanelSelectAbstract.java | 1 +
.../viewer/wicket/ui/components/scalars/_Util.java | 1 +
.../scalars/datepicker/MomentJsReference.java | 3 ++-
.../scalars/datepicker/TextFieldWithDateTimePicker.java | 4 ++--
.../ui/components/scalars/image/JavaAwtImagePanel.java | 3 ++-
.../ui/components/scalars/image/_WktImageUtil.java | 1 +
.../components/scalars/markup/_HighlightBehavior.java | 1 +
.../ui/components/text/TextAreaWithConverter.java | 1 +
.../ui/components/text/TextFieldWithConverter.java | 1 +
.../ui/components/widgets/bootstrap/FormGroup.java | 3 ++-
.../fileinput/FileUploadFieldWithNestingFix.java | 5 +++--
.../ui/components/widgets/select2/Select2OnSelect.java | 3 ++-
.../select2/providers/ChoiceProviderAbstract.java | 3 ++-
.../themepicker/CausewayWicketThemeSupportDefault.java | 5 +++--
.../ui/components/widgets/themepicker/ThemeChooser.java | 5 +++--
.../widgets/themepicker/ThemeProviderComposite.java | 5 +++--
.../causeway/viewer/wicket/ui/pages/PageAbstract.java | 3 ++-
.../ui/pages/accmngt/AccountManagementPageAbstract.java | 9 +++++----
.../ui/pages/accmngt/SuccessFeedbackCookieManager.java | 1 +
.../pages/accmngt/password_reset/PasswordResetPage.java | 3 ++-
.../accmngt/password_reset/PasswordResetPanel.java | 3 ++-
.../css/BootstrapOverridesCssResourceReference.java | 5 +++--
.../datatables/DatatablesCssBootstrap5ReferenceWkt.java | 3 ++-
.../common/datatables/DatatablesCssReferenceWkt.java | 3 ++-
.../DatatablesJavaScriptBootstrap5ReferenceWkt.java | 3 ++-
.../datatables/DatatablesJavaScriptReferenceWkt.java | 3 ++-
.../common/fontawesome/FontAwesomeCssReferenceWkt.java | 3 ++-
.../wicket/ui/pages/login/CausewaySignInPanel.java | 3 ++-
.../viewer/wicket/ui/panels/FormExecutorDefault.java | 1 +
.../causeway/viewer/wicket/ui/panels/PanelAbstract.java | 1 +
.../causeway/viewer/wicket/ui/panels/PanelBase.java | 1 +
.../viewer/wicket/ui/util/BootstrapConstants.java | 3 ++-
.../viewer/wicket/ui/util/PrismResourcesWkt.java | 3 ++-
.../org/apache/causeway/viewer/wicket/ui/util/Wkt.java | 8 +++++---
.../causeway/viewer/wicket/ui/util/WktDecorators.java | 5 +++--
.../apache/causeway/viewer/wicket/ui/util/WktLinks.java | 1 +
.../causeway/viewer/wicket/ui/util/WktTooltips.java | 8 +++++---
.../integration/AuthenticatedWebSessionForCauseway.java | 1 +
.../viewer/integration/WebRequestCycleForCauseway.java | 1 +
.../components/ComponentFactoryRegistrarDefault.java | 1 +
.../components/ComponentFactoryRegistryDefault.java | 1 +
.../viewer/registries/pages/PageClassListDefault.java | 1 +
.../registries/pages/PageClassRegistryDefault.java | 3 ++-
.../registries/pages/PageNavigationServiceDefault.java | 1 +
.../wicket/viewer/services/DeepLinkServiceWicket.java | 1 +
.../viewer/services/HintStoreUsingWicketSession.java | 1 +
.../viewer/services/ImageResourceCacheClassPath.java | 1 +
.../viewer/wicket/viewer/webmodule/WebModuleWicket.java | 1 +
.../viewer/wicketapp/CausewayWicketApplication.java | 1 +
.../viewer/wicketapp/config/BootstrapInitWkt.java | 4 +++-
.../viewer/wicketapp/config/DatatablesNetInitWkt.java | 1 +
.../wicket/viewer/wicketapp/config/DebugInitWkt.java | 1 +
.../wicket/viewer/wicketapp/config/JQueryInitWkt.java | 4 +++-
.../wicket/viewer/wicketapp/config/Select2InitWkt.java | 1 +
.../wicket/viewer/wicketapp/config/WebjarsInitWkt.java | 1 +
.../wicketapp/config/WicketViewerCssBundleInit.java | 1 +
.../viewer/wicketapp/config/WicketViewerXrayEnable.java | 1 +
231 files changed, 557 insertions(+), 379 deletions(-)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/context/Context.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/context/Context.java
index f4086945f3..16d113a777 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/context/Context.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/context/Context.java
@@ -23,6 +23,8 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import graphql.schema.GraphQLCodeRegistry;
+
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.id.HasLogicalType;
@@ -41,7 +43,6 @@ import org.apache.causeway.viewer.graphql.model.domain.common.query.GqlvDomainSe
import org.apache.causeway.viewer.graphql.model.registry.GraphQLTypeRegistry;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-import graphql.schema.GraphQLCodeRegistry;
import lombok.RequiredArgsConstructor;
@Component
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/Environment.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/Environment.java
index 40cf1bb62d..58eb124f23 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/Environment.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/Environment.java
@@ -22,6 +22,7 @@ import java.util.Map;
import graphql.GraphQLContext;
import graphql.schema.DataFetchingEnvironment;
+
import lombok.RequiredArgsConstructor;
public interface Environment {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAbstract.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAbstract.java
index 69172e5bf0..9a895532a9 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAbstract.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAbstract.java
@@ -18,12 +18,13 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLFieldDefinition;
+
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.rich.scenario.GqlvScenarioStep;
-import graphql.schema.DataFetchingEnvironment;
-import graphql.schema.GraphQLFieldDefinition;
import lombok.Getter;
public abstract class GqlvAbstract {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAbstractCustom.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAbstractCustom.java
index e02096d01f..b3297f1c8f 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAbstractCustom.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAbstractCustom.java
@@ -18,6 +18,10 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
+import graphql.schema.FieldCoordinates;
+import graphql.schema.GraphQLFieldDefinition;
+import graphql.schema.GraphQLObjectType;
+
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import static graphql.schema.GraphQLObjectType.newObject;
@@ -25,9 +29,6 @@ import org.springframework.lang.Nullable;
import org.apache.causeway.viewer.graphql.model.context.Context;
-import graphql.schema.FieldCoordinates;
-import graphql.schema.GraphQLFieldDefinition;
-import graphql.schema.GraphQLObjectType;
import lombok.Getter;
import lombok.val;
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/interactors/ActionInteractor.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/interactors/ActionInteractor.java
index 4868e2fe20..5cca69cfc1 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/interactors/ActionInteractor.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/interactors/ActionInteractor.java
@@ -18,6 +18,8 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.common.interactors;
+import graphql.schema.GraphQLFieldDefinition;
+
import org.apache.causeway.applib.services.bookmark.BookmarkService;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.object.ManagedObject;
@@ -25,8 +27,6 @@ import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
import org.apache.causeway.viewer.graphql.model.domain.Environment;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-import graphql.schema.GraphQLFieldDefinition;
-
public interface ActionInteractor
extends MemberInteractor<ObjectAction> {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/interactors/ActionParamInteractor.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/interactors/ActionParamInteractor.java
index 0a1644fe4f..4f200dac9b 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/interactors/ActionParamInteractor.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/interactors/ActionParamInteractor.java
@@ -18,12 +18,12 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.common.interactors;
+import graphql.schema.GraphQLFieldDefinition;
+
import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectActionParameterProvider;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-import graphql.schema.GraphQLFieldDefinition;
-
public interface ActionParamInteractor
extends ActionInteractor,
ObjectActionParameterProvider{
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/interactors/PropertyInteractor.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/interactors/PropertyInteractor.java
index defcd3790c..6d386ce980 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/interactors/PropertyInteractor.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/interactors/PropertyInteractor.java
@@ -18,13 +18,13 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.common.interactors;
+import graphql.schema.GraphQLFieldDefinition;
+
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.causeway.viewer.graphql.model.domain.SchemaType;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-import graphql.schema.GraphQLFieldDefinition;
-
public interface PropertyInteractor
extends MemberInteractor<OneToOneAssociation> {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvDomainObject.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvDomainObject.java
index 1ba38a0fa8..8055e2b63f 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvDomainObject.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvDomainObject.java
@@ -18,13 +18,19 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.common.query;
+import java.util.ArrayList;
+import java.util.List;
+
+import graphql.Scalars;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLArgument;
+import graphql.schema.GraphQLFieldDefinition;
+import graphql.schema.GraphQLInputObjectType;
+
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import static graphql.schema.GraphQLInputObjectField.newInputObjectField;
import static graphql.schema.GraphQLInputObjectType.newInputObject;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.causeway.core.metamodel.spec.ActionScope;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.spec.feature.MixedIn;
@@ -39,11 +45,6 @@ import org.apache.causeway.viewer.graphql.model.domain.common.interactors.Object
import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider;
import org.apache.causeway.viewer.graphql.model.mmproviders.SchemaTypeProvider;
-import graphql.Scalars;
-import graphql.schema.DataFetchingEnvironment;
-import graphql.schema.GraphQLArgument;
-import graphql.schema.GraphQLFieldDefinition;
-import graphql.schema.GraphQLInputObjectType;
import lombok.Getter;
import lombok.val;
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvDomainService.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvDomainService.java
index 0741c165b0..9fef2775ff 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvDomainService.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvDomainService.java
@@ -21,6 +21,8 @@ package org.apache.causeway.viewer.graphql.model.domain.common.query;
import java.util.ArrayList;
import java.util.List;
+import graphql.schema.DataFetchingEnvironment;
+
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.spec.feature.MixedIn;
@@ -32,7 +34,6 @@ import org.apache.causeway.viewer.graphql.model.domain.TypeNames;
import org.apache.causeway.viewer.graphql.model.domain.common.SchemaStrategy;
import org.apache.causeway.viewer.graphql.model.domain.common.interactors.ObjectInteractor;
-import graphql.schema.DataFetchingEnvironment;
import lombok.Getter;
import lombok.val;
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvMeta.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvMeta.java
index 51f749cefb..8c32e71e7b 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvMeta.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvMeta.java
@@ -18,6 +18,8 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.common.query;
+import graphql.schema.DataFetchingEnvironment;
+
import org.apache.causeway.applib.services.metamodel.BeanSort;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.model.context.Context;
@@ -35,7 +37,6 @@ import org.apache.causeway.viewer.graphql.model.domain.common.query.meta.GqlvMet
import org.apache.causeway.viewer.graphql.model.domain.common.query.meta.GqlvMetaTitle;
import org.apache.causeway.viewer.graphql.model.domain.common.query.meta.GqlvMetaVersion;
-import graphql.schema.DataFetchingEnvironment;
import lombok.val;
public class GqlvMeta extends GqlvAbstractCustom {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvTopLevelQueryAbstractSchema.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvTopLevelQueryAbstractSchema.java
index f777899518..b59670b1b4 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvTopLevelQueryAbstractSchema.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvTopLevelQueryAbstractSchema.java
@@ -21,6 +21,8 @@ package org.apache.causeway.viewer.graphql.model.domain.common.query;
import java.util.ArrayList;
import java.util.List;
+import graphql.schema.DataFetchingEnvironment;
+
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstract;
@@ -28,7 +30,6 @@ import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstractCustom;
import org.apache.causeway.viewer.graphql.model.domain.Parent;
import org.apache.causeway.viewer.graphql.model.domain.common.SchemaStrategy;
-import graphql.schema.DataFetchingEnvironment;
import lombok.Getter;
import lombok.val;
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaCssClass.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaCssClass.java
index b22a27d07f..6824bc9b4f 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaCssClass.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaCssClass.java
@@ -18,14 +18,14 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.common.query.meta;
+import graphql.Scalars;
+import graphql.schema.DataFetchingEnvironment;
+
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstract;
-import graphql.Scalars;
-import graphql.schema.DataFetchingEnvironment;
-
public class GqlvMetaCssClass extends GqlvAbstract {
public GqlvMetaCssClass(final Context context) {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaGrid.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaGrid.java
index 47c5f322e9..a8fc179eb0 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaGrid.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaGrid.java
@@ -18,14 +18,14 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.common.query.meta;
+import graphql.Scalars;
+import graphql.schema.DataFetchingEnvironment;
+
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstract;
-import graphql.Scalars;
-import graphql.schema.DataFetchingEnvironment;
-
public class GqlvMetaGrid extends GqlvAbstract {
public GqlvMetaGrid(final Context context) {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaIcon.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaIcon.java
index 93b9dbd13b..963ac5691e 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaIcon.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaIcon.java
@@ -18,14 +18,14 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.common.query.meta;
+import graphql.Scalars;
+import graphql.schema.DataFetchingEnvironment;
+
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstract;
-import graphql.Scalars;
-import graphql.schema.DataFetchingEnvironment;
-
public class GqlvMetaIcon extends GqlvAbstract {
public GqlvMetaIcon(final Context context) {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaId.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaId.java
index 4897d4da6d..93ad0449ae 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaId.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaId.java
@@ -18,15 +18,15 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.common.query.meta;
+import graphql.Scalars;
+import graphql.schema.DataFetchingEnvironment;
+
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import static graphql.schema.GraphQLNonNull.nonNull;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstract;
-import graphql.Scalars;
-import graphql.schema.DataFetchingEnvironment;
-
public class GqlvMetaId extends GqlvAbstract {
public GqlvMetaId(final Context context) {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaLayout.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaLayout.java
index 875110547f..eb22e0ac5b 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaLayout.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaLayout.java
@@ -18,14 +18,14 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.common.query.meta;
+import graphql.Scalars;
+import graphql.schema.DataFetchingEnvironment;
+
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstract;
-import graphql.Scalars;
-import graphql.schema.DataFetchingEnvironment;
-
public class GqlvMetaLayout extends GqlvAbstract {
public GqlvMetaLayout(final Context context) {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaLogicalTypeName.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaLogicalTypeName.java
index b50e5833b0..bbdcec1a74 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaLogicalTypeName.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaLogicalTypeName.java
@@ -18,15 +18,15 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.common.query.meta;
+import graphql.Scalars;
+import graphql.schema.DataFetchingEnvironment;
+
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import static graphql.schema.GraphQLNonNull.nonNull;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstract;
-import graphql.Scalars;
-import graphql.schema.DataFetchingEnvironment;
-
public class GqlvMetaLogicalTypeName extends GqlvAbstract {
public GqlvMetaLogicalTypeName(final Context context) {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaSaveAs.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaSaveAs.java
index d4c74243de..ca698115d9 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaSaveAs.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaSaveAs.java
@@ -18,6 +18,11 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.common.query.meta;
+import graphql.GraphQLContext;
+import graphql.Scalars;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLArgument;
+
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import org.apache.causeway.viewer.graphql.model.context.Context;
@@ -25,11 +30,6 @@ import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstract;
import org.apache.causeway.viewer.graphql.model.domain.common.query.GvqlActionUtils;
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
-import graphql.GraphQLContext;
-import graphql.Scalars;
-import graphql.schema.DataFetchingEnvironment;
-import graphql.schema.GraphQLArgument;
-
public class GqlvMetaSaveAs extends GqlvAbstract {
public GqlvMetaSaveAs(final Context context) {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaTitle.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaTitle.java
index ef1d6f97a2..136e970380 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaTitle.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaTitle.java
@@ -18,15 +18,15 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.common.query.meta;
+import graphql.Scalars;
+import graphql.schema.DataFetchingEnvironment;
+
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import static graphql.schema.GraphQLNonNull.nonNull;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstract;
-import graphql.Scalars;
-import graphql.schema.DataFetchingEnvironment;
-
public class GqlvMetaTitle extends GqlvAbstract {
public GqlvMetaTitle(final Context context) {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaVersion.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaVersion.java
index 84af555d10..de5034fd25 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaVersion.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaVersion.java
@@ -18,14 +18,14 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.common.query.meta;
+import graphql.Scalars;
+import graphql.schema.DataFetchingEnvironment;
+
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstract;
-import graphql.Scalars;
-import graphql.schema.DataFetchingEnvironment;
-
public class GqlvMetaVersion extends GqlvAbstract {
public GqlvMetaVersion(final Context context) {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/mutation/GqlvMutationForAction.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/mutation/GqlvMutationForAction.java
index 72278263bc..da09d1a88d 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/mutation/GqlvMutationForAction.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/mutation/GqlvMutationForAction.java
@@ -18,12 +18,19 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.rich.mutation;
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
-
import java.util.ArrayList;
import java.util.Map;
import java.util.Optional;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLArgument;
+import graphql.schema.GraphQLFieldDefinition;
+import graphql.schema.GraphQLList;
+import graphql.schema.GraphQLOutputType;
+import graphql.schema.GraphQLType;
+
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.annotation.Where;
@@ -49,12 +56,6 @@ import org.apache.causeway.viewer.graphql.model.exceptions.HiddenException;
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-import graphql.schema.DataFetchingEnvironment;
-import graphql.schema.GraphQLArgument;
-import graphql.schema.GraphQLFieldDefinition;
-import graphql.schema.GraphQLList;
-import graphql.schema.GraphQLOutputType;
-import graphql.schema.GraphQLType;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/mutation/GqlvMutationForProperty.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/mutation/GqlvMutationForProperty.java
index 0f08945553..616972a307 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/mutation/GqlvMutationForProperty.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/mutation/GqlvMutationForProperty.java
@@ -18,11 +18,16 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.rich.mutation;
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
-
import java.util.Map;
import java.util.Optional;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLArgument;
+import graphql.schema.GraphQLFieldDefinition;
+import graphql.schema.GraphQLOutputType;
+
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
@@ -41,10 +46,6 @@ import org.apache.causeway.viewer.graphql.model.exceptions.InvalidException;
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-import graphql.schema.DataFetchingEnvironment;
-import graphql.schema.GraphQLArgument;
-import graphql.schema.GraphQLFieldDefinition;
-import graphql.schema.GraphQLOutputType;
import lombok.val;
//@Log4j2
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/mutation/GqlvTopLevelMutationRichSchema.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/mutation/GqlvTopLevelMutationRichSchema.java
index d31c956941..4280c5e932 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/mutation/GqlvTopLevelMutationRichSchema.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/mutation/GqlvTopLevelMutationRichSchema.java
@@ -21,6 +21,9 @@ package org.apache.causeway.viewer.graphql.model.domain.rich.mutation;
import java.util.ArrayList;
import java.util.List;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLObjectType;
+
import org.apache.causeway.core.metamodel.facets.properties.update.modify.PropertySetterFacet;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.spec.feature.MixedIn;
@@ -30,8 +33,6 @@ import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstractCustom;
import org.apache.causeway.viewer.graphql.model.domain.Parent;
-import graphql.schema.DataFetchingEnvironment;
-import graphql.schema.GraphQLObjectType;
import lombok.val;
public class GqlvTopLevelMutationRichSchema
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvAction.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvAction.java
index b831110320..5f990c831c 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvAction.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvAction.java
@@ -23,6 +23,9 @@ import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;
+import graphql.schema.GraphQLArgument;
+import graphql.schema.GraphQLFieldDefinition;
+
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.bookmark.BookmarkService;
import org.apache.causeway.commons.collections.Can;
@@ -43,8 +46,6 @@ import org.apache.causeway.viewer.graphql.model.domain.common.query.GvqlActionUt
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-import graphql.schema.GraphQLArgument;
-import graphql.schema.GraphQLFieldDefinition;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionInvoke.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionInvoke.java
index 7a14735060..ab009ca238 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionInvoke.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionInvoke.java
@@ -18,6 +18,8 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.rich.query;
+import graphql.schema.DataFetchingEnvironment;
+
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
@@ -28,7 +30,6 @@ import org.apache.causeway.viewer.graphql.model.domain.common.interactors.Action
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-import graphql.schema.DataFetchingEnvironment;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionInvokeArgs.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionInvokeArgs.java
index 87ad14f3bc..8e7ac9b664 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionInvokeArgs.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionInvokeArgs.java
@@ -22,13 +22,14 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
+import graphql.schema.DataFetchingEnvironment;
+
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstractCustom;
import org.apache.causeway.viewer.graphql.model.domain.TypeNames;
import org.apache.causeway.viewer.graphql.model.domain.common.interactors.ActionInteractor;
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
-import graphql.schema.DataFetchingEnvironment;
import lombok.Getter;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionInvokeArgsArg.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionInvokeArgsArg.java
index 4b8b7b5134..ac1153c1fc 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionInvokeArgsArg.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionInvokeArgsArg.java
@@ -18,6 +18,9 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.rich.query;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLList;
+
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import org.apache.causeway.core.metamodel.object.ManagedObject;
@@ -27,8 +30,6 @@ import org.apache.causeway.viewer.graphql.model.domain.Environment;
import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstract;
import org.apache.causeway.viewer.graphql.model.domain.common.interactors.ActionInteractor;
-import graphql.schema.DataFetchingEnvironment;
-import graphql.schema.GraphQLList;
import lombok.Getter;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionInvokeResult.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionInvokeResult.java
index 84b78a8668..62383753b2 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionInvokeResult.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionInvokeResult.java
@@ -18,6 +18,11 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.rich.query;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLList;
+import graphql.schema.GraphQLOutputType;
+import graphql.schema.GraphQLType;
+
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import org.springframework.lang.Nullable;
@@ -35,10 +40,6 @@ import org.apache.causeway.viewer.graphql.model.exceptions.DisabledException;
import org.apache.causeway.viewer.graphql.model.exceptions.HiddenException;
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
-import graphql.schema.DataFetchingEnvironment;
-import graphql.schema.GraphQLList;
-import graphql.schema.GraphQLOutputType;
-import graphql.schema.GraphQLType;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParams.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParams.java
index e2315ebb06..4de63a2209 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParams.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParams.java
@@ -22,13 +22,14 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
+import graphql.schema.DataFetchingEnvironment;
+
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstractCustom;
import org.apache.causeway.viewer.graphql.model.domain.TypeNames;
import org.apache.causeway.viewer.graphql.model.domain.common.interactors.ActionInteractor;
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
-import graphql.schema.DataFetchingEnvironment;
import lombok.Getter;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParam.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParam.java
index c43d99bf4e..2ac632ddea 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParam.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParam.java
@@ -18,6 +18,9 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.rich.query;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLFieldDefinition;
+
import org.apache.causeway.applib.services.bookmark.BookmarkService;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.object.ManagedObject;
@@ -35,8 +38,6 @@ import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectActionParameterProvider;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-import graphql.schema.DataFetchingEnvironment;
-import graphql.schema.GraphQLFieldDefinition;
import lombok.Getter;
import lombok.extern.log4j.Log4j2;
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamAutoComplete.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamAutoComplete.java
index f33a76bfaa..6ef3a877d0 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamAutoComplete.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamAutoComplete.java
@@ -18,13 +18,17 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.rich.query;
- import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
-import static graphql.schema.GraphQLNonNull.nonNull;
-
-import java.util.Collections;
+ import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLArgument;
+import graphql.schema.GraphQLList;
+
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+import static graphql.schema.GraphQLNonNull.nonNull;
+
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedAction;
@@ -37,9 +41,6 @@ import org.apache.causeway.viewer.graphql.model.domain.common.interactors.Action
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-import graphql.schema.DataFetchingEnvironment;
-import graphql.schema.GraphQLArgument;
-import graphql.schema.GraphQLList;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamChoices.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamChoices.java
index 8935d8a4a3..600080b9bb 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamChoices.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamChoices.java
@@ -18,12 +18,15 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.rich.query;
- import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
-
-import java.util.Collections;
+ import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLList;
+
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedAction;
@@ -36,8 +39,6 @@ import org.apache.causeway.viewer.graphql.model.domain.common.interactors.Action
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-import graphql.schema.DataFetchingEnvironment;
-import graphql.schema.GraphQLList;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamDatatype.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamDatatype.java
index a0f41c297d..78d8604a3b 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamDatatype.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamDatatype.java
@@ -18,6 +18,9 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.rich.query;
+import graphql.Scalars;
+import graphql.schema.DataFetchingEnvironment;
+
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import org.apache.causeway.viewer.graphql.model.context.Context;
@@ -25,8 +28,6 @@ import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstract;
import org.apache.causeway.viewer.graphql.model.domain.TypeNames;
import org.apache.causeway.viewer.graphql.model.domain.common.interactors.ActionParamInteractor;
-import graphql.Scalars;
-import graphql.schema.DataFetchingEnvironment;
import lombok.val;
public class GqlvActionParamsParamDatatype extends GqlvAbstract {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamDefault.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamDefault.java
index ed5a7970bf..b99eb918e5 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamDefault.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamDefault.java
@@ -18,10 +18,12 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.rich.query;
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
-
import java.util.Collections;
+import graphql.schema.DataFetchingEnvironment;
+
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedAction;
import org.apache.causeway.core.metamodel.interactions.managed.ParameterNegotiationModel;
@@ -33,7 +35,6 @@ import org.apache.causeway.viewer.graphql.model.domain.common.interactors.Action
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-import graphql.schema.DataFetchingEnvironment;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamDisabled.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamDisabled.java
index 40ff15d433..e3f170255f 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamDisabled.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamDisabled.java
@@ -18,6 +18,9 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.rich.query;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLOutputType;
+
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
@@ -29,8 +32,6 @@ import org.apache.causeway.viewer.graphql.model.domain.common.interactors.Action
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-import graphql.schema.DataFetchingEnvironment;
-import graphql.schema.GraphQLOutputType;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamHidden.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamHidden.java
index 94c3ddf487..db6ce67db5 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamHidden.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamHidden.java
@@ -18,7 +18,10 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.rich.query;
- import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+ import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLFieldDefinition;
+
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.object.ManagedObject;
@@ -29,8 +32,6 @@ import org.apache.causeway.viewer.graphql.model.domain.common.interactors.Action
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-import graphql.schema.DataFetchingEnvironment;
-import graphql.schema.GraphQLFieldDefinition;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamValidate.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamValidate.java
index 969f7ac8a7..e4696d6e4e 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamValidate.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamValidate.java
@@ -18,6 +18,9 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.rich.query;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLOutputType;
+
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
@@ -29,8 +32,6 @@ import org.apache.causeway.viewer.graphql.model.domain.common.interactors.Action
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-import graphql.schema.DataFetchingEnvironment;
-import graphql.schema.GraphQLOutputType;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionValidity.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionValidity.java
index 63cc1cef71..4831256999 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionValidity.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionValidity.java
@@ -18,10 +18,13 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.rich.query;
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
-
import java.util.Map;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLOutputType;
+
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.consent.Consent;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
@@ -34,8 +37,6 @@ import org.apache.causeway.viewer.graphql.model.domain.common.interactors.Action
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-import graphql.schema.DataFetchingEnvironment;
-import graphql.schema.GraphQLOutputType;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvAssociationDatatype.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvAssociationDatatype.java
index cea532835a..b7207de119 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvAssociationDatatype.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvAssociationDatatype.java
@@ -18,6 +18,9 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.rich.query;
+import graphql.Scalars;
+import graphql.schema.DataFetchingEnvironment;
+
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAssociation;
@@ -26,8 +29,6 @@ import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstract;
import org.apache.causeway.viewer.graphql.model.domain.TypeNames;
import org.apache.causeway.viewer.graphql.model.domain.common.interactors.MemberInteractor;
-import graphql.Scalars;
-import graphql.schema.DataFetchingEnvironment;
import lombok.val;
public abstract class GqlvAssociationDatatype<T extends ObjectAssociation> extends GqlvAbstract {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvAssociationGet.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvAssociationGet.java
index 03962cfe16..6c8f14ebdd 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvAssociationGet.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvAssociationGet.java
@@ -18,6 +18,9 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.rich.query;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLOutputType;
+
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import org.apache.causeway.core.metamodel.object.ManagedObject;
@@ -27,8 +30,6 @@ import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstract;
import org.apache.causeway.viewer.graphql.model.domain.common.interactors.MemberInteractor;
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
-import graphql.schema.DataFetchingEnvironment;
-import graphql.schema.GraphQLOutputType;
import lombok.val;
public abstract class GqlvAssociationGet<T extends ObjectAssociation> extends GqlvAbstract {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvCollectionGet.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvCollectionGet.java
index 0bd7bccc10..a675b827e6 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvCollectionGet.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvCollectionGet.java
@@ -18,11 +18,12 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.rich.query;
+import graphql.schema.GraphQLOutputType;
+
import org.apache.causeway.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.common.interactors.MemberInteractor;
-import graphql.schema.GraphQLOutputType;
import lombok.val;
public class GqlvCollectionGet extends GqlvAssociationGet<OneToManyAssociation> {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvMember.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvMember.java
index ad210832d8..094ab5213a 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvMember.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvMember.java
@@ -18,6 +18,8 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.rich.query;
+import graphql.schema.DataFetchingEnvironment;
+
import org.apache.causeway.core.metamodel.spec.feature.ObjectMember;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstractCustom;
@@ -25,7 +27,6 @@ import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider;
import org.apache.causeway.viewer.graphql.model.mmproviders.SchemaTypeProvider;
-import graphql.schema.DataFetchingEnvironment;
import lombok.Getter;
public abstract class GqlvMember<T extends ObjectMember, H extends ObjectSpecificationProvider & SchemaTypeProvider>
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvMemberDisabled.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvMemberDisabled.java
index d40afa96b4..ced1c9a045 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvMemberDisabled.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvMemberDisabled.java
@@ -18,6 +18,9 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.rich.query;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLOutputType;
+
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import org.apache.causeway.applib.annotation.Where;
@@ -29,8 +32,6 @@ import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstract;
import org.apache.causeway.viewer.graphql.model.domain.common.interactors.MemberInteractor;
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
-import graphql.schema.DataFetchingEnvironment;
-import graphql.schema.GraphQLOutputType;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvMemberHidden.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvMemberHidden.java
index a463d1ca6f..7dfd0347e4 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvMemberHidden.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvMemberHidden.java
@@ -18,6 +18,9 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.rich.query;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLOutputType;
+
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import org.apache.causeway.applib.annotation.Where;
@@ -29,8 +32,6 @@ import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstract;
import org.apache.causeway.viewer.graphql.model.domain.common.interactors.MemberInteractor;
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
-import graphql.schema.DataFetchingEnvironment;
-import graphql.schema.GraphQLOutputType;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvProperty.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvProperty.java
index 50ab8e7771..8fb174e6e5 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvProperty.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvProperty.java
@@ -18,6 +18,9 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.rich.query;
+import graphql.schema.GraphQLArgument;
+import graphql.schema.GraphQLFieldDefinition;
+
import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.applib.value.Clob;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
@@ -34,8 +37,6 @@ import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationP
import org.apache.causeway.viewer.graphql.model.mmproviders.SchemaTypeProvider;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-import graphql.schema.GraphQLArgument;
-import graphql.schema.GraphQLFieldDefinition;
import lombok.val;
public class GqlvProperty
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyAutoComplete.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyAutoComplete.java
index 743f9761fa..6a2b2bf5c4 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyAutoComplete.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyAutoComplete.java
@@ -18,11 +18,15 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.rich.query;
+import java.util.stream.Collectors;
+
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLArgument;
+import graphql.schema.GraphQLList;
+
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import static graphql.schema.GraphQLNonNull.nonNull;
-import java.util.stream.Collectors;
-
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
@@ -32,9 +36,6 @@ import org.apache.causeway.viewer.graphql.model.domain.SchemaType;
import org.apache.causeway.viewer.graphql.model.domain.common.interactors.MemberInteractor;
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
-import graphql.schema.DataFetchingEnvironment;
-import graphql.schema.GraphQLArgument;
-import graphql.schema.GraphQLList;
import lombok.val;
public class GqlvPropertyAutoComplete extends GqlvAbstract {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyChoices.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyChoices.java
index eaced9ce87..35728a5e22 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyChoices.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyChoices.java
@@ -18,10 +18,13 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.rich.query;
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
-
import java.util.stream.Collectors;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLList;
+
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.viewer.graphql.model.context.Context;
@@ -31,8 +34,6 @@ import org.apache.causeway.viewer.graphql.model.domain.common.interactors.Proper
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-import graphql.schema.DataFetchingEnvironment;
-import graphql.schema.GraphQLList;
import lombok.val;
public class GqlvPropertyChoices extends GqlvAbstract {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGet.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGet.java
index a92109ceb5..3635150a70 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGet.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGet.java
@@ -18,11 +18,12 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.rich.query;
+import graphql.schema.GraphQLOutputType;
+
import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.common.interactors.MemberInteractor;
-import graphql.schema.GraphQLOutputType;
import lombok.val;
public class GqlvPropertyGet extends GqlvAssociationGet<OneToOneAssociation> {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlob.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlob.java
index f1e634af78..3b376b69e7 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlob.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlob.java
@@ -18,6 +18,8 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.rich.query;
+import graphql.schema.DataFetchingEnvironment;
+
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import org.apache.causeway.core.config.CausewayConfiguration;
@@ -28,8 +30,6 @@ import org.apache.causeway.viewer.graphql.model.domain.TypeNames;
import org.apache.causeway.viewer.graphql.model.domain.common.interactors.MemberInteractor;
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
-import graphql.schema.DataFetchingEnvironment;
-
public class GqlvPropertyGetBlob
extends GqlvAbstractCustom {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobAbstract.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobAbstract.java
index 3413d9530b..0f9bb584f5 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobAbstract.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobAbstract.java
@@ -21,6 +21,10 @@ package org.apache.causeway.viewer.graphql.model.domain.rich.query;
import java.util.Optional;
import java.util.function.Function;
+import graphql.Scalars;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLFieldDefinition;
+
import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
@@ -29,9 +33,6 @@ import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstract;
import org.apache.causeway.viewer.graphql.model.domain.common.interactors.MemberInteractor;
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
-import graphql.Scalars;
-import graphql.schema.DataFetchingEnvironment;
-import graphql.schema.GraphQLFieldDefinition;
import lombok.val;
public abstract class GqlvPropertyGetBlobAbstract extends GqlvAbstract {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobBytes.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobBytes.java
index fa94ab7b15..a0bf5d5916 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobBytes.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobBytes.java
@@ -18,12 +18,13 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.rich.query;
+import graphql.schema.DataFetchingEnvironment;
+
import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.common.interactors.MemberInteractor;
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
-import graphql.schema.DataFetchingEnvironment;
import lombok.val;
public class GqlvPropertyGetBlobBytes extends GqlvPropertyGetBlobAbstract {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobMimeType.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobMimeType.java
index 5c9eab2de6..0017072a43 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobMimeType.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobMimeType.java
@@ -18,12 +18,12 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.rich.query;
+import graphql.schema.DataFetchingEnvironment;
+
import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.common.interactors.MemberInteractor;
-import graphql.schema.DataFetchingEnvironment;
-
public class GqlvPropertyGetBlobMimeType extends GqlvPropertyGetBlobAbstract {
public GqlvPropertyGetBlobMimeType(
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobName.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobName.java
index f26f0222eb..231803b84f 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobName.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobName.java
@@ -18,13 +18,13 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.rich.query;
+import graphql.schema.DataFetchingEnvironment;
+
import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.common.interactors.MemberInteractor;
-import graphql.schema.DataFetchingEnvironment;
-
public class GqlvPropertyGetBlobName extends GqlvPropertyGetBlobAbstract {
public GqlvPropertyGetBlobName(
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClob.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClob.java
index 5b9a50d688..5f8fb9c371 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClob.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClob.java
@@ -18,6 +18,8 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.rich.query;
+import graphql.schema.DataFetchingEnvironment;
+
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import org.apache.causeway.core.config.CausewayConfiguration;
@@ -28,8 +30,6 @@ import org.apache.causeway.viewer.graphql.model.domain.TypeNames;
import org.apache.causeway.viewer.graphql.model.domain.common.interactors.MemberInteractor;
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
-import graphql.schema.DataFetchingEnvironment;
-
public class GqlvPropertyGetClob
extends GqlvAbstractCustom {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobAbstract.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobAbstract.java
index 1def54c89e..0f7c29ffbb 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobAbstract.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobAbstract.java
@@ -21,6 +21,10 @@ package org.apache.causeway.viewer.graphql.model.domain.rich.query;
import java.util.Optional;
import java.util.function.Function;
+import graphql.Scalars;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLFieldDefinition;
+
import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
@@ -29,9 +33,6 @@ import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstract;
import org.apache.causeway.viewer.graphql.model.domain.common.interactors.MemberInteractor;
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
-import graphql.Scalars;
-import graphql.schema.DataFetchingEnvironment;
-import graphql.schema.GraphQLFieldDefinition;
import lombok.val;
public abstract class GqlvPropertyGetClobAbstract extends GqlvAbstract {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobChars.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobChars.java
index 0f5068339f..8a5a8d772c 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobChars.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobChars.java
@@ -18,12 +18,13 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.rich.query;
+import graphql.schema.DataFetchingEnvironment;
+
import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.common.interactors.MemberInteractor;
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
-import graphql.schema.DataFetchingEnvironment;
import lombok.val;
public class GqlvPropertyGetClobChars extends GqlvPropertyGetClobAbstract {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobMimeType.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobMimeType.java
index b542891d73..a7ccd99f0b 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobMimeType.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobMimeType.java
@@ -18,12 +18,12 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.rich.query;
+import graphql.schema.DataFetchingEnvironment;
+
import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.common.interactors.MemberInteractor;
-import graphql.schema.DataFetchingEnvironment;
-
public class GqlvPropertyGetClobMimeType extends GqlvPropertyGetClobAbstract {
public GqlvPropertyGetClobMimeType(
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobName.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobName.java
index 0628e2a146..011c5005c4 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobName.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobName.java
@@ -18,13 +18,13 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.rich.query;
+import graphql.schema.DataFetchingEnvironment;
+
import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.common.interactors.MemberInteractor;
-import graphql.schema.DataFetchingEnvironment;
-
public class GqlvPropertyGetClobName extends GqlvPropertyGetClobAbstract {
public GqlvPropertyGetClobName(
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertySet.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertySet.java
index 4c6697452f..eebe1c8192 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertySet.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertySet.java
@@ -18,10 +18,12 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.rich.query;
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
-
import java.util.Map;
+import graphql.schema.DataFetchingEnvironment;
+
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.object.ManagedObject;
@@ -35,7 +37,6 @@ import org.apache.causeway.viewer.graphql.model.exceptions.InvalidException;
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-import graphql.schema.DataFetchingEnvironment;
import lombok.val;
public class GqlvPropertySet extends GqlvAbstract {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyValidate.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyValidate.java
index 0d47b2854e..fa8d200ab5 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyValidate.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyValidate.java
@@ -18,6 +18,9 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.rich.query;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLOutputType;
+
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
@@ -28,8 +31,6 @@ import org.apache.causeway.viewer.graphql.model.domain.common.interactors.Proper
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-import graphql.schema.DataFetchingEnvironment;
-import graphql.schema.GraphQLOutputType;
import lombok.val;
public class GqlvPropertyValidate extends GqlvAbstract {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/scenario/GqlvScenario.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/scenario/GqlvScenario.java
index 65363c4a17..6b6027da4e 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/scenario/GqlvScenario.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/scenario/GqlvScenario.java
@@ -18,16 +18,16 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.rich.scenario;
+import graphql.Scalars;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLArgument;
+
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstractCustom;
import org.apache.causeway.viewer.graphql.model.domain.common.SchemaStrategy;
-import graphql.Scalars;
-import graphql.schema.DataFetchingEnvironment;
-import graphql.schema.GraphQLArgument;
-
/**
* Exposes a domain service (view model or entity) via the GQL viewer.
*/
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/scenario/GqlvScenarioName.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/scenario/GqlvScenarioName.java
index bbcd90f4de..ea13787104 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/scenario/GqlvScenarioName.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/scenario/GqlvScenarioName.java
@@ -18,13 +18,14 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.rich.scenario;
+import graphql.Scalars;
+import graphql.schema.DataFetchingEnvironment;
+
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstract;
-import graphql.Scalars;
-import graphql.schema.DataFetchingEnvironment;
import lombok.val;
public class GqlvScenarioName extends GqlvAbstract {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/scenario/GqlvScenarioStep.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/scenario/GqlvScenarioStep.java
index bef738d587..83bf1a6007 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/scenario/GqlvScenarioStep.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/scenario/GqlvScenarioStep.java
@@ -22,6 +22,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
+import graphql.schema.DataFetchingEnvironment;
+
import org.apache.causeway.applib.services.metamodel.BeanSort;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstractCustom;
@@ -30,7 +32,6 @@ import org.apache.causeway.viewer.graphql.model.domain.common.SchemaStrategy;
import org.apache.causeway.viewer.graphql.model.domain.common.query.GqlvDomainObject;
import org.apache.causeway.viewer.graphql.model.domain.common.query.GqlvDomainService;
-import graphql.schema.DataFetchingEnvironment;
import lombok.val;
public class GqlvScenarioStep
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/mutation/GqlvMutationForAction.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/mutation/GqlvMutationForAction.java
index 347c15e506..7713d8700a 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/mutation/GqlvMutationForAction.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/mutation/GqlvMutationForAction.java
@@ -18,12 +18,19 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.simple.mutation;
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
-
import java.util.ArrayList;
import java.util.Map;
import java.util.Optional;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLArgument;
+import graphql.schema.GraphQLFieldDefinition;
+import graphql.schema.GraphQLList;
+import graphql.schema.GraphQLOutputType;
+import graphql.schema.GraphQLType;
+
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.annotation.Where;
@@ -48,12 +55,6 @@ import org.apache.causeway.viewer.graphql.model.exceptions.HiddenException;
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-import graphql.schema.DataFetchingEnvironment;
-import graphql.schema.GraphQLArgument;
-import graphql.schema.GraphQLFieldDefinition;
-import graphql.schema.GraphQLList;
-import graphql.schema.GraphQLOutputType;
-import graphql.schema.GraphQLType;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/mutation/GqlvMutationForProperty.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/mutation/GqlvMutationForProperty.java
index c9cfee3fe3..f47f730340 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/mutation/GqlvMutationForProperty.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/mutation/GqlvMutationForProperty.java
@@ -18,11 +18,16 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.simple.mutation;
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
-
import java.util.Map;
import java.util.Optional;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLArgument;
+import graphql.schema.GraphQLFieldDefinition;
+import graphql.schema.GraphQLOutputType;
+
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
@@ -41,10 +46,6 @@ import org.apache.causeway.viewer.graphql.model.exceptions.InvalidException;
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-import graphql.schema.DataFetchingEnvironment;
-import graphql.schema.GraphQLArgument;
-import graphql.schema.GraphQLFieldDefinition;
-import graphql.schema.GraphQLOutputType;
import lombok.val;
//@Log4j2
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/mutation/GqlvTopLevelMutationSimpleSchema.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/mutation/GqlvTopLevelMutationSimpleSchema.java
index cd6b2ecf3d..17601553af 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/mutation/GqlvTopLevelMutationSimpleSchema.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/mutation/GqlvTopLevelMutationSimpleSchema.java
@@ -21,6 +21,9 @@ package org.apache.causeway.viewer.graphql.model.domain.simple.mutation;
import java.util.ArrayList;
import java.util.List;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLObjectType;
+
import org.apache.causeway.core.metamodel.facets.properties.update.modify.PropertySetterFacet;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.spec.feature.MixedIn;
@@ -30,8 +33,6 @@ import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstractCustom;
import org.apache.causeway.viewer.graphql.model.domain.Parent;
-import graphql.schema.DataFetchingEnvironment;
-import graphql.schema.GraphQLObjectType;
import lombok.val;
public class GqlvTopLevelMutationSimpleSchema
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimpleAction.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimpleAction.java
index 106771be92..6b262e4ff7 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimpleAction.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimpleAction.java
@@ -18,13 +18,20 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.simple.query;
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
-
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLArgument;
+import graphql.schema.GraphQLFieldDefinition;
+import graphql.schema.GraphQLList;
+import graphql.schema.GraphQLOutputType;
+import graphql.schema.GraphQLType;
+
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.bookmark.BookmarkService;
@@ -47,12 +54,6 @@ import org.apache.causeway.viewer.graphql.model.exceptions.HiddenException;
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-import graphql.schema.DataFetchingEnvironment;
-import graphql.schema.GraphQLArgument;
-import graphql.schema.GraphQLFieldDefinition;
-import graphql.schema.GraphQLList;
-import graphql.schema.GraphQLOutputType;
-import graphql.schema.GraphQLType;
import lombok.Getter;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimpleCollection.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimpleCollection.java
index 2c7c8aca2a..d59cd7c437 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimpleCollection.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimpleCollection.java
@@ -18,6 +18,8 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.simple.query;
+import graphql.schema.DataFetchingEnvironment;
+
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import org.apache.causeway.core.metamodel.object.ManagedObject;
@@ -27,7 +29,6 @@ import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstract;
import org.apache.causeway.viewer.graphql.model.domain.common.interactors.ObjectInteractor;
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
-import graphql.schema.DataFetchingEnvironment;
import lombok.val;
public class SimpleCollection
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimpleProperty.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimpleProperty.java
index 85ab131aaf..0a959402f4 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimpleProperty.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimpleProperty.java
@@ -18,6 +18,12 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.simple.query;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.FieldCoordinates;
+import graphql.schema.GraphQLFieldDefinition;
+import graphql.schema.GraphQLObjectType;
+import graphql.schema.GraphQLOutputType;
+
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import static graphql.schema.GraphQLObjectType.newObject;
@@ -35,11 +41,6 @@ import org.apache.causeway.viewer.graphql.model.domain.common.interactors.Member
import org.apache.causeway.viewer.graphql.model.domain.common.interactors.ObjectInteractor;
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
-import graphql.schema.DataFetchingEnvironment;
-import graphql.schema.FieldCoordinates;
-import graphql.schema.GraphQLFieldDefinition;
-import graphql.schema.GraphQLObjectType;
-import graphql.schema.GraphQLOutputType;
import lombok.Getter;
import lombok.val;
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobAbstract.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobAbstract.java
index 10462b802f..5014196fac 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobAbstract.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobAbstract.java
@@ -21,6 +21,10 @@ package org.apache.causeway.viewer.graphql.model.domain.simple.query;
import java.util.Optional;
import java.util.function.Function;
+import graphql.Scalars;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLFieldDefinition;
+
import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
@@ -29,9 +33,6 @@ import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstract;
import org.apache.causeway.viewer.graphql.model.domain.common.interactors.MemberInteractor;
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
-import graphql.Scalars;
-import graphql.schema.DataFetchingEnvironment;
-import graphql.schema.GraphQLFieldDefinition;
import lombok.val;
public abstract class SimplePropertyLobAbstract extends GqlvAbstract {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobBytes.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobBytes.java
index ad72892081..df62dba8a0 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobBytes.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobBytes.java
@@ -18,12 +18,13 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.simple.query;
+import graphql.schema.DataFetchingEnvironment;
+
import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.common.interactors.MemberInteractor;
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
-import graphql.schema.DataFetchingEnvironment;
import lombok.val;
public class SimplePropertyLobBytes extends SimplePropertyLobAbstract {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobChars.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobChars.java
index 946aa25469..b4e529a34b 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobChars.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobChars.java
@@ -18,12 +18,13 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.simple.query;
+import graphql.schema.DataFetchingEnvironment;
+
import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.common.interactors.MemberInteractor;
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
-import graphql.schema.DataFetchingEnvironment;
import lombok.val;
public class SimplePropertyLobChars extends SimplePropertyLobAbstract {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobMimeType.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobMimeType.java
index 9cfc231b0e..40a9bfeef1 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobMimeType.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobMimeType.java
@@ -18,12 +18,12 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.simple.query;
+import graphql.schema.DataFetchingEnvironment;
+
import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.common.interactors.MemberInteractor;
-import graphql.schema.DataFetchingEnvironment;
-
public class SimplePropertyLobMimeType extends SimplePropertyLobAbstract {
public SimplePropertyLobMimeType(
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobName.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobName.java
index 79c8e4f50b..c679c275e6 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobName.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobName.java
@@ -18,13 +18,13 @@
*/
package org.apache.causeway.viewer.graphql.model.domain.simple.query;
+import graphql.schema.DataFetchingEnvironment;
+
import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.common.interactors.MemberInteractor;
-import graphql.schema.DataFetchingEnvironment;
-
public class SimplePropertyLobName extends SimplePropertyLobAbstract {
public SimplePropertyLobName(
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/fetcher/BookmarkedPojo.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/fetcher/BookmarkedPojo.java
index 505c002a0b..4f50eda21e 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/fetcher/BookmarkedPojo.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/fetcher/BookmarkedPojo.java
@@ -18,11 +18,12 @@
*/
package org.apache.causeway.viewer.graphql.model.fetcher;
+import graphql.schema.DataFetchingEnvironment;
+
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.bookmark.BookmarkService;
import org.apache.causeway.viewer.graphql.model.context.Context;
-import graphql.schema.DataFetchingEnvironment;
import lombok.val;
public class BookmarkedPojo {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/fetcher/BookmarkedPojoFetcher.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/fetcher/BookmarkedPojoFetcher.java
index 479a12aad5..d2bccfe36d 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/fetcher/BookmarkedPojoFetcher.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/fetcher/BookmarkedPojoFetcher.java
@@ -18,10 +18,11 @@
*/
package org.apache.causeway.viewer.graphql.model.fetcher;
-import org.apache.causeway.applib.services.bookmark.BookmarkService;
-
import graphql.schema.DataFetcher;
import graphql.schema.DataFetchingEnvironment;
+
+import org.apache.causeway.applib.services.bookmark.BookmarkService;
+
import lombok.val;
public class BookmarkedPojoFetcher implements DataFetcher<Object> {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBigDecimal.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBigDecimal.java
index d63dccb5bb..515a3f905a 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBigDecimal.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBigDecimal.java
@@ -23,14 +23,14 @@ import java.math.BigDecimal;
import javax.annotation.Priority;
import javax.inject.Inject;
+import graphql.Scalars;
+
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import graphql.Scalars;
-
/**
* Maps to a string to avoid loss of precision.
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBigInteger.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBigInteger.java
index 07fbfb6cb5..4e14d0723a 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBigInteger.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBigInteger.java
@@ -23,14 +23,14 @@ import java.math.BigInteger;
import javax.annotation.Priority;
import javax.inject.Inject;
+import graphql.Scalars;
+
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import graphql.Scalars;
-
/**
* Maps to a string to avoid loss of precision.
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBooleanPrimitive.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBooleanPrimitive.java
index 667cb1d126..2fc85f0431 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBooleanPrimitive.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBooleanPrimitive.java
@@ -21,14 +21,14 @@ package org.apache.causeway.viewer.graphql.model.marshallers;
import javax.annotation.Priority;
import javax.inject.Inject;
+import graphql.Scalars;
+
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import graphql.Scalars;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBooleanWrapper.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBooleanWrapper.java
index 7f98a12319..81d1759152 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBooleanWrapper.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBooleanWrapper.java
@@ -21,14 +21,14 @@ package org.apache.causeway.viewer.graphql.model.marshallers;
import javax.annotation.Priority;
import javax.inject.Inject;
+import graphql.Scalars;
+
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import graphql.Scalars;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBytePrimitive.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBytePrimitive.java
index 35c32d5254..79ad91cb68 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBytePrimitive.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBytePrimitive.java
@@ -21,14 +21,14 @@ package org.apache.causeway.viewer.graphql.model.marshallers;
import javax.annotation.Priority;
import javax.inject.Inject;
+import graphql.scalars.ExtendedScalars;
+
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import graphql.scalars.ExtendedScalars;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerByteWrapper.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerByteWrapper.java
index 957d590397..6f0d450ff5 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerByteWrapper.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerByteWrapper.java
@@ -21,14 +21,14 @@ package org.apache.causeway.viewer.graphql.model.marshallers;
import javax.annotation.Priority;
import javax.inject.Inject;
+import graphql.scalars.ExtendedScalars;
+
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import graphql.scalars.ExtendedScalars;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerCharPrimitive.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerCharPrimitive.java
index 86937de25d..6db6b0898f 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerCharPrimitive.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerCharPrimitive.java
@@ -21,14 +21,14 @@ package org.apache.causeway.viewer.graphql.model.marshallers;
import javax.annotation.Priority;
import javax.inject.Inject;
+import graphql.Scalars;
+
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import graphql.Scalars;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerCharacterWrapper.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerCharacterWrapper.java
index ff83538e1c..5593b4c229 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerCharacterWrapper.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerCharacterWrapper.java
@@ -21,14 +21,14 @@ package org.apache.causeway.viewer.graphql.model.marshallers;
import javax.annotation.Priority;
import javax.inject.Inject;
+import graphql.scalars.ExtendedScalars;
+
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import graphql.scalars.ExtendedScalars;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerDoublePrimitive.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerDoublePrimitive.java
index b52338a7d7..53647f6166 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerDoublePrimitive.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerDoublePrimitive.java
@@ -21,14 +21,14 @@ package org.apache.causeway.viewer.graphql.model.marshallers;
import javax.annotation.Priority;
import javax.inject.Inject;
+import graphql.Scalars;
+
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import graphql.Scalars;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerDoubleWrapper.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerDoubleWrapper.java
index ee9e36fdb7..582c1d73b7 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerDoubleWrapper.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerDoubleWrapper.java
@@ -21,14 +21,14 @@ package org.apache.causeway.viewer.graphql.model.marshallers;
import javax.annotation.Priority;
import javax.inject.Inject;
+import graphql.Scalars;
+
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import graphql.Scalars;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerFloatPrimitive.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerFloatPrimitive.java
index 1c44c0d523..a2bc58347e 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerFloatPrimitive.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerFloatPrimitive.java
@@ -21,14 +21,14 @@ package org.apache.causeway.viewer.graphql.model.marshallers;
import javax.annotation.Priority;
import javax.inject.Inject;
+import graphql.Scalars;
+
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import graphql.Scalars;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerFloatWrapper.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerFloatWrapper.java
index e50838369e..299caf77ae 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerFloatWrapper.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerFloatWrapper.java
@@ -21,14 +21,14 @@ package org.apache.causeway.viewer.graphql.model.marshallers;
import javax.annotation.Priority;
import javax.inject.Inject;
+import graphql.Scalars;
+
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import graphql.Scalars;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerIntPrimitive.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerIntPrimitive.java
index 7bf6ac1910..94de2c3dd3 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerIntPrimitive.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerIntPrimitive.java
@@ -21,14 +21,14 @@ package org.apache.causeway.viewer.graphql.model.marshallers;
import javax.annotation.Priority;
import javax.inject.Inject;
+import graphql.Scalars;
+
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import graphql.Scalars;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerIntegerWrapper.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerIntegerWrapper.java
index c5b4814cfa..08549cc575 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerIntegerWrapper.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerIntegerWrapper.java
@@ -21,14 +21,14 @@ package org.apache.causeway.viewer.graphql.model.marshallers;
import javax.annotation.Priority;
import javax.inject.Inject;
+import graphql.Scalars;
+
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import graphql.Scalars;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJdk8LocalDate.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJdk8LocalDate.java
index 32a7c6225f..dd1a378690 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJdk8LocalDate.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJdk8LocalDate.java
@@ -24,14 +24,14 @@ import java.time.format.DateTimeFormatter;
import javax.annotation.Priority;
import javax.inject.Inject;
+import graphql.Scalars;
+
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import graphql.Scalars;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJdk8LocalTime.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJdk8LocalTime.java
index e65e87fe33..d862f81222 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJdk8LocalTime.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJdk8LocalTime.java
@@ -24,14 +24,14 @@ import java.time.format.DateTimeFormatter;
import javax.annotation.Priority;
import javax.inject.Inject;
+import graphql.Scalars;
+
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import graphql.Scalars;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJdk8OffsetDateTime.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJdk8OffsetDateTime.java
index 53bc4ae68a..190f8b0b81 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJdk8OffsetDateTime.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJdk8OffsetDateTime.java
@@ -23,14 +23,14 @@ import java.time.OffsetDateTime;
import javax.annotation.Priority;
import javax.inject.Inject;
+import graphql.scalars.ExtendedScalars;
+
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import graphql.scalars.ExtendedScalars;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJdk8OffsetTime.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJdk8OffsetTime.java
index bfb8120a6e..eaefa0b11c 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJdk8OffsetTime.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJdk8OffsetTime.java
@@ -23,14 +23,14 @@ import java.time.OffsetTime;
import javax.annotation.Priority;
import javax.inject.Inject;
+import graphql.scalars.ExtendedScalars;
+
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import graphql.scalars.ExtendedScalars;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJdk8ZonedDateTime.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJdk8ZonedDateTime.java
index b400fef1f4..6451bf629a 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJdk8ZonedDateTime.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJdk8ZonedDateTime.java
@@ -24,14 +24,14 @@ import java.time.format.DateTimeFormatter;
import javax.annotation.Priority;
import javax.inject.Inject;
+import graphql.Scalars;
+
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import graphql.Scalars;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJodaDateTime.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJodaDateTime.java
index aff8e703ce..94888ae654 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJodaDateTime.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJodaDateTime.java
@@ -21,15 +21,16 @@ package org.apache.causeway.viewer.graphql.model.marshallers;
import javax.annotation.Priority;
import javax.inject.Inject;
+import graphql.Scalars;
+
import org.joda.time.DateTime;
+
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import graphql.Scalars;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJodaLocalDate.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJodaLocalDate.java
index f2dc7178a3..0db51edbf0 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJodaLocalDate.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJodaLocalDate.java
@@ -21,17 +21,18 @@ package org.apache.causeway.viewer.graphql.model.marshallers;
import javax.annotation.Priority;
import javax.inject.Inject;
+import graphql.Scalars;
+
import org.joda.time.LocalDate;
-import org.springframework.stereotype.Component;
import static org.joda.time.format.DateTimeFormat.forPattern;
+import org.springframework.stereotype.Component;
+
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import graphql.Scalars;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJodaLocalTime.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJodaLocalTime.java
index 58c1556461..2ee017d03d 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJodaLocalTime.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJodaLocalTime.java
@@ -22,17 +22,18 @@ package org.apache.causeway.viewer.graphql.model.marshallers;
import javax.annotation.Priority;
import javax.inject.Inject;
+import graphql.Scalars;
+
import org.joda.time.LocalTime;
-import org.springframework.stereotype.Component;
import static org.joda.time.format.DateTimeFormat.forPattern;
+import org.springframework.stereotype.Component;
+
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import graphql.Scalars;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerLongPrimitive.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerLongPrimitive.java
index 3b43ff4039..2eed98dfe5 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerLongPrimitive.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerLongPrimitive.java
@@ -21,14 +21,14 @@ package org.apache.causeway.viewer.graphql.model.marshallers;
import javax.annotation.Priority;
import javax.inject.Inject;
+import graphql.scalars.ExtendedScalars;
+
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import graphql.scalars.ExtendedScalars;
-
/**
* Maps to a string to avoid loss of precision.
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerLongWrapper.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerLongWrapper.java
index 71556bb6b6..7c8eda7d2b 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerLongWrapper.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerLongWrapper.java
@@ -21,14 +21,14 @@ package org.apache.causeway.viewer.graphql.model.marshallers;
import javax.annotation.Priority;
import javax.inject.Inject;
+import graphql.scalars.ExtendedScalars;
+
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import graphql.scalars.ExtendedScalars;
-
/**
* Maps to a string to avoid loss of precision.
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerObject.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerObject.java
index 195fed4759..3d1c1b9f6a 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerObject.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerObject.java
@@ -21,14 +21,14 @@ package org.apache.causeway.viewer.graphql.model.marshallers;
import javax.annotation.Priority;
import javax.inject.Inject;
+import graphql.Scalars;
+
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import graphql.Scalars;
-
/**
* Acts as a fallback. We put it last in the list
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerShortPrimitive.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerShortPrimitive.java
index 84c03ff327..c63a5b29d2 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerShortPrimitive.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerShortPrimitive.java
@@ -21,14 +21,14 @@ package org.apache.causeway.viewer.graphql.model.marshallers;
import javax.annotation.Priority;
import javax.inject.Inject;
+import graphql.scalars.ExtendedScalars;
+
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import graphql.scalars.ExtendedScalars;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerShortWrapper.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerShortWrapper.java
index ac3ecbf4c7..ccfaf659e7 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerShortWrapper.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerShortWrapper.java
@@ -21,14 +21,14 @@ package org.apache.causeway.viewer.graphql.model.marshallers;
import javax.annotation.Priority;
import javax.inject.Inject;
+import graphql.scalars.ExtendedScalars;
+
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import graphql.scalars.ExtendedScalars;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerString.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerString.java
index af271fe8a9..00debcec64 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerString.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerString.java
@@ -21,14 +21,14 @@ package org.apache.causeway.viewer.graphql.model.marshallers;
import javax.annotation.Priority;
import javax.inject.Inject;
+import graphql.Scalars;
+
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import graphql.Scalars;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerUuid.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerUuid.java
index 151c45708d..a0878dc221 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerUuid.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerUuid.java
@@ -23,14 +23,14 @@ import java.util.UUID;
import javax.annotation.Priority;
import javax.inject.Inject;
+import graphql.scalars.ExtendedScalars;
+
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import graphql.scalars.ExtendedScalars;
-
/**
* Maps to a string to avoid loss of precision.
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerVoidPrimitive.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerVoidPrimitive.java
index 409ad4db43..af64c15707 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerVoidPrimitive.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerVoidPrimitive.java
@@ -21,14 +21,14 @@ package org.apache.causeway.viewer.graphql.model.marshallers;
import javax.annotation.Priority;
import javax.inject.Inject;
+import graphql.Scalars;
+
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import graphql.Scalars;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerVoidWrapper.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerVoidWrapper.java
index d590151ea0..ff9590ab84 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerVoidWrapper.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerVoidWrapper.java
@@ -21,14 +21,14 @@ package org.apache.causeway.viewer.graphql.model.marshallers;
import javax.annotation.Priority;
import javax.inject.Inject;
+import graphql.Scalars;
+
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import graphql.Scalars;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/registry/GraphQLTypeRegistry.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/registry/GraphQLTypeRegistry.java
index 27438d0791..241f54d7a6 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/registry/GraphQLTypeRegistry.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/registry/GraphQLTypeRegistry.java
@@ -18,9 +18,6 @@
*/
package org.apache.causeway.viewer.graphql.model.registry;
-import static graphql.schema.GraphQLEnumType.newEnum;
-import static graphql.schema.GraphQLEnumValueDefinition.newEnumValueDefinition;
-
import java.util.Collections;
import java.util.HashSet;
import java.util.Optional;
@@ -31,17 +28,21 @@ import java.util.stream.Stream;
import javax.inject.Inject;
import javax.inject.Provider;
+import graphql.schema.GraphQLEnumType;
+import graphql.schema.GraphQLInputObjectType;
+import graphql.schema.GraphQLNamedType;
+import graphql.schema.GraphQLObjectType;
+import graphql.schema.GraphQLType;
+
+import static graphql.schema.GraphQLEnumType.newEnum;
+import static graphql.schema.GraphQLEnumValueDefinition.newEnumValueDefinition;
+
import org.springframework.stereotype.Component;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.SchemaType;
import org.apache.causeway.viewer.graphql.model.domain.TypeNames;
-import graphql.schema.GraphQLEnumType;
-import graphql.schema.GraphQLInputObjectType;
-import graphql.schema.GraphQLNamedType;
-import graphql.schema.GraphQLObjectType;
-import graphql.schema.GraphQLType;
import lombok.RequiredArgsConstructor;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/toplevel/GqlvTopLevelQueryBothSchemas.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/toplevel/GqlvTopLevelQueryBothSchemas.java
index ba478be15c..ec3adef414 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/toplevel/GqlvTopLevelQueryBothSchemas.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/toplevel/GqlvTopLevelQueryBothSchemas.java
@@ -18,13 +18,13 @@
*/
package org.apache.causeway.viewer.graphql.model.toplevel;
+import graphql.schema.DataFetchingEnvironment;
+
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstractCustom;
import org.apache.causeway.viewer.graphql.model.domain.rich.query.RichTopLevelQuery;
import org.apache.causeway.viewer.graphql.model.domain.simple.query.SimpleTopLevelQuery;
-import graphql.schema.DataFetchingEnvironment;
-
public class GqlvTopLevelQueryBothSchemas extends GqlvAbstractCustom {
private final RichTopLevelQuery richSchema;
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/ScalarMapperUsingScalarMarshallers.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/ScalarMapperUsingScalarMarshallers.java
index 53434d6cab..06e8f5ce43 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/ScalarMapperUsingScalarMarshallers.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/ScalarMapperUsingScalarMarshallers.java
@@ -24,6 +24,8 @@ import java.util.Map;
import javax.inject.Inject;
+import graphql.schema.GraphQLScalarType;
+
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -31,7 +33,6 @@ import org.springframework.stereotype.Component;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshaller;
-import graphql.schema.GraphQLScalarType;
import lombok.RequiredArgsConstructor;
/**
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/TypeMapper.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/TypeMapper.java
index 575b4bcb47..397a9f98b6 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/TypeMapper.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/TypeMapper.java
@@ -18,6 +18,10 @@
*/
package org.apache.causeway.viewer.graphql.model.types;
+import graphql.schema.GraphQLInputType;
+import graphql.schema.GraphQLList;
+import graphql.schema.GraphQLOutputType;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
@@ -26,10 +30,6 @@ import org.apache.causeway.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.causeway.core.metamodel.spec.feature.OneToOneFeature;
import org.apache.causeway.viewer.graphql.model.domain.SchemaType;
-import graphql.schema.GraphQLInputType;
-import graphql.schema.GraphQLList;
-import graphql.schema.GraphQLOutputType;
-
/**
* Internal SPI to map framework's own datatypes to GraphQL's types.
*
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/TypeMapperDefault.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/TypeMapperDefault.java
index 11d71c9591..7e315870f1 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/TypeMapperDefault.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/TypeMapperDefault.java
@@ -18,12 +18,18 @@
*/
package org.apache.causeway.viewer.graphql.model.types;
-import static graphql.schema.GraphQLNonNull.nonNull;
-import static graphql.schema.GraphQLTypeReference.typeRef;
-
import javax.inject.Inject;
import javax.inject.Provider;
+import graphql.Scalars;
+import graphql.schema.GraphQLInputType;
+import graphql.schema.GraphQLList;
+import graphql.schema.GraphQLOutputType;
+import graphql.schema.GraphQLTypeReference;
+
+import static graphql.schema.GraphQLNonNull.nonNull;
+import static graphql.schema.GraphQLTypeReference.typeRef;
+
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -37,11 +43,6 @@ import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.SchemaType;
import org.apache.causeway.viewer.graphql.model.domain.TypeNames;
-import graphql.Scalars;
-import graphql.schema.GraphQLInputType;
-import graphql.schema.GraphQLList;
-import graphql.schema.GraphQLOutputType;
-import graphql.schema.GraphQLTypeReference;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/CausewayViewerGraphqlTestModuleIntegTestAbstract.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/CausewayViewerGraphqlTestModuleIntegTestAbstract.java
index ea3b468f66..f4a44c2499 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/CausewayViewerGraphqlTestModuleIntegTestAbstract.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/CausewayViewerGraphqlTestModuleIntegTestAbstract.java
@@ -49,6 +49,7 @@ import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.TestInfo;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestMethodOrder;
+
import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.autoconfigure.graphql.tester.AutoConfigureHttpGraphQlTester;
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Abstract_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Abstract_IntegTest.java
index 11b5901b14..d3809c1668 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Abstract_IntegTest.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Abstract_IntegTest.java
@@ -22,6 +22,7 @@ import javax.inject.Inject;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
+
import org.springframework.transaction.annotation.Propagation;
import org.apache.causeway.applib.services.bookmark.BookmarkService;
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Admin_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Admin_IntegTest.java
index 4e6ee25bd6..6867f6b07d 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Admin_IntegTest.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Admin_IntegTest.java
@@ -24,6 +24,7 @@ import java.net.URISyntaxException;
import org.junit.jupiter.api.DynamicTest;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.TestFactory;
+
import org.springframework.test.context.ActiveProfiles;
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Calculator_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Calculator_IntegTest.java
index c164fab04b..9bd786d56c 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Calculator_IntegTest.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Calculator_IntegTest.java
@@ -24,6 +24,7 @@ import java.net.URISyntaxException;
import org.junit.jupiter.api.DynamicTest;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.TestFactory;
+
import org.springframework.test.context.ActiveProfiles;
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Department_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Department_IntegTest.java
index ba3dbd0d45..a16a471ad9 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Department_IntegTest.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Department_IntegTest.java
@@ -24,6 +24,7 @@ import java.net.URISyntaxException;
import org.junit.jupiter.api.DynamicTest;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.TestFactory;
+
import org.springframework.test.context.ActiveProfiles;
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/DeptHead_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/DeptHead_IntegTest.java
index b0768a8c19..47e7577c32 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/DeptHead_IntegTest.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/DeptHead_IntegTest.java
@@ -24,6 +24,7 @@ import java.net.URISyntaxException;
import org.junit.jupiter.api.DynamicTest;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.TestFactory;
+
import org.springframework.test.context.ActiveProfiles;
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/People_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/People_IntegTest.java
index 5363af4d63..4ee72d64a0 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/People_IntegTest.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/People_IntegTest.java
@@ -24,6 +24,7 @@ import java.net.URISyntaxException;
import org.junit.jupiter.api.DynamicTest;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.TestFactory;
+
import org.springframework.test.context.ActiveProfiles;
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Person_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Person_IntegTest.java
index 446e03f215..7c5fd55cbf 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Person_IntegTest.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Person_IntegTest.java
@@ -24,6 +24,7 @@ import java.net.URISyntaxException;
import org.junit.jupiter.api.DynamicTest;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.TestFactory;
+
import org.springframework.test.context.ActiveProfiles;
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/StaffMutating_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/StaffMutating_IntegTest.java
index ac7c826afb..22d18be441 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/StaffMutating_IntegTest.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/StaffMutating_IntegTest.java
@@ -23,6 +23,7 @@ import org.approvaltests.reporters.DiffReporter;
import org.approvaltests.reporters.UseReporter;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+
import org.springframework.test.context.ActiveProfiles;
import org.springframework.transaction.annotation.Propagation;
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Staff_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Staff_IntegTest.java
index d2d12b780a..d02cdbfc93 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Staff_IntegTest.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Staff_IntegTest.java
@@ -24,6 +24,7 @@ import java.net.URISyntaxException;
import org.junit.jupiter.api.DynamicTest;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.TestFactory;
+
import org.springframework.test.context.ActiveProfiles;
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/simple/SimpleDepartment_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/simple/SimpleDepartment_IntegTest.java
index 3be5670c05..5ae0cc7355 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/simple/SimpleDepartment_IntegTest.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/simple/SimpleDepartment_IntegTest.java
@@ -24,6 +24,7 @@ import java.net.URISyntaxException;
import org.junit.jupiter.api.DynamicTest;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.TestFactory;
+
import org.springframework.test.context.ActiveProfiles;
import org.apache.causeway.viewer.graphql.viewer.test.e2e.Abstract_IntegTest;
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/special/DepartmentMutating_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/special/DepartmentMutating_IntegTest.java
index 6b2fdbc358..2eef76797f 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/special/DepartmentMutating_IntegTest.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/special/DepartmentMutating_IntegTest.java
@@ -25,6 +25,7 @@ import org.approvaltests.reporters.DiffReporter;
import org.approvaltests.reporters.UseReporter;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.transaction.annotation.Propagation;
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/special/DeptHeadMutating_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/special/DeptHeadMutating_IntegTest.java
index f5ad981c67..f60514e5bc 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/special/DeptHeadMutating_IntegTest.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/special/DeptHeadMutating_IntegTest.java
@@ -25,6 +25,7 @@ import org.approvaltests.reporters.DiffReporter;
import org.approvaltests.reporters.UseReporter;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+
import org.springframework.test.context.ActiveProfiles;
import org.springframework.transaction.annotation.Propagation;
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/special/DeptHead_2_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/special/DeptHead_2_IntegTest.java
index 74eaeb8333..4d9aaa2830 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/special/DeptHead_2_IntegTest.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/special/DeptHead_2_IntegTest.java
@@ -23,11 +23,12 @@ import org.approvaltests.reporters.DiffReporter;
import org.approvaltests.reporters.UseReporter;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.transaction.annotation.Propagation;
import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.transaction.annotation.Propagation;
+
import org.apache.causeway.viewer.graphql.viewer.test.domain.dept.DeptHead;
import org.apache.causeway.viewer.graphql.viewer.test.e2e.Abstract_IntegTest;
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/special/Person_2_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/special/Person_2_IntegTest.java
index 1ce11f5de1..e7948777a2 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/special/Person_2_IntegTest.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/special/Person_2_IntegTest.java
@@ -25,6 +25,7 @@ import org.approvaltests.reporters.DiffReporter;
import org.approvaltests.reporters.UseReporter;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+
import org.springframework.test.context.ActiveProfiles;
import org.springframework.transaction.annotation.Propagation;
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/special/Staff_2_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/special/Staff_2_IntegTest.java
index 4d0d37e54d..bd2357ab2c 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/special/Staff_2_IntegTest.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/special/Staff_2_IntegTest.java
@@ -31,10 +31,11 @@ import org.approvaltests.reporters.DiffReporter;
import org.approvaltests.reporters.UseReporter;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
-import org.springframework.test.context.ActiveProfiles;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import org.springframework.test.context.ActiveProfiles;
+
import org.apache.causeway.viewer.graphql.viewer.test.e2e.Abstract_IntegTest;
import lombok.val;
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/schema/GqlSchema_print_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/schema/GqlSchema_print_IntegTest.java
index 71ee746ee3..05f5dd2429 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/schema/GqlSchema_print_IntegTest.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/schema/GqlSchema_print_IntegTest.java
@@ -25,9 +25,12 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
+import graphql.schema.idl.SchemaPrinter;
+
import org.approvaltests.core.Options;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+
import org.springframework.transaction.annotation.Transactional;
import org.apache.causeway.commons.io.TextUtils;
@@ -38,7 +41,6 @@ import org.apache.causeway.viewer.graphql.viewer.test.CausewayViewerGraphqlTestM
import static org.apache.causeway.commons.internal.assertions._Assert.assertNotNull;
-import graphql.schema.idl.SchemaPrinter;
import lombok.val;
@Transactional
diff --git a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/auth/UserMementoProviderDefault.java b/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/auth/UserMementoProviderDefault.java
index f8b24fc78c..f15c442ace 100644
--- a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/auth/UserMementoProviderDefault.java
+++ b/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/auth/UserMementoProviderDefault.java
@@ -20,6 +20,9 @@ package org.apache.causeway.viewer.graphql.viewer.auth;
import javax.inject.Inject;
+import graphql.execution.ExecutionContext;
+import graphql.execution.ExecutionStrategyParameters;
+
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -30,8 +33,6 @@ import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.auth.UserMementoProvider;
-import graphql.execution.ExecutionContext;
-import graphql.execution.ExecutionStrategyParameters;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/AsyncExecutionStrategyResolvingWithinInteraction.java b/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/AsyncExecutionStrategyResolvingWithinInteraction.java
index 8ad334c5b8..ab63438dba 100644
--- a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/AsyncExecutionStrategyResolvingWithinInteraction.java
+++ b/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/AsyncExecutionStrategyResolvingWithinInteraction.java
@@ -20,16 +20,17 @@ package org.apache.causeway.viewer.graphql.viewer.integration;
import java.util.concurrent.CompletableFuture;
+import graphql.execution.AsyncExecutionStrategy;
+import graphql.execution.ExecutionContext;
+import graphql.execution.ExecutionStrategyParameters;
+import graphql.execution.FieldValueInfo;
+
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.viewer.graphql.applib.auth.UserMementoProvider;
-import graphql.execution.AsyncExecutionStrategy;
-import graphql.execution.ExecutionContext;
-import graphql.execution.ExecutionStrategyParameters;
-import graphql.execution.FieldValueInfo;
import lombok.val;
@Service
diff --git a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/ExecutionGraphQlServiceForCauseway.java b/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/ExecutionGraphQlServiceForCauseway.java
index 85e06ba3ee..3b8324199d 100644
--- a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/ExecutionGraphQlServiceForCauseway.java
+++ b/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/ExecutionGraphQlServiceForCauseway.java
@@ -29,6 +29,7 @@ import org.springframework.graphql.execution.GraphQlSource;
import org.springframework.stereotype.Service;
import lombok.RequiredArgsConstructor;
+
import reactor.core.publisher.Mono;
/**
diff --git a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java b/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java
index ee06a55f26..874d9c65b2 100644
--- a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java
+++ b/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java
@@ -20,6 +20,10 @@ package org.apache.causeway.viewer.graphql.viewer.integration;
import javax.annotation.PostConstruct;
+import graphql.GraphQL;
+import graphql.execution.SimpleDataFetcherExceptionHandler;
+import graphql.schema.GraphQLSchema;
+
import org.springframework.graphql.execution.GraphQlSource;
import org.springframework.stereotype.Service;
@@ -36,9 +40,6 @@ import org.apache.causeway.viewer.graphql.model.domain.simple.query.SimpleTopLev
import org.apache.causeway.viewer.graphql.model.registry.GraphQLTypeRegistry;
import org.apache.causeway.viewer.graphql.model.toplevel.GqlvTopLevelQueryBothSchemas;
-import graphql.GraphQL;
-import graphql.execution.SimpleDataFetcherExceptionHandler;
-import graphql.schema.GraphQLSchema;
import lombok.val;
@Service()
diff --git a/viewers/restfulobjects/applib/src/main/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentation.java b/viewers/restfulobjects/applib/src/main/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentation.java
index 5138553f40..210aaf9716 100644
--- a/viewers/restfulobjects/applib/src/main/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentation.java
+++ b/viewers/restfulobjects/applib/src/main/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentation.java
@@ -46,6 +46,7 @@ import com.fasterxml.jackson.databind.node.POJONode;
import org.joda.time.LocalTime;
import org.joda.time.format.DateTimeFormatter;
import org.joda.time.format.ISODateTimeFormat;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.commons.internal.base._Casts;
diff --git a/viewers/restfulobjects/client/src/main/java/org/apache/causeway/viewer/restfulobjects/client/RestfulClient.java b/viewers/restfulobjects/client/src/main/java/org/apache/causeway/viewer/restfulobjects/client/RestfulClient.java
index 28f95289b3..0a130d569f 100644
--- a/viewers/restfulobjects/client/src/main/java/org/apache/causeway/viewer/restfulobjects/client/RestfulClient.java
+++ b/viewers/restfulobjects/client/src/main/java/org/apache/causeway/viewer/restfulobjects/client/RestfulClient.java
@@ -36,8 +36,8 @@ import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.functional.Try;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.context._Context;
-import org.apache.causeway.viewer.restfulobjects.client.auth.AuthorizationHeaderFactory;
import org.apache.causeway.viewer.restfulobjects.client.auth.AuthFilter;
+import org.apache.causeway.viewer.restfulobjects.client.auth.AuthorizationHeaderFactory;
import org.apache.causeway.viewer.restfulobjects.client.log.ClientConversationLogger;
import lombok.NonNull;
diff --git a/viewers/restfulobjects/client/src/main/java/org/apache/causeway/viewer/restfulobjects/client/auth/oauth2/azure/AuthorizationHeaderFactoryOauth2Azure.java b/viewers/restfulobjects/client/src/main/java/org/apache/causeway/viewer/restfulobjects/client/auth/oauth2/azure/AuthorizationHeaderFactoryOauth2Azure.java
index 31383fc03e..aa1335a78a 100644
--- a/viewers/restfulobjects/client/src/main/java/org/apache/causeway/viewer/restfulobjects/client/auth/oauth2/azure/AuthorizationHeaderFactoryOauth2Azure.java
+++ b/viewers/restfulobjects/client/src/main/java/org/apache/causeway/viewer/restfulobjects/client/auth/oauth2/azure/AuthorizationHeaderFactoryOauth2Azure.java
@@ -18,14 +18,14 @@
*/
package org.apache.causeway.viewer.restfulobjects.client.auth.oauth2.azure;
-import lombok.SneakyThrows;
-import lombok.val;
-
import org.apache.causeway.viewer.restfulobjects.client.AuthenticationMode;
import org.apache.causeway.viewer.restfulobjects.client.RestfulClientConfig;
import org.apache.causeway.viewer.restfulobjects.client.auth.AuthorizationHeaderFactory;
import org.apache.causeway.viewer.restfulobjects.client.auth.oauth2.Oauth2Creds;
+import lombok.SneakyThrows;
+import lombok.val;
+
public class AuthorizationHeaderFactoryOauth2Azure implements AuthorizationHeaderFactory {
private final TokenCache tokenCache;
diff --git a/viewers/restfulobjects/client/src/main/java/org/apache/causeway/viewer/restfulobjects/client/auth/oauth2/azure/TokenCache.java b/viewers/restfulobjects/client/src/main/java/org/apache/causeway/viewer/restfulobjects/client/auth/oauth2/azure/TokenCache.java
index a2f65deca5..bfb8d55052 100644
--- a/viewers/restfulobjects/client/src/main/java/org/apache/causeway/viewer/restfulobjects/client/auth/oauth2/azure/TokenCache.java
+++ b/viewers/restfulobjects/client/src/main/java/org/apache/causeway/viewer/restfulobjects/client/auth/oauth2/azure/TokenCache.java
@@ -18,8 +18,6 @@
*/
package org.apache.causeway.viewer.restfulobjects.client.auth.oauth2.azure;
-import lombok.val;
-
import java.time.ZonedDateTime;
import javax.ws.rs.client.ClientBuilder;
@@ -32,6 +30,8 @@ import javax.ws.rs.core.UriBuilder;
import org.apache.causeway.commons.functional.Railway;
import org.apache.causeway.viewer.restfulobjects.client.auth.oauth2.Oauth2Creds;
+import lombok.val;
+
public class TokenCache {
private final Oauth2Creds creds;
diff --git a/viewers/restfulobjects/client/src/main/java/org/apache/causeway/viewer/restfulobjects/client/auth/oauth2/azure/TokenParser.java b/viewers/restfulobjects/client/src/main/java/org/apache/causeway/viewer/restfulobjects/client/auth/oauth2/azure/TokenParser.java
index 0722b5250a..c0c9c6ad5d 100644
--- a/viewers/restfulobjects/client/src/main/java/org/apache/causeway/viewer/restfulobjects/client/auth/oauth2/azure/TokenParser.java
+++ b/viewers/restfulobjects/client/src/main/java/org/apache/causeway/viewer/restfulobjects/client/auth/oauth2/azure/TokenParser.java
@@ -22,10 +22,10 @@ import java.io.IOException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.Data;
-
import org.apache.causeway.commons.functional.Railway;
+import lombok.Data;
+
class TokenParser {
static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
diff --git a/viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/conneg/RestfulObjectsJaxbWriterForXml.java b/viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/conneg/RestfulObjectsJaxbWriterForXml.java
index 07f9a355e8..e523399eb5 100644
--- a/viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/conneg/RestfulObjectsJaxbWriterForXml.java
+++ b/viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/conneg/RestfulObjectsJaxbWriterForXml.java
@@ -28,6 +28,7 @@ import javax.ws.rs.ext.Provider;
import javax.xml.bind.Marshaller;
import org.jboss.resteasy.plugins.providers.jaxb.JAXBXmlRootElementProvider;
+
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
diff --git a/viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/webmodule/WebModuleJaxrsResteasy.java b/viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/webmodule/WebModuleJaxrsResteasy.java
index 321d07d1f9..5abdea0b70 100644
--- a/viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/webmodule/WebModuleJaxrsResteasy.java
+++ b/viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/webmodule/WebModuleJaxrsResteasy.java
@@ -26,6 +26,7 @@ import javax.servlet.ServletException;
import org.jboss.resteasy.core.providerfactory.ResteasyProviderFactoryImpl;
import org.jboss.resteasy.spi.ResteasyProviderFactory;
+
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java
index 93799a305b..9036d88ff3 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java
@@ -25,17 +25,17 @@ import java.util.stream.Stream;
import javax.inject.Named;
+import org.springframework.stereotype.Component;
+
import org.apache.causeway.applib.CausewayModuleApplib;
+import org.apache.causeway.applib.annotation.Programmatic;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.config.CausewayModuleCoreConfig;
import org.apache.causeway.core.metamodel.CausewayModuleCoreMetamodel;
import org.apache.causeway.core.runtime.CausewayModuleCoreRuntime;
import org.apache.causeway.schema.CausewayModuleSchema;
-import org.apache.causeway.viewer.restfulobjects.rendering.CausewayModuleRestfulObjectsRendering;
-import org.springframework.stereotype.Component;
-
-import org.apache.causeway.applib.annotation.Programmatic;
-import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.viewer.restfulobjects.applib.CausewayModuleViewerRestfulObjectsApplib;
+import org.apache.causeway.viewer.restfulobjects.rendering.CausewayModuleRestfulObjectsRendering;
@Component
@Named(CausewayModuleViewerRestfulObjectsApplib.NAMESPACE + ".TaggerDefault")
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/ValueSchemaFactoryDefault.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/ValueSchemaFactoryDefault.java
index ca7e842c2f..1cc9514279 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/ValueSchemaFactoryDefault.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/ValueSchemaFactoryDefault.java
@@ -32,12 +32,15 @@ import javax.inject.Named;
import org.joda.time.DateTime;
import org.joda.time.LocalDate;
import org.joda.time.LocalDateTime;
+
import org.springframework.stereotype.Component;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.viewer.restfulobjects.applib.CausewayModuleViewerRestfulObjectsApplib;
+import lombok.val;
+
import io.swagger.v3.oas.models.media.BooleanSchema;
import io.swagger.v3.oas.models.media.ByteArraySchema;
import io.swagger.v3.oas.models.media.DateSchema;
@@ -47,7 +50,6 @@ import io.swagger.v3.oas.models.media.NumberSchema;
import io.swagger.v3.oas.models.media.Schema;
import io.swagger.v3.oas.models.media.StringSchema;
import io.swagger.v3.oas.models.media.UUIDSchema;
-import lombok.val;
@Component
@Named(CausewayModuleViewerRestfulObjectsApplib.NAMESPACE + ".ValueSchemaFactoryDefault")
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/_OpenApi.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/_OpenApi.java
index d5ac6451a6..253b73eda8 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/_OpenApi.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/_OpenApi.java
@@ -21,6 +21,10 @@ package org.apache.causeway.viewer.restfulobjects.rendering.service.swagger.inte
import java.util.List;
import java.util.function.Consumer;
+import lombok.NonNull;
+import lombok.val;
+import lombok.experimental.UtilityClass;
+
import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.media.Content;
import io.swagger.v3.oas.models.media.MediaType;
@@ -33,9 +37,6 @@ import io.swagger.v3.oas.models.parameters.QueryParameter;
import io.swagger.v3.oas.models.parameters.RequestBody;
import io.swagger.v3.oas.models.responses.ApiResponse;
import io.swagger.v3.oas.models.responses.ApiResponses;
-import lombok.NonNull;
-import lombok.val;
-import lombok.experimental.UtilityClass;
@UtilityClass
class _OpenApi {
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/_OpenApiModelFactory.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/_OpenApiModelFactory.java
index 5a7590d941..5d4518bbcb 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/_OpenApiModelFactory.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/_OpenApiModelFactory.java
@@ -46,6 +46,8 @@ import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
import org.apache.causeway.core.metamodel.util.Facets;
+import lombok.val;
+
import io.swagger.v3.oas.models.Components;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation;
@@ -62,7 +64,6 @@ import io.swagger.v3.oas.models.security.SecurityRequirement;
import io.swagger.v3.oas.models.security.SecurityScheme;
import io.swagger.v3.oas.models.security.SecurityScheme.Type;
import io.swagger.v3.oas.models.servers.Server;
-import lombok.val;
class _OpenApiModelFactory {
diff --git a/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java b/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
index c018b916d2..6fc017018e 100644
--- a/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
+++ b/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
@@ -29,11 +29,12 @@ import javax.ws.rs.core.MediaType;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import org.springframework.web.context.WebApplicationContext;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.springframework.web.context.WebApplicationContext;
+
import org.apache.causeway.applib.services.iactn.Interaction;
import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker;
diff --git a/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
index ae4be649f2..1d2f1afe89 100644
--- a/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
+++ b/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
@@ -24,11 +24,12 @@ import javax.servlet.http.HttpServletRequest;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import org.springframework.web.context.WebApplicationContext;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.springframework.web.context.WebApplicationContext;
+
import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.commons.io.UrlUtils;
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/EntityCollectionModel.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/EntityCollectionModel.java
index 010f1de0fb..89926b8c11 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/EntityCollectionModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/EntityCollectionModel.java
@@ -20,10 +20,10 @@ package org.apache.causeway.viewer.wicket.model.models;
import java.util.Optional;
-import org.apache.causeway.applib.annotation.TableDecorator;
import org.apache.wicket.model.IModel;
import org.apache.causeway.applib.Identifier;
+import org.apache.causeway.applib.annotation.TableDecorator;
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/FileUploadModels.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/FileUploadModels.java
index 13dff4aec3..aa9cd54d05 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/FileUploadModels.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/FileUploadModels.java
@@ -23,6 +23,7 @@ import java.util.Collections;
import java.util.List;
import org.apache.wicket.markup.html.form.upload.FileUpload;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.value.Blob;
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarConvertingModel.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarConvertingModel.java
index 8d29f36e7c..858d1653d5 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarConvertingModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarConvertingModel.java
@@ -19,6 +19,7 @@
package org.apache.causeway.viewer.wicket.model.models;
import org.apache.wicket.model.ChainingModel;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.commons.internal.base._Casts;
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarModel.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarModel.java
index b2d662d747..f74d471ccd 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarModel.java
@@ -25,6 +25,7 @@ import java.util.OptionalInt;
import org.apache.wicket.model.ChainingModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.util.convert.IConverter;
+
import org.springframework.util.ClassUtils;
import org.apache.causeway.applib.annotation.PromptStyle;
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarUnwrappingModel.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarUnwrappingModel.java
index 13524be017..14fe9f38be 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarUnwrappingModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarUnwrappingModel.java
@@ -19,6 +19,7 @@
package org.apache.causeway.viewer.wicket.model.models;
import org.apache.wicket.model.ChainingModel;
+
import org.springframework.util.ClassUtils;
import org.apache.causeway.commons.internal.assertions._Assert;
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/UiObjectWkt.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/UiObjectWkt.java
index b7857b94b5..878a2c8834 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/UiObjectWkt.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/UiObjectWkt.java
@@ -25,6 +25,7 @@ import java.util.stream.Stream;
import org.apache.wicket.Component;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.ResourceReference;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.exceptions.unrecoverable.ObjectNotFoundException;
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/binding/BooleanBinding.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/binding/BooleanBinding.java
index 2c0eafa733..0c46d53bce 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/binding/BooleanBinding.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/binding/BooleanBinding.java
@@ -22,6 +22,7 @@ import java.util.Optional;
import org.apache.wicket.model.ChainingModel;
import org.apache.wicket.model.IModel;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.commons.internal.base._Casts;
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/act/ActionInteractionWkt.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/act/ActionInteractionWkt.java
index 98537e8aeb..9452d0ba65 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/act/ActionInteractionWkt.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/act/ActionInteractionWkt.java
@@ -24,6 +24,7 @@ import java.util.stream.IntStream;
import java.util.stream.Stream;
import org.apache.wicket.model.ChainingModel;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.Identifier;
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/coll/DataRowToggleWkt.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/coll/DataRowToggleWkt.java
index 4d164002d1..fded57e23f 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/coll/DataRowToggleWkt.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/coll/DataRowToggleWkt.java
@@ -21,6 +21,7 @@ package org.apache.causeway.viewer.wicket.model.models.interaction.coll;
import java.util.Optional;
import org.apache.wicket.model.IModel;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.commons.internal.binding._BindableAbstract;
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/util/PageParameterUtils.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/util/PageParameterUtils.java
index fbfe7cd39b..3027cd7ed4 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/util/PageParameterUtils.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/util/PageParameterUtils.java
@@ -28,6 +28,7 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.INamedParameters.NamedPair;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.string.StringValue;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.Identifier;
diff --git a/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/ConverterTester.java b/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/ConverterTester.java
index 0fcac99f9c..e0fe603dc2 100644
--- a/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/ConverterTester.java
+++ b/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/ConverterTester.java
@@ -23,8 +23,6 @@ import java.math.BigDecimal;
import java.util.Locale;
import java.util.Objects;
-import org.apache.causeway.core.config.CausewayConfiguration;
-
import org.apache.wicket.util.convert.ConversionException;
import org.assertj.core.util.Arrays;
import org.mockito.Mockito;
@@ -47,6 +45,7 @@ import org.apache.causeway.applib.value.semantics.ValueSemanticsResolver;
import org.apache.causeway.commons.functional.ThrowingRunnable;
import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel._testing.MetaModelContext_forTesting;
import org.apache.causeway.core.metamodel.commons.ViewOrEditMode;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
diff --git a/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jdkmath/BigDecimalConverterTest.java b/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jdkmath/BigDecimalConverterTest.java
index 778e6e4b6f..715b926a78 100644
--- a/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jdkmath/BigDecimalConverterTest.java
+++ b/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jdkmath/BigDecimalConverterTest.java
@@ -26,6 +26,8 @@ import javax.validation.constraints.Digits;
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.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.core.metamodel.commons.ViewOrEditMode;
@@ -36,8 +38,6 @@ import org.apache.causeway.viewer.wicket.ui.test.components.scalars.ConverterTes
import lombok.Getter;
import lombok.Setter;
-import static org.assertj.core.api.Assertions.assertThat;
-
class BigDecimalConverterTest {
final BigDecimal bd_123_45_scale2 = new BigDecimal("123.45").setScale(2);
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/actionresponse/ActionResultResponseType.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
index ee81caf888..6153f8f7f2 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
@@ -24,6 +24,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.cycle.PageRequestHandlerTracker;
import org.apache.wicket.request.cycle.RequestCycle;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.value.Blob;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/actionresponse/PageRedirectRequest.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/actionresponse/PageRedirectRequest.java
index 3a193a6af4..7df1b56cc8 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/actionresponse/PageRedirectRequest.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/actionresponse/PageRedirectRequest.java
@@ -21,6 +21,7 @@ package org.apache.causeway.viewer.wicket.ui.actionresponse;
import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+
import org.springframework.lang.Nullable;
import lombok.AccessLevel;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/app/logout/LogoutHandlerWkt.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/app/logout/LogoutHandlerWkt.java
index 22c29048b6..6f47ddb00a 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/app/logout/LogoutHandlerWkt.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/app/logout/LogoutHandlerWkt.java
@@ -20,6 +20,7 @@ package org.apache.causeway.viewer.wicket.ui.app.logout;
import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
import org.apache.wicket.request.cycle.RequestCycle;
+
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/app/registry/ComponentFactoryRegistry.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/app/registry/ComponentFactoryRegistry.java
index bea04af4a5..400e439e0c 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/app/registry/ComponentFactoryRegistry.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/app/registry/ComponentFactoryRegistry.java
@@ -25,6 +25,7 @@ import java.util.stream.Stream;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.model.IModel;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.commons.collections.ImmutableEnumSet;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actions/ActionParametersForm.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actions/ActionParametersForm.java
index 3763acf784..4a386113d7 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actions/ActionParametersForm.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actions/ActionParametersForm.java
@@ -44,9 +44,10 @@ import org.apache.causeway.viewer.wicket.ui.panels.PromptFormAbstract;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.causeway.viewer.wicket.ui.util.WktDecorators;
-import de.agilecoders.wicket.extensions.markup.html.bootstrap.confirmation.ConfirmationBehavior;
import lombok.val;
+import de.agilecoders.wicket.extensions.markup.html.bootstrap.confirmation.ConfirmationBehavior;
+
class ActionParametersForm
extends PromptFormAbstract<ActionModel> {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/CollectionPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/CollectionPanel.java
index e1227b14d7..2cbeaa9086 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/CollectionPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/CollectionPanel.java
@@ -34,11 +34,12 @@ import org.apache.causeway.viewer.wicket.ui.components.collectioncontents.ajaxta
import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarPanelAbstract;
import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import lombok.Getter;
import lombok.Setter;
import lombok.val;
+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+
/**
* Panel for rendering entity collection; analogous to (any concrete subclass
* of) {@link ScalarPanelAbstract}.
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/selector/CollectionPresentationSelectorHelper.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/selector/CollectionPresentationSelectorHelper.java
index 0e99bb9c8a..0411aec177 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/selector/CollectionPresentationSelectorHelper.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/selector/CollectionPresentationSelectorHelper.java
@@ -23,6 +23,7 @@ import java.util.Optional;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.layout.component.CollectionLayoutData;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/BulkToggleWkt.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/BulkToggleWkt.java
index bca71fdc23..52ac93f6a5 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/BulkToggleWkt.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/BulkToggleWkt.java
@@ -21,6 +21,7 @@ package org.apache.causeway.viewer.wicket.ui.components.collectioncontents.ajaxt
import java.util.Optional;
import org.apache.wicket.model.IModel;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.commons.internal.binding._BindableAbstract;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ColumnAbbreviationOptions.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ColumnAbbreviationOptions.java
index c27f24f58d..9aff2768af 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ColumnAbbreviationOptions.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ColumnAbbreviationOptions.java
@@ -23,6 +23,7 @@ import java.util.Optional;
import org.apache.wicket.Component;
import org.apache.wicket.MetaDataKey;
+
import org.springframework.lang.Nullable;
import lombok.Builder;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/TitleColumn.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/TitleColumn.java
index d602422d2d..42491874bc 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/TitleColumn.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/TitleColumn.java
@@ -20,6 +20,7 @@ package org.apache.causeway.viewer.wicket.ui.components.collectioncontents.ajaxt
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.services.bookmark.Bookmark;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java
index 487550e15b..14d4dfe09d 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java
@@ -44,9 +44,10 @@ import org.apache.causeway.viewer.wicket.ui.components.collection.count.Collecti
import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import lombok.val;
+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+
/**
* {@link PanelAbstract Panel} that represents a {@link EntityCollectionModel
* collection of entity}s rendered using as a table of summary values with a
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/tabs/TabGroupPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/tabs/TabGroupPanel.java
index c287a12676..a900f36315 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/tabs/TabGroupPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/tabs/TabGroupPanel.java
@@ -35,9 +35,10 @@ import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
import org.apache.causeway.viewer.wicket.model.util.ComponentHintKey;
import org.apache.causeway.viewer.wicket.ui.panels.HasDynamicallyVisibleContent;
-import de.agilecoders.wicket.core.markup.html.bootstrap.tabs.AjaxBootstrapTabbedPanel;
import lombok.val;
+import de.agilecoders.wicket.core.markup.html.bootstrap.tabs.AjaxBootstrapTabbedPanel;
+
// hmmm... not sure how to make this implement HasDynamicallyVisibleContent
public class TabGroupPanel
extends AjaxBootstrapTabbedPanel<ITab>
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarFragmentFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarFragmentFactory.java
index 8602b0a172..9c2d0e5ad6 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarFragmentFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarFragmentFactory.java
@@ -28,6 +28,7 @@ import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.IModel;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.commons.internal.base._Casts;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
index 7012f80ea1..507def362e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
@@ -33,6 +33,7 @@ import org.apache.wicket.feedback.ComponentFeedbackMessageFilter;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.annotation.ActionLayout;
@@ -67,7 +68,6 @@ import org.apache.causeway.viewer.wicket.ui.util.WktComponents;
import org.apache.causeway.viewer.wicket.ui.util.WktDecorators;
import org.apache.causeway.viewer.wicket.ui.util.WktTooltips;
-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NonNull;
@@ -75,6 +75,8 @@ import lombok.RequiredArgsConstructor;
import lombok.Value;
import lombok.val;
+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+
public abstract class ScalarPanelAbstract
extends PanelAbstract<ManagedObject, ScalarModel>
implements ScalarModelChangeListener {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
index 06c3762df3..8e4e5dd6cb 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
@@ -26,6 +26,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.markup.repeater.RepeatingView;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.services.placeholder.PlaceholderRenderService.PlaceholderLiteral;
@@ -41,12 +42,13 @@ import org.apache.causeway.viewer.wicket.ui.panels.FormExecutorDefault;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.causeway.viewer.wicket.ui.util.WktTooltips;
-import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.fileinput.BootstrapFileInputField;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NonNull;
import lombok.val;
+import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.fileinput.BootstrapFileInputField;
+
/**
* Adds inline prompt logic.
*/
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelFormFieldAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelFormFieldAbstract.java
index bedac124b9..a66b6a58cf 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelFormFieldAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelFormFieldAbstract.java
@@ -24,6 +24,7 @@ import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.model.Model;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.commons.internal.base._NullSafe;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelSelectAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelSelectAbstract.java
index ddc511587f..5ebd2b9ee5 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelSelectAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelSelectAbstract.java
@@ -23,6 +23,7 @@ import java.util.function.Function;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.WebMarkupContainer;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.core.metamodel.object.ManagedObject;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/_Util.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/_Util.java
index 85e70cc359..d69a82cbb6 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/_Util.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/_Util.java
@@ -24,6 +24,7 @@ import java.util.Optional;
import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.IValidator;
import org.apache.wicket.validation.ValidationError;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.annotation.PromptStyle;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/datepicker/MomentJsReference.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/datepicker/MomentJsReference.java
index 7ad9990bae..99b6ba14a7 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/datepicker/MomentJsReference.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/datepicker/MomentJsReference.java
@@ -21,10 +21,11 @@ package org.apache.causeway.viewer.wicket.ui.components.scalars.datepicker;
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 MomentJsReference extends WebjarsJavaScriptResourceReference {
private static final long serialVersionUID = 1L;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
index bc0da0949b..4991d101e0 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
@@ -18,6 +18,8 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.scalars.datepicker;
+import static de.agilecoders.wicket.jquery.JQuery.$;
+
import java.util.Locale;
import java.util.Map;
import java.util.Optional;
@@ -44,8 +46,6 @@ import de.agilecoders.wicket.extensions.markup.html.bootstrap.references.Datetim
import de.agilecoders.wicket.extensions.markup.html.bootstrap.references.DatetimePickerJsReference;
import de.agilecoders.wicket.jquery.Config;
-import static de.agilecoders.wicket.jquery.JQuery.$;
-
/**
* A text input field that is used as a date or date/time picker.
* It uses <a href="https://github.com/Eonasdan/bootstrap-datetimepicker">Bootstrap Datetime picker</a>
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.java
index 13ab47c2e7..e4abe4968e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.java
@@ -32,9 +32,10 @@ import org.apache.causeway.viewer.wicket.ui.util.WktComponents;
import org.apache.causeway.viewer.wicket.ui.util.WktDecorators;
import org.apache.causeway.viewer.wicket.ui.util.WktTooltips;
-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import lombok.val;
+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+
public class JavaAwtImagePanel
extends PanelAbstract<ManagedObject, ScalarModel> {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/_WktImageUtil.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/_WktImageUtil.java
index ae7cc1ed97..e22f30ef90 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/_WktImageUtil.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/_WktImageUtil.java
@@ -25,6 +25,7 @@ import org.apache.wicket.extensions.markup.html.image.resource.ThumbnailImageRes
import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.markup.html.image.NonCachingImage;
import org.apache.wicket.markup.html.image.resource.BufferedDynamicImageResource;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.value.Blob;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/_HighlightBehavior.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/_HighlightBehavior.java
index 087de66910..b781155cb2 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/_HighlightBehavior.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/_HighlightBehavior.java
@@ -19,6 +19,7 @@
package org.apache.causeway.viewer.wicket.ui.components.scalars.markup;
import org.apache.wicket.markup.head.IHeaderResponse;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.value.semantics.Renderer.SyntaxHighlighter;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/text/TextAreaWithConverter.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/text/TextAreaWithConverter.java
index 76baa44ac2..4a3eca6de8 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/text/TextAreaWithConverter.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/text/TextAreaWithConverter.java
@@ -24,6 +24,7 @@ import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.model.IModel;
import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.validation.IValidationError;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/text/TextFieldWithConverter.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/text/TextFieldWithConverter.java
index 4d3a83ad24..0e63ae6497 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/text/TextFieldWithConverter.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/text/TextFieldWithConverter.java
@@ -24,6 +24,7 @@ import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.IModel;
import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.validation.IValidationError;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/bootstrap/FormGroup.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/bootstrap/FormGroup.java
index 89ff0f0780..185f682e7f 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/bootstrap/FormGroup.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/bootstrap/FormGroup.java
@@ -25,9 +25,10 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.util.lang.Args;
-import de.agilecoders.wicket.core.util.Attributes;
import lombok.Getter;
+import de.agilecoders.wicket.core.util.Attributes;
+
/**
* A container around Bootstrap form component that sets
* <a href="http://getbootstrap.com/css/#forms-control-validation">validation state</a>
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/fileinput/FileUploadFieldWithNestingFix.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/fileinput/FileUploadFieldWithNestingFix.java
index c2997924df..5a9c2ee83e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/fileinput/FileUploadFieldWithNestingFix.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/fileinput/FileUploadFieldWithNestingFix.java
@@ -27,12 +27,13 @@ import org.apache.wicket.model.IModel;
import org.apache.causeway.viewer.wicket.ui.util.WktHeaderItems;
-import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.fileinput.BootstrapFileInputField;
-import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.fileinput.FileInputConfig;
import lombok.Getter;
import lombok.SneakyThrows;
import lombok.experimental.Accessors;
+import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.fileinput.BootstrapFileInputField;
+import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.fileinput.FileInputConfig;
+
public class FileUploadFieldWithNestingFix extends BootstrapFileInputField {
private static final long serialVersionUID = 1L;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/Select2OnSelect.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/Select2OnSelect.java
index 453f1bb4f5..c22f2e142b 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/Select2OnSelect.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/Select2OnSelect.java
@@ -31,9 +31,10 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.INamedParameters.NamedPair;
-import org.springframework.lang.Nullable;
import org.wicketstuff.select2.JQuery;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.binding.Bindable;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.debug._XrayEvent;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/providers/ChoiceProviderAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/providers/ChoiceProviderAbstract.java
index eb89524fa3..7ae55775dd 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/providers/ChoiceProviderAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/providers/ChoiceProviderAbstract.java
@@ -22,9 +22,10 @@ import java.util.Collection;
import java.util.stream.Collectors;
import org.apache.wicket.util.string.Strings;
-import org.springframework.lang.Nullable;
import org.wicketstuff.select2.ChoiceProvider;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.applib.services.i18n.TranslationContext;
import org.apache.causeway.applib.services.placeholder.PlaceholderRenderService.PlaceholderLiteral;
import org.apache.causeway.commons.collections.Can;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/themepicker/CausewayWicketThemeSupportDefault.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/themepicker/CausewayWicketThemeSupportDefault.java
index da45817aab..ffa1249bd4 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/themepicker/CausewayWicketThemeSupportDefault.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/themepicker/CausewayWicketThemeSupportDefault.java
@@ -35,12 +35,13 @@ import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._Lazy;
import org.apache.causeway.core.config.CausewayConfiguration;
+import lombok.val;
+import lombok.extern.log4j.Log4j2;
+
import de.agilecoders.wicket.core.settings.NoopThemeProvider;
import de.agilecoders.wicket.core.settings.ThemeProvider;
import de.agilecoders.wicket.themes.markup.html.bootswatch.BootswatchTheme;
import de.agilecoders.wicket.themes.markup.html.bootswatch.BootswatchThemeProvider;
-import lombok.val;
-import lombok.extern.log4j.Log4j2;
/**
* @since 2.0
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
index 4e20e0adcb..d59498c407 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
@@ -30,6 +30,9 @@ import org.apache.wicket.util.string.Strings;
import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
+import lombok.Getter;
+import lombok.val;
+
import de.agilecoders.wicket.core.Bootstrap;
import de.agilecoders.wicket.core.settings.ActiveThemeProvider;
import de.agilecoders.wicket.core.settings.IBootstrapSettings;
@@ -40,8 +43,6 @@ import de.agilecoders.wicket.core.util.Attributes;
import de.agilecoders.wicket.themes.markup.html.bootstrap.BootstrapThemeTheme;
import de.agilecoders.wicket.themes.markup.html.bootswatch.BootswatchTheme;
import de.agilecoders.wicket.themes.markup.html.bootswatch.BootswatchThemeProvider;
-import lombok.Getter;
-import lombok.val;
/**
* A panel used as a Navbar item to change the application theme/skin
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/themepicker/ThemeProviderComposite.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/themepicker/ThemeProviderComposite.java
index 344759eb42..292fc4110d 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/themepicker/ThemeProviderComposite.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/themepicker/ThemeProviderComposite.java
@@ -29,12 +29,13 @@ import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.commons.internal.collections._Maps;
-import de.agilecoders.wicket.core.settings.ITheme;
-import de.agilecoders.wicket.core.settings.ThemeProvider;
import lombok.RequiredArgsConstructor;
import lombok.val;
import lombok.extern.log4j.Log4j2;
+import de.agilecoders.wicket.core.settings.ITheme;
+import de.agilecoders.wicket.core.settings.ThemeProvider;
+
/**
*
* @since 2.0
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/PageAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/PageAbstract.java
index 8de86ab79c..b231df4e15 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/PageAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/PageAbstract.java
@@ -81,10 +81,11 @@ import org.apache.causeway.viewer.wicket.ui.pages.common.viewer.js.CausewayWicke
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.causeway.viewer.wicket.ui.util.Wkt.EventTopic;
-import de.agilecoders.wicket.core.markup.html.references.BootstrapJavaScriptReference;
import lombok.val;
import lombok.extern.log4j.Log4j2;
+import de.agilecoders.wicket.core.markup.html.references.BootstrapJavaScriptReference;
+
/**
* Convenience adapter for {@link WebPage}s built up using {@link UiComponentType}s.
*/
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
index de143cf4b7..3120786cd1 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
@@ -18,6 +18,9 @@
*/
package org.apache.causeway.viewer.wicket.ui.pages.accmngt;
+import java.util.Arrays;
+import java.util.List;
+
import org.apache.wicket.Application;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Page;
@@ -42,12 +45,10 @@ import org.apache.causeway.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.causeway.viewer.wicket.ui.pages.WebPageBase;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
-import de.agilecoders.wicket.core.markup.html.bootstrap.behavior.BootstrapJavascriptBehavior;
-import de.agilecoders.wicket.core.markup.html.references.BootstrapJavaScriptReference;
import lombok.val;
-import java.util.Arrays;
-import java.util.List;
+import de.agilecoders.wicket.core.markup.html.bootstrap.behavior.BootstrapJavascriptBehavior;
+import de.agilecoders.wicket.core.markup.html.references.BootstrapJavaScriptReference;
/**
* Boilerplate, pick up our HTML and CSS.
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/SuccessFeedbackCookieManager.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/SuccessFeedbackCookieManager.java
index adeb51f234..0e14481c1b 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/SuccessFeedbackCookieManager.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/SuccessFeedbackCookieManager.java
@@ -21,6 +21,7 @@ package org.apache.causeway.viewer.wicket.ui.pages.accmngt;
import java.util.function.Consumer;
import org.apache.wicket.util.cookies.CookieUtils;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.commons.internal.base._Strings;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.java
index c6c15cb437..8c9bc16e9a 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.java
@@ -31,9 +31,10 @@ import org.apache.causeway.viewer.wicket.ui.pages.accmngt.AccountConfirmationMap
import org.apache.causeway.viewer.wicket.ui.pages.accmngt.AccountManagementPageAbstract;
import org.apache.causeway.viewer.wicket.ui.pages.login.WicketSignInPage;
-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import lombok.val;
+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+
/**
* A page used for resetting the password of an user.
*/
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.java
index 955dc50109..2ea20cae47 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.java
@@ -35,9 +35,10 @@ import org.apache.causeway.viewer.wicket.model.models.PageType;
import org.apache.causeway.viewer.wicket.ui.pages.accmngt.AccountConfirmationMap;
import org.apache.causeway.viewer.wicket.ui.panels.PanelBase;
+import lombok.val;
+
import de.agilecoders.wicket.core.markup.html.bootstrap.common.INotificationMessage;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationMessage;
-import lombok.val;
/**
* A panel with a form for creation of new users
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/bootstrap/css/BootstrapOverridesCssResourceReference.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/bootstrap/css/BootstrapOverridesCssResourceReference.java
index 595c6997e0..4b9b4b3dd5 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/bootstrap/css/BootstrapOverridesCssResourceReference.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/bootstrap/css/BootstrapOverridesCssResourceReference.java
@@ -27,11 +27,12 @@ import org.apache.wicket.request.resource.CssResourceReference;
import org.apache.wicket.request.resource.PackageResource;
import org.apache.wicket.request.resource.ResourceReference;
+import lombok.Getter;
+import lombok.experimental.Accessors;
+
import de.agilecoders.wicket.core.Bootstrap;
import de.agilecoders.wicket.core.settings.IBootstrapSettings;
import de.agilecoders.wicket.core.settings.ITheme;
-import lombok.Getter;
-import lombok.experimental.Accessors;
/**
* A CSS resource reference that provides CSS rules which override the CSS rules
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/datatables/DatatablesCssBootstrap5ReferenceWkt.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/datatables/DatatablesCssBootstrap5ReferenceWkt.java
index 9aaaa67543..235ac1c517 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/datatables/DatatablesCssBootstrap5ReferenceWkt.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/datatables/DatatablesCssBootstrap5ReferenceWkt.java
@@ -21,10 +21,11 @@ package org.apache.causeway.viewer.wicket.ui.pages.common.datatables;
import org.apache.wicket.markup.head.CssHeaderItem;
-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 DatatablesCssBootstrap5ReferenceWkt extends WebjarsCssResourceReference {
private static final long serialVersionUID = 1L;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/datatables/DatatablesCssReferenceWkt.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/datatables/DatatablesCssReferenceWkt.java
index cc152525ef..a05a45a5df 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/datatables/DatatablesCssReferenceWkt.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/datatables/DatatablesCssReferenceWkt.java
@@ -21,10 +21,11 @@ package org.apache.causeway.viewer.wicket.ui.pages.common.datatables;
import org.apache.wicket.markup.head.CssHeaderItem;
-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 DatatablesCssReferenceWkt extends WebjarsCssResourceReference {
private static final long serialVersionUID = 1L;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/datatables/DatatablesJavaScriptBootstrap5ReferenceWkt.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/datatables/DatatablesJavaScriptBootstrap5ReferenceWkt.java
index bb35fdbe6a..233e5f5e27 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/datatables/DatatablesJavaScriptBootstrap5ReferenceWkt.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/datatables/DatatablesJavaScriptBootstrap5ReferenceWkt.java
@@ -22,10 +22,11 @@ package org.apache.causeway.viewer.wicket.ui.pages.common.datatables;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.JavaScriptReferenceHeaderItem;
-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 DatatablesJavaScriptBootstrap5ReferenceWkt extends WebjarsJavaScriptResourceReference {
private static final long serialVersionUID = 1L;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/datatables/DatatablesJavaScriptReferenceWkt.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/datatables/DatatablesJavaScriptReferenceWkt.java
index 44434409d9..ae99612cdc 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/datatables/DatatablesJavaScriptReferenceWkt.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/datatables/DatatablesJavaScriptReferenceWkt.java
@@ -22,10 +22,11 @@ package org.apache.causeway.viewer.wicket.ui.pages.common.datatables;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.JavaScriptReferenceHeaderItem;
-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 DatatablesJavaScriptReferenceWkt extends WebjarsJavaScriptResourceReference {
private static final long serialVersionUID = 1L;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/fontawesome/FontAwesomeCssReferenceWkt.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/fontawesome/FontAwesomeCssReferenceWkt.java
index 1a7e75d409..39f91dc340 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/fontawesome/FontAwesomeCssReferenceWkt.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/fontawesome/FontAwesomeCssReferenceWkt.java
@@ -22,10 +22,11 @@ import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.causeway.viewer.commons.model.decorators.IconDecorator;
-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 FontAwesomeCssReferenceWkt extends WebjarsCssResourceReference {
private static final long serialVersionUID = 1L;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/login/CausewaySignInPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/login/CausewaySignInPanel.java
index 788ff6f4ad..00cea5ac58 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/login/CausewaySignInPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/login/CausewaySignInPanel.java
@@ -40,10 +40,11 @@ import org.apache.causeway.viewer.wicket.model.causeway.HasAmendableInteractionC
import org.apache.causeway.viewer.wicket.model.models.PageType;
import org.apache.causeway.viewer.wicket.ui.pages.PageClassRegistry;
-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;
+
/**
* An extension of Wicket's default SignInPanel that provides
* custom markup, based on Bootstrap, and uses
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/FormExecutorDefault.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/FormExecutorDefault.java
index c8d611f839..bbbea14947 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/FormExecutorDefault.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/FormExecutorDefault.java
@@ -22,6 +22,7 @@ import java.util.Optional;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.form.Form;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.services.exceprecog.Category;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PanelAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PanelAbstract.java
index 4f1fad17f4..7d90f01e02 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PanelAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PanelAbstract.java
@@ -22,6 +22,7 @@ import org.apache.wicket.Component;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.annotation.TableDecorator;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PanelBase.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PanelBase.java
index d1cbaac827..aa2efc929f 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PanelBase.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PanelBase.java
@@ -22,6 +22,7 @@ import java.util.function.Supplier;
import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.IModel;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.services.i18n.LanguageProvider;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/BootstrapConstants.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/BootstrapConstants.java
index fc7e0cc1f4..5cf0b4c2cc 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/BootstrapConstants.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/BootstrapConstants.java
@@ -22,13 +22,14 @@ import java.util.EnumSet;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import de.agilecoders.wicket.core.markup.html.bootstrap.behavior.CssClassNameRemover;
import lombok.Getter;
import lombok.NonNull;
import lombok.val;
import lombok.experimental.Accessors;
import lombok.experimental.UtilityClass;
+import de.agilecoders.wicket.core.markup.html.bootstrap.behavior.CssClassNameRemover;
+
@UtilityClass
public class BootstrapConstants {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/PrismResourcesWkt.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/PrismResourcesWkt.java
index 8e414cf65a..4a9949cb35 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/PrismResourcesWkt.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/PrismResourcesWkt.java
@@ -28,9 +28,10 @@ import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.causeway.viewer.commons.prism.Prism;
import org.apache.causeway.viewer.commons.prism.PrismLanguage;
+import lombok.experimental.UtilityClass;
+
import de.agilecoders.wicket.webjars.request.resource.WebjarsCssResourceReference;
import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference;
-import lombok.experimental.UtilityClass;
@UtilityClass
public final class PrismResourcesWkt{
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/Wkt.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/Wkt.java
index 5f247c8a99..dccfc7ff10 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/Wkt.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/Wkt.java
@@ -88,6 +88,7 @@ import org.apache.wicket.validation.validator.StringValidator;
import org.danekja.java.util.function.serializable.SerializableBiConsumer;
import org.danekja.java.util.function.serializable.SerializableBooleanSupplier;
import org.danekja.java.util.function.serializable.SerializableConsumer;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.Identifier;
@@ -115,6 +116,10 @@ import org.apache.causeway.viewer.wicket.ui.components.widgets.links.AjaxLinkNoP
import org.apache.causeway.viewer.wicket.ui.panels.PanelUtil;
import org.apache.causeway.viewer.wicket.ui.util.BootstrapConstants.ButtonSemantics;
+import lombok.NonNull;
+import lombok.val;
+import lombok.experimental.UtilityClass;
+
import de.agilecoders.wicket.core.markup.html.bootstrap.behavior.CssClassNameAppender;
import de.agilecoders.wicket.core.util.Attributes;
import de.agilecoders.wicket.extensions.markup.html.bootstrap.confirmation.ConfirmationBehavior;
@@ -124,9 +129,6 @@ import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.checkboxx.Che
import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.checkboxx.CheckBoxXConfig.Sizes;
import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.fileinput.FileInputConfig;
import de.agilecoders.wicket.jquery.Key;
-import lombok.NonNull;
-import lombok.val;
-import lombok.experimental.UtilityClass;
/**
* Wicket common idioms, in alphabetical order.
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/WktDecorators.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/WktDecorators.java
index f3e0f166dd..d24c86f77c 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/WktDecorators.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/WktDecorators.java
@@ -45,12 +45,13 @@ import org.apache.causeway.viewer.wicket.model.links.LinkAndLabel;
import org.apache.causeway.viewer.wicket.ui.components.actionmenu.FontAwesomeBehavior;
import org.apache.causeway.viewer.wicket.ui.util.BootstrapConstants.ButtonSemantics;
-import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig.Placement;
-import de.agilecoders.wicket.extensions.markup.html.bootstrap.confirmation.ConfirmationConfig;
import lombok.Getter;
import lombok.val;
import lombok.experimental.UtilityClass;
+import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig.Placement;
+import de.agilecoders.wicket.extensions.markup.html.bootstrap.confirmation.ConfirmationConfig;
+
/**
*
*/
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/WktLinks.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/WktLinks.java
index eca70eab92..ba211b4190 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/WktLinks.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/WktLinks.java
@@ -32,6 +32,7 @@ import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.commons.internal.base._Strings;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/WktTooltips.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/WktTooltips.java
index 238c2b762c..5cd30e9935 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/WktTooltips.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/WktTooltips.java
@@ -21,6 +21,7 @@ import java.time.Duration;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.commons.internal.base._Strings;
@@ -32,15 +33,16 @@ import org.apache.causeway.viewer.commons.model.layout.UiPlacementDirection;
import org.apache.causeway.viewer.wicket.ui.components.widgets.linkandlabel.ActionLink;
import org.apache.causeway.viewer.wicket.ui.util.ExtendedPopoverConfig.PopoverBoundary;
+import lombok.NonNull;
+import lombok.val;
+import lombok.experimental.UtilityClass;
+
import de.agilecoders.wicket.core.markup.html.bootstrap.components.PopoverBehavior;
import de.agilecoders.wicket.core.markup.html.bootstrap.components.PopoverConfig;
import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipBehavior;
import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig.OpenTrigger;
import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig.Placement;
import de.agilecoders.wicket.jquery.Config;
-import lombok.NonNull;
-import lombok.val;
-import lombok.experimental.UtilityClass;
@UtilityClass
public class WktTooltips {
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway.java
index 504d6b13cd..96edc00aa4 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway.java
@@ -27,6 +27,7 @@ import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
import org.apache.wicket.authroles.authorization.strategies.role.Roles;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.cycle.RequestCycle;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.clock.VirtualClock;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/WebRequestCycleForCauseway.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/WebRequestCycleForCauseway.java
index ddc8671e84..7ef8d65735 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/WebRequestCycleForCauseway.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/WebRequestCycleForCauseway.java
@@ -43,6 +43,7 @@ import org.apache.wicket.request.cycle.IRequestCycleListener;
import org.apache.wicket.request.cycle.PageRequestHandlerTracker;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.services.exceprecog.ExceptionRecognizer;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
index c0309a5c32..f7679406a5 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
@@ -27,6 +27,7 @@ import javax.inject.Inject;
import javax.inject.Named;
import org.apache.wicket.Component;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
index 11a926e7fc..1276c4e294 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
@@ -33,6 +33,7 @@ import javax.inject.Named;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.model.IModel;
+
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.lang.Nullable;
import org.springframework.stereotype.Service;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/pages/PageClassListDefault.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/pages/PageClassListDefault.java
index 9a4d052bcf..5c78e732a3 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/pages/PageClassListDefault.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/pages/PageClassListDefault.java
@@ -22,6 +22,7 @@ import javax.annotation.Priority;
import javax.inject.Named;
import org.apache.wicket.Page;
+
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java
index bd75963214..b1206c0fa9 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java
@@ -25,14 +25,15 @@ import javax.annotation.Priority;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.causeway.viewer.wicket.ui.pages.PageAbstract;
import org.apache.wicket.Page;
+
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.viewer.wicket.model.models.PageType;
+import org.apache.causeway.viewer.wicket.ui.pages.PageAbstract;
import org.apache.causeway.viewer.wicket.ui.pages.PageClassList;
import org.apache.causeway.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.causeway.viewer.wicket.ui.pages.PageClassRegistrySpi;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/pages/PageNavigationServiceDefault.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/pages/PageNavigationServiceDefault.java
index 4e213ad8fc..ec895e3ebe 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/pages/PageNavigationServiceDefault.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/pages/PageNavigationServiceDefault.java
@@ -27,6 +27,7 @@ import org.apache.wicket.RestartResponseAtInterceptPageException;
import org.apache.wicket.RestartResponseException;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/services/DeepLinkServiceWicket.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
index f8818f8629..de78e0ff83 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
@@ -29,6 +29,7 @@ import org.apache.wicket.Page;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.lang.Nullable;
import org.springframework.stereotype.Service;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/services/HintStoreUsingWicketSession.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/services/HintStoreUsingWicketSession.java
index fbf40985b2..1b42d29821 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/services/HintStoreUsingWicketSession.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/services/HintStoreUsingWicketSession.java
@@ -25,6 +25,7 @@ import java.util.Set;
import javax.inject.Named;
import org.apache.wicket.Session;
+
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/services/ImageResourceCacheClassPath.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/services/ImageResourceCacheClassPath.java
index edc533a5cf..68d9dd220f 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/services/ImageResourceCacheClassPath.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/services/ImageResourceCacheClassPath.java
@@ -29,6 +29,7 @@ import org.apache.wicket.request.resource.AbstractResource;
import org.apache.wicket.request.resource.IResource;
import org.apache.wicket.request.resource.PartWriterCallback;
import org.apache.wicket.request.resource.ResourceReference;
+
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/webmodule/WebModuleWicket.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/webmodule/WebModuleWicket.java
index feb33412e4..4463addeca 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/webmodule/WebModuleWicket.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/webmodule/WebModuleWicket.java
@@ -27,6 +27,7 @@ import javax.servlet.ServletContextListener;
import javax.servlet.ServletException;
import org.apache.wicket.protocol.http.WicketFilter;
+
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/CausewayWicketApplication.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/CausewayWicketApplication.java
index 9c932ff57e..6aa5142c93 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/CausewayWicketApplication.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/CausewayWicketApplication.java
@@ -46,6 +46,7 @@ import org.apache.wicket.request.cycle.PageRequestHandlerTracker;
import org.apache.wicket.request.resource.CssResourceReference;
import org.apache.wicket.settings.RequestCycleSettings;
import org.apache.wicket.spring.injection.annot.SpringComponentInjector;
+
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.services.inject.ServiceInjector;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/BootstrapInitWkt.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/BootstrapInitWkt.java
index 7fe3fc8da9..09462ca038 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/BootstrapInitWkt.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/BootstrapInitWkt.java
@@ -23,16 +23,18 @@ import javax.inject.Inject;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.IHeaderContributor;
import org.apache.wicket.protocol.http.WebApplication;
+
import org.springframework.context.annotation.Configuration;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
import org.apache.causeway.viewer.wicket.model.causeway.WicketApplicationInitializer;
import org.apache.causeway.viewer.wicket.ui.components.widgets.themepicker.CausewayWicketThemeSupport;
+import lombok.val;
+
import de.agilecoders.wicket.core.Bootstrap;
import de.agilecoders.wicket.core.markup.html.bootstrap.behavior.BootstrapBaseBehavior;
import de.agilecoders.wicket.core.settings.BootstrapSettings;
-import lombok.val;
@Configuration
public class BootstrapInitWkt implements WicketApplicationInitializer {
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/DatatablesNetInitWkt.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/DatatablesNetInitWkt.java
index a57b2ab88c..3cf2421ed9 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/DatatablesNetInitWkt.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/DatatablesNetInitWkt.java
@@ -21,6 +21,7 @@ package org.apache.causeway.viewer.wicket.viewer.wicketapp.config;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.IHeaderContributor;
import org.apache.wicket.protocol.http.WebApplication;
+
import org.springframework.context.annotation.Configuration;
import org.apache.causeway.viewer.wicket.model.causeway.WicketApplicationInitializer;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/DebugInitWkt.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/DebugInitWkt.java
index d016e8fd41..e7478dafd4 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/DebugInitWkt.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/DebugInitWkt.java
@@ -22,6 +22,7 @@ import javax.inject.Inject;
import org.apache.wicket.devutils.debugbar.DebugBarInitializer;
import org.apache.wicket.protocol.http.WebApplication;
+
import org.springframework.context.annotation.Configuration;
import org.apache.causeway.core.config.CausewayConfiguration;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/JQueryInitWkt.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/JQueryInitWkt.java
index 68ab09bab6..6a6e19c85e 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/JQueryInitWkt.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/JQueryInitWkt.java
@@ -21,14 +21,16 @@ package org.apache.causeway.viewer.wicket.viewer.wicketapp.config;
import javax.inject.Inject;
import org.apache.wicket.protocol.http.WebApplication;
+
import org.springframework.context.annotation.Configuration;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.wicket.model.causeway.WicketApplicationInitializer;
-import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference;
import lombok.val;
+import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference;
+
@Configuration
public class JQueryInitWkt implements WicketApplicationInitializer {
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/Select2InitWkt.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/Select2InitWkt.java
index 47c083823c..8489108a82 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/Select2InitWkt.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/Select2InitWkt.java
@@ -19,6 +19,7 @@
package org.apache.causeway.viewer.wicket.viewer.wicketapp.config;
import org.apache.wicket.protocol.http.WebApplication;
+
import org.springframework.context.annotation.Configuration;
import org.apache.causeway.viewer.wicket.model.causeway.WicketApplicationInitializer;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/WebjarsInitWkt.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/WebjarsInitWkt.java
index d52edca9e9..168faeb945 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/WebjarsInitWkt.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/WebjarsInitWkt.java
@@ -19,6 +19,7 @@
package org.apache.causeway.viewer.wicket.viewer.wicketapp.config;
import org.apache.wicket.protocol.http.WebApplication;
+
import org.springframework.context.annotation.Configuration;
import org.apache.causeway.viewer.wicket.model.causeway.WicketApplicationInitializer;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/WicketViewerCssBundleInit.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/WicketViewerCssBundleInit.java
index 830e1172a7..636f273b4b 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/WicketViewerCssBundleInit.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/WicketViewerCssBundleInit.java
@@ -22,6 +22,7 @@ import java.util.Set;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.request.resource.CssResourceReference;
+
import org.springframework.context.annotation.Configuration;
import org.apache.causeway.commons.internal.collections._Sets;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/WicketViewerXrayEnable.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/WicketViewerXrayEnable.java
index 24c56b1fc4..f0c2d31200 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/WicketViewerXrayEnable.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/WicketViewerXrayEnable.java
@@ -19,6 +19,7 @@
package org.apache.causeway.viewer.wicket.viewer.wicketapp.config;
import org.apache.wicket.protocol.http.WebApplication;
+
import org.springframework.context.annotation.Configuration;
import org.apache.causeway.viewer.wicket.model.causeway.WicketApplicationInitializer;