You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/10/25 08:25:02 UTC
[isis] branch master updated: ISIS-3142: batch organize imports: viewer sources
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new b729859fac ISIS-3142: batch organize imports: viewer sources
b729859fac is described below
commit b729859fac1c7ca1ea6b9e14998480b294596f8f
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Oct 25 10:24:50 2022 +0200
ISIS-3142: batch organize imports: viewer sources
---
.../model/CausewayModuleIncViewerGraphqlModel.java | 3 +-
.../viewer/test/source/EndToEnd_IntegTest.java | 10 ++--
.../viewer/test/source/GQLSchema_IntegTest.java | 8 +--
.../graphql/viewer/test/source/ScratchPad.java | 19 ++++---
.../source/TestDomainModuleIntegTestAbstract.java | 15 ++---
.../viewer/test/source/gqltestdomain/E1.java | 2 -
.../source/gqltestdomain/TestDomainModule.java | 5 +-
.../test/source/gqltestdomain/TestEntity.java | 2 -
.../CausewayModuleIncViewerGraphqlViewer.java | 3 +-
...xecutionStrategyResolvingWithinInteraction.java | 3 +-
.../viewer/source/GraphQlServiceForCauseway.java | 1 -
.../viewer/source/GraphQlSourceForCauseway.java | 13 ++---
.../graphql/viewer/source/ObjectTypeFactory.java | 65 ++++++++--------------
.../graphql/viewer/source/QueryFieldFactory.java | 13 ++---
.../javafx/model/action/ActionUiModelFx.java | 7 +--
.../viewer/javafx/model/binding/BindingsFx.java | 8 +--
.../javafx/model/events/JavaFxViewerConfig.java | 3 +-
.../javafx/ui/CausewayModuleIncViewerJavaFxUi.java | 1 +
.../javafx/ui/components/UiComponentFactoryFx.java | 10 ++--
.../javafx/ui/components/UiComponentHandlerFx.java | 3 -
.../ui/components/collections/TableViewFx.java | 15 +++--
.../javafx/ui/components/dialog/Dialogs.java | 5 +-
.../viewer/javafx/ui/components/form/FormPane.java | 13 ++---
.../ui/components/number/NumberFieldFactory.java | 5 +-
.../javafx/ui/components/object/ObjectViewFx.java | 10 ++--
.../objectref/ObjectReferenceFieldFactory.java | 5 +-
.../ui/components/other/FallbackFieldFactory.java | 5 +-
.../javafx/ui/components/panel/TitledPanel.java | 3 +-
.../components/temporal/TemporalFieldFactory.java | 5 +-
.../ui/components/text/TextFieldFactory.java | 5 +-
.../disabling/DisablingDecoratorForButton.java | 6 +-
.../disabling/DisablingDecoratorForFormField.java | 4 +-
.../ui/decorator/icon/IconDecoratorForLabeled.java | 11 ++--
.../decorator/icon/IconDecoratorForMenuItem.java | 12 ++--
.../ui/decorator/icon/IconServiceDefault.java | 6 +-
.../prototyping/PrototypingDecoratorForButton.java | 7 ++-
.../PrototypingDecoratorForFormField.java | 7 ++-
.../prototyping/PrototypingInfoPopupProvider.java | 11 ++--
.../viewer/javafx/ui/main/MainViewFx.java | 7 +--
.../viewer/javafx/ui/main/MenuBuilderFx.java | 7 +--
.../viewer/javafx/ui/main/UiActionHandlerFx.java | 9 ++-
.../viewer/javafx/ui/main/UiBuilderFx.java | 8 +--
.../viewer/javafx/ui/main/UiContextFxDefault.java | 20 +++----
.../CausewayModuleIncViewerJavaFxViewer.java | 3 +-
.../viewer/javafx/viewer/JavafxViewer.java | 3 +-
.../javafx/viewer/JavafxViewerApplication.java | 5 +-
.../viewer/vaadin/model/decorator/Decorators.java | 2 +
.../vaadin/ui/CausewayModuleIncViewerVaadinUi.java | 1 +
.../ui/auth/VaadinAuthenticationHandler.java | 2 +-
.../viewer/vaadin/ui/binding/BindingsVaa.java | 4 +-
.../ui/components/UiComponentFactoryVaa.java | 6 +-
.../vaadin/ui/components/action/ActionDialog.java | 1 -
.../ui/components/collection/TableViewVaa.java | 5 +-
.../vaadin/ui/components/object/ObjectViewVaa.java | 3 +-
.../ui/components/other/FallbackFieldFactory.java | 3 +-
.../components/temporal/TemporalFieldFactory.java | 3 +-
.../vaadin/ui/pages/main/UiActionHandlerVaa.java | 2 +-
.../vaadin/ui/pages/main/UiContextVaaDefault.java | 11 ++--
.../applib/CausewayModuleViewerCommonsApplib.java | 5 +-
.../commons/applib/services/menu/MenuItemDto.java | 2 +-
.../viewer/commons/model/action/UiActionForm.java | 3 +-
.../binding/BindingConverterForManagedObject.java | 1 -
.../model/components/UiComponentFactory.java | 4 +-
.../commons/model/decorators/IconDecorator.java | 3 +-
.../commons/model/decorators/TooltipDecorator.java | 3 +-
.../viewer/commons/model/layout/UiGridLayout.java | 7 +--
.../commons/model/scalar/HasUiParameter.java | 1 -
.../viewer/commons/model/scalar/UiParameter.java | 1 -
.../viewer/commons/model/scalar/UiProperty.java | 1 -
.../viewer/commons/model/scalar/UiScalar.java | 1 -
.../CausewayModuleViewerCommonsServices.java | 5 +-
.../services/header/HeaderUiServiceDefault.java | 2 +-
.../commons/services/menu/_MenuItemBuilder.java | 3 +-
.../restfulobjects/applib/JsonRepresentation.java | 9 +--
.../applib/domainobjects/DomainRepresentation.java | 4 +-
.../applib/domainobjects/ListRepresentation.java | 2 +-
.../applib/health/HealthRepresentation.java | 2 +-
.../applib/user/UserRepresentation.java | 2 +-
.../applib/version/VersionRepresentation.java | 2 +-
...resentationTest_arrayGet_arraySetElementAt.java | 4 +-
.../JsonRepresentationTest_asInputStream.java | 9 +--
.../applib/JsonRepresentationTest_getArray.java | 4 +-
.../JsonRepresentationTest_getBigDecimal.java | 4 +-
.../JsonRepresentationTest_getBigInteger.java | 4 +-
.../applib/JsonRepresentationTest_getBoolean.java | 4 +-
.../applib/JsonRepresentationTest_getDouble.java | 4 +-
.../applib/JsonRepresentationTest_getInt.java | 4 +-
.../JsonRepresentationTest_getLink_isLink.java | 7 +--
.../applib/JsonRepresentationTest_getLong.java | 4 +-
.../JsonRepresentationTest_getNull_isNull.java | 4 +-
.../JsonRepresentationTest_getRepresentation.java | 4 +-
.../JsonRepresentationTest_getString_isString.java | 4 +-
...onRepresentationTest_isArray_isMap_isValue.java | 4 +-
.../applib/JsonRepresentationTest_mapHas.java | 4 +-
.../applib/JsonRepresentationTest_newArray.java | 1 -
.../applib/JsonRepresentationTest_newObject.java | 1 -
.../applib/JsonRepresentationTest_putXxx.java | 4 +-
.../applib/JsonRepresentationTest_size.java | 4 +-
...JsonRepresentationTest_streamArrayElements.java | 4 +-
.../JsonRepresentationTest_streamMapEntries.java | 4 +-
.../applib/JsonRepresentationTest_urlEncoding.java | 2 -
.../applib/LinkRepresentationTest_equals.java | 2 -
.../restfulobjects/applib/Rel_getName_Test.java | 1 -
.../RestfulRequest_DomainModelTest_parser.java | 7 ++-
...equestParameterTest_valueOf_xrodomainmodel.java | 9 +--
...equestParameterTest_valueOf_xrofollowlinks.java | 7 ++-
.../client/RestfulResponse_HeaderTest_Warning.java | 3 +-
.../client/RestfulResponse_HttpStatusCodeTest.java | 3 +-
...mainObjectRepresentationTest_getCollection.java | 7 ++-
...ainObjectRepresentationTest_getCollections.java | 7 ++-
...mainObjectRepresentationTest_getProperties.java | 7 ++-
...DomainObjectRepresentationTest_getProperty.java | 7 ++-
.../restfulobjects/applib/util/Parser_Test.java | 1 -
.../applib/util/PathNodeTest_equalsHashcode.java | 1 -
.../applib/util/PathNodeTest_parse.java | 1 -
.../applib/util/PathNodeTest_split.java | 1 -
.../restfulobjects/client/ResponseDigest.java | 6 +-
.../restfulobjects/client/RestfulClient.java | 3 +-
...ayModuleViewerRestfulObjectsJaxrsResteasy4.java | 5 +-
.../webmodule/WebModuleJaxrsResteasy4.java | 7 +--
.../CausewayModuleRestfulObjectsRendering.java | 7 ++-
.../rendering/ReprRendererAbstract.java | 1 -
.../AbstractObjectMemberReprRenderer.java | 3 +-
.../rendering/domainobjects/MemberType.java | 3 +-
.../domainobjects/ObjectActionReprRenderer.java | 5 +-
.../domainobjects/ObjectAndActionInvocation.java | 1 -
.../ObjectCollectionReprRenderer.java | 3 +-
.../domainobjects/ObjectPropertyReprRenderer.java | 3 +-
.../ActionParameterDescriptionReprRenderer.java | 1 -
.../domaintypes/DomainTypeReprRenderer.java | 1 -
.../domaintypes/TypeListReprRenderer.java | 1 -
.../acceptheader/AcceptHeaderServiceForRest.java | 28 +++++-----
.../conneg/ContentNegotiationServiceAbstract.java | 1 -
...entNegotiationServiceForRestfulObjectsV1_0.java | 2 +-
...ntentNegotiationServiceOrgApacheCausewayV2.java | 2 +-
.../service/swagger/SwaggerServiceDefault.java | 2 +-
.../service/swagger/SwaggerServiceMenu.java | 3 +-
.../swagger/internal/ClassExcluderAbstract.java | 1 -
.../swagger/internal/ClassExcluderDefault.java | 3 +-
.../service/swagger/internal/Generation.java | 8 +--
.../service/swagger/internal/TaggerDefault.java | 4 +-
.../internal/ValuePropertyFactoryDefault.java | 11 ++--
.../swagger/internal/ValuePropertyPlugin.java | 3 +-
.../rendering/service/swagger/internal/_Util.java | 6 +-
.../service/valuerender/JsonValueConverter.java | 4 +-
.../JsonValueEncoderServiceDefault.java | 8 +--
.../service/valuerender/_JsonValueConverters.java | 2 +-
.../rendering/LinkFollowSpecsTest_follow.java | 6 +-
.../domainobjects/JsonValueEncoderTest.java | 3 +-
.../service/swagger/internal/GenerationTest.java | 6 +-
.../service/swagger/internal/TaggerTest.java | 1 -
.../rendering/util/MapUtilsTest.java | 1 -
.../Parser_forCacheControl_ContractTest.java | 3 +-
.../Parser_forJaxRsMediaType_ContractTest.java | 7 ++-
...entationTypeTest_getMediaType_ContractTest.java | 3 +-
...epresentationTypeTest_getName_ContractTest.java | 3 +-
...RepresentationTypeTest_lookup_ContractTest.java | 5 +-
...RepresentationTypeTest_parser_ContractTest.java | 5 +-
..._ensureCompatibleAcceptHeader_ContractTest.java | 6 +-
...tsApplicationExceptionMapper_Test_Contract.java | 10 ++--
.../CausewayModuleViewerRestfulObjectsViewer.java | 5 +-
.../viewer/context/ResourceContext.java | 5 +-
.../viewer/mappers/ExceptionMapperAbstract.java | 8 +--
.../restfulobjects/viewer/mappers/FailureUtil.java | 1 -
.../viewer/mappers/entity/ExceptionDetail.java | 4 +-
.../resources/DomainObjectResourceServerside.java | 2 +-
.../resources/DomainServiceResourceServerside.java | 2 +-
.../resources/DomainTypeResourceServerside.java | 2 +-
.../viewer/resources/ImageResourceServerside.java | 4 +-
.../viewer/resources/ObjectActionArgHelper.java | 1 -
.../resources/ObjectAdapterAccessHelper.java | 4 +-
.../resources/ObjectAdapterUpdateHelper.java | 1 -
.../viewer/resources/ResourceAbstract.java | 7 +--
.../viewer/resources/_DomainResourceHelper.java | 2 +-
.../viewer/resources/_EndpointLogging.java | 3 +-
.../CausewayRestfulObjectsInteractionFilter.java | 11 ++--
.../auth/AuthenticationStrategyAbstract.java | 2 +-
.../auth/AuthenticationStrategyBasicAuth.java | 3 +-
.../context/ResourceContext_getArg_Test.java | 12 ++--
.../context/ResourceContext_stripQuotes_Test.java | 3 +-
.../DomainResourceHelper_readBodyAsMap_Test.java | 7 ++-
.../viewer/resources/JsonParserHelper_Test.java | 4 +-
.../viewer/util/UrlParserUtils_Test.java | 4 +-
...ulObjectsSessionFilter_lookupPassThru_Test.java | 1 -
.../CausewayModuleViewerWicketApplibMixins.java | 3 +-
.../viewer/wicket/model/links/LinkAndLabel.java | 5 +-
.../viewer/wicket/model/links/LinksProvider.java | 3 +-
.../wicket/model/links/ListOfLinksModel.java | 3 +-
.../wicket/model/mementos/PageParameterNames.java | 2 +-
.../viewer/wicket/model/models/ActionModel.java | 2 +-
.../wicket/model/models/ActionModelImpl.java | 2 +-
.../wicket/model/models/BookmarkTreeNode.java | 6 +-
.../wicket/model/models/BookmarkedPagesModel.java | 2 +-
.../wicket/model/models/ChainingObjectModel.java | 2 +-
.../wicket/model/models/EntityCollectionModel.java | 3 +-
.../models/EntityCollectionModelAbstract.java | 3 +-
.../models/EntityCollectionModelParented.java | 2 +-
.../models/EntityCollectionModelStandalone.java | 1 -
.../wicket/model/models/InlinePromptContext.java | 5 +-
.../wicket/model/models/ObjectAdapterModel.java | 3 +-
.../wicket/model/models/ScalarConvertingModel.java | 2 +-
.../viewer/wicket/model/models/ScalarModel.java | 13 ++---
.../wicket/model/models/ScalarParameterModel.java | 4 +-
.../wicket/model/models/ScalarPropertyModel.java | 4 +-
.../wicket/model/models/ScalarUnwrappingModel.java | 4 +-
.../viewer/wicket/model/models/UiObjectWkt.java | 9 ++-
.../wicket/model/models/WicketComponentUtils.java | 3 +-
.../model/models/binding/BooleanBinding.java | 5 +-
.../models/interaction/BookmarkedObjectWkt.java | 2 +-
.../interaction/act/ActionInteractionWkt.java | 8 +--
.../models/interaction/act/UiParameterWkt.java | 3 +-
.../models/interaction/coll/DataRowToggleWkt.java | 2 +-
.../models/interaction/coll/DataTableModelWkt.java | 8 +--
.../interaction/prop/PropertyInteractionWkt.java | 6 +-
.../models/interaction/prop/UiPropertyWkt.java | 3 +-
.../wicket/model/util/PageParameterUtils.java | 4 +-
.../value/ConverterBasedOnValueSemantics.java | 4 +-
.../model/value/OptionsBasedOnValueSemantics.java | 3 +-
.../model/value/ValueSemanticsModelAbstract.java | 3 +-
.../model/models/test/UiObjectWkt_hintsTest.java | 2 +-
.../wicket/ui/CausewayModuleViewerWicketUi.java | 5 +-
.../viewer/wicket/ui/ComponentFactory.java | 5 +-
.../viewer/wicket/ui/ComponentFactoryAbstract.java | 3 +-
.../ActionResultResponseHandlingStrategy.java | 2 +-
.../actionresponse/ActionResultResponseType.java | 8 +--
.../wicket/ui/app/logout/LogoutHandlerWkt.java | 1 -
.../ui/app/registry/ComponentFactoryRegistrar.java | 3 +-
.../ui/app/registry/ComponentFactoryRegistry.java | 4 +-
.../wicket/ui/components/about/AboutPanel.java | 2 +-
.../ui/components/about/AboutPanelFactory.java | 7 ++-
.../ui/components/about/JarManifestListView.java | 3 +-
.../ui/components/about/JarManifestModel.java | 5 +-
.../ui/components/about/JarManifestPanel.java | 3 +-
.../actioninfo/ActionInfoPanelFactory.java | 6 +-
.../entityactions/AdditionalLinksPanel.java | 3 +-
.../actionmenu/serviceactions/CssMenuItem.java | 4 +-
.../serviceactions/CssMenuItemPanelAbstract.java | 3 +-
.../actionmenu/serviceactions/MenuActionPanel.java | 7 ++-
.../serviceactions/ServiceActionUtil.java | 7 +--
.../serviceactions/ServiceActionsPanel.java | 5 +-
.../serviceactions/ServiceActionsPanelFactory.java | 8 +--
.../serviceactions/TertiaryMenuPanelFactory.java | 7 ++-
.../actionprompt/ActionPromptHeaderPanel.java | 4 +-
.../actionprompt/ActionPromptModalWindow.java | 9 +--
.../actionpromptsb/ActionPromptSidebar.java | 5 +-
.../components/actions/ActionParametersForm.java | 23 ++++----
.../actions/ActionParametersFormPanelFactory.java | 7 ++-
.../components/actions/ActionParametersPanel.java | 3 +-
.../actions/ActionParametersPanelFactory.java | 7 ++-
.../viewer/wicket/ui/components/actions/_Xray.java | 1 -
.../BookmarkedPagesPanelFactory.java | 4 +-
.../ui/components/collection/CollectionPanel.java | 8 +--
.../CollectionPresentationSelectorHelper.java | 7 +--
.../CollectionPresentationSelectorPanel.java | 5 +-
.../ajaxtable/CausewayAjaxDataTable.java | 4 +-
.../CausewayAjaxFallbackOrderByBorder.java | 3 +-
.../ajaxtable/CausewayAjaxHeadersToolbar.java | 7 ++-
.../CausewayAjaxHeadersToolbarAbstract.java | 5 +-
.../CausewayAjaxPagingNavigationIncrementLink.java | 3 +-
.../CausewayAjaxPagingNavigationLink.java | 3 +-
.../CollectionContentsAsAjaxTablePanel.java | 2 +-
.../CollectionContentsAsAjaxTablePanelFactory.java | 9 +--
.../CollectionContentsSortableDataProvider.java | 2 +-
.../ajaxtable/PrototypingMessageProvider.java | 1 -
.../ajaxtable/columns/BulkToggleWkt.java | 2 +-
.../ajaxtable/columns/GenericColumnAbstract.java | 3 +-
.../ajaxtable/columns/GenericPropertyColumn.java | 5 +-
.../ajaxtable/columns/GenericTitleColumn.java | 5 +-
.../ajaxtable/columns/GenericToggleboxColumn.java | 2 +-
.../CollectionContentsAsIconsPanelFactory.java | 4 +-
.../CollectionContentsMultipleViewsPanel.java | 3 +-
...ollectionContentsMultipleViewsPanelFactory.java | 7 ++-
.../summary/CollectionContentsAsSummary.java | 5 +-
.../CollectionContentsAsSummaryFactory.java | 4 +-
.../CollectionContentsHiddenPanelFactory.java | 9 +--
.../empty/EmptyCollectionPanelFactory.java | 7 ++-
.../entity/EntityComponentFactoryAbstract.java | 5 +-
.../entity/collection/EntityCollectionPanel.java | 2 +-
.../collection/EntityCollectionPanelFactory.java | 6 +-
.../components/entity/fieldset/PropertyGroup.java | 13 ++---
.../entity/header/EntityHeaderPanel.java | 5 +-
.../entity/header/EntityHeaderPanelFactory.java | 6 +-
.../entity/icontitle/EntityIconAndTitlePanel.java | 4 +-
.../icontitle/EntityIconAndTitlePanelFactory.java | 6 +-
.../icontitle/EntityIconTitleAndCopyLinkPanel.java | 3 +-
.../EntityIconTitleAndCopyLinkPanelFactory.java | 4 +-
.../wicket/ui/components/footer/FooterPanel.java | 4 +-
.../ui/components/footer/FooterPanelFactory.java | 3 +-
.../wicket/ui/components/header/HeaderPanel.java | 18 +++---
.../ui/components/header/HeaderPanelFactory.java | 2 +-
.../components/layout/bs/BSGridPanelFactory.java | 4 +-
.../wicket/ui/components/layout/bs/col/Col.java | 9 ++-
...RepeatingViewWithDynamicallyVisibleContent.java | 3 +-
.../components/layout/bs/tabs/TabGroupPanel.java | 11 ++--
.../ui/components/property/PropertyEditForm.java | 8 +--
.../property/PropertyEditFormPanelFactory.java | 6 +-
.../ui/components/property/PropertyEditPanel.java | 5 +-
.../property/PropertyEditPanelFactory.java | 6 +-
.../PropertyEditPromptHeaderPanel.java | 3 +-
.../scalars/ComponentFactoryScalarAbstract.java | 7 ++-
.../components/scalars/ScalarFragmentFactory.java | 9 +--
.../ui/components/scalars/ScalarPanelAbstract.java | 24 ++++----
.../components/scalars/ScalarPanelAbstract2.java | 6 +-
.../scalars/ScalarPanelFormFieldAbstract.java | 13 +++--
.../scalars/ScalarPanelSelectAbstract.java | 5 +-
.../scalars/ScalarPanelTextFieldAbstract.java | 6 +-
.../ScalarPanelTextFieldTextualAbstract.java | 1 +
.../ui/components/scalars/TextFieldAbstract.java | 3 +-
.../viewer/wicket/ui/components/scalars/_Util.java | 6 +-
.../viewer/wicket/ui/components/scalars/_Xray.java | 1 -
.../blobclob/CausewayBlobOrClobPanelAbstract.java | 5 +-
.../scalars/blobclob/CausewayBlobPanelFactory.java | 3 +-
.../scalars/blobclob/CausewayClobPanelFactory.java | 3 +-
.../ui/components/scalars/bool/BooleanPanel.java | 12 ++--
.../scalars/bool/BooleanPanelFactory.java | 3 +-
.../choices/ChoicesSelect2PanelFactory.java | 8 +--
.../scalars/choices/ObjectChoicesSelect2Panel.java | 7 +--
.../scalars/choices/ValueChoicesSelect2Panel.java | 4 +-
.../scalars/composite/CompositeValuePanel.java | 9 +--
.../datepicker/TextFieldWithDateTimePicker.java | 7 +--
.../scalars/image/JavaAwtImagePanel.java | 8 +--
.../scalars/image/JavaAwtImagePanelFactory.java | 4 +-
.../components/scalars/image/WicketImageUtil.java | 2 +-
.../components/scalars/markup/MarkupComponent.java | 3 +-
.../scalars/markup/MarkupPanelFactories.java | 3 +-
.../scalars/markup/ScalarMarkupPanel.java | 4 +-
.../scalars/markup/_HighlightBehavior.java | 2 +-
.../scalars/markup/_HighlightBehaviorPrism.java | 2 +-
.../passwd/CausewayPasswordPanelFactory.java | 3 +-
.../scalars/string/ScalarTitleBadgePanel.java | 6 +-
.../value/fallback/ValueFallbackPanelFactory.java | 5 +-
.../StandaloneCollectionPanel.java | 3 +-
.../StandaloneCollectionPanelFactory.java | 6 +-
.../tree/CausewayToWicketTreeAdapter.java | 4 +-
.../ui/components/tree/ParentedTreePanel.java | 7 ++-
.../ui/components/tree/TreePanelFactories.java | 9 +--
.../tree/themes/TreeThemeProviderDefault.java | 3 +-
.../ui/components/unknown/UnknownModelPanel.java | 2 +-
.../unknown/UnknownModelPanelFactory.java | 5 +-
.../value/StandaloneValuePanelFactory.java | 7 ++-
.../ui/components/voidreturn/VoidReturnPanel.java | 3 +-
.../voidreturn/VoidReturnPanelFactory.java | 5 +-
.../ui/components/welcome/WelcomePanelFactory.java | 6 +-
.../ui/components/widgets/bootstrap/FormGroup.java | 3 +-
.../components/widgets/bootstrap/ModalDialog.java | 5 +-
.../widgets/breadcrumbs/BreadcrumbModel.java | 4 +-
.../widgets/breadcrumbs/BreadcrumbPanel.java | 4 +-
.../widgets/buttons/ContainedButtonPanel.java | 7 ++-
.../widgets/checkbox/ContainedToggleboxPanel.java | 7 ++-
.../entitysimplelink/EntityLinkSimplePanel.java | 5 +-
.../EntityLinkSimplePanelFactory.java | 4 +-
.../formcomponent/FormComponentPanelAbstract.java | 8 +--
.../widgets/linkandlabel/ActionLink.java | 9 ++-
.../widgets/links/AjaxLinkNoPropagate.java | 3 +-
.../ui/components/widgets/navbar/AvatarImage.java | 2 +-
.../ui/components/widgets/navbar/BrandLogo.java | 2 +-
.../ui/components/widgets/navbar/BrandName.java | 2 +-
.../ui/components/widgets/select2/Select2.java | 2 +-
.../widgets/select2/Select2MultiChoiceExt.java | 2 +-
.../widgets/select2/Select2OnSelect.java | 8 +--
.../select2/providers/ChoiceProviderAbstract.java | 4 +-
.../providers/ChoiceProviderForReferences.java | 4 +-
.../select2/providers/ChoiceProviderForValues.java | 1 -
.../CausewayWicketThemeSupportDefault.java | 11 ++--
.../widgets/themepicker/ThemeChooser.java | 8 +--
.../themepicker/ThemeProviderComposite.java | 8 +--
.../zclip/SimpleClipboardModalWindowPanel.java | 3 +-
.../widgets/zclip/ZeroClipboardPanel.java | 3 +-
.../viewer/wicket/ui/errors/ExceptionModel.java | 7 +--
.../viewer/wicket/ui/errors/JGrowlBehaviour.java | 2 +-
.../viewer/wicket/ui/errors/JGrowlUtil.java | 2 +-
.../wicket/ui/errors/StackTraceListView.java | 3 +-
.../ui/pages/EmailVerificationUrlService.java | 3 +-
.../viewer/wicket/ui/pages/PageAbstract.java | 53 +++++++++---------
.../viewer/wicket/ui/pages/PageClassRegistry.java | 3 +-
.../wicket/ui/pages/PageClassRegistrySpi.java | 3 +-
.../wicket/ui/pages/PageNavigationService.java | 3 +-
.../viewer/wicket/ui/pages/WebPageBase.java | 2 +-
.../viewer/wicket/ui/pages/about/AboutPage.java | 2 +-
.../accmngt/AccountManagementPageAbstract.java | 19 +++----
.../EmailVerificationUrlServiceDefault.java | 7 ++-
.../accmngt/SuccessFeedbackCookieManager.java | 5 +-
.../accmngt/password_reset/PasswordResetPage.java | 3 +-
.../accmngt/password_reset/PasswordResetPanel.java | 3 +-
.../pages/accmngt/signup/RegistrationFormPage.java | 3 +-
.../BootstrapOverridesCssResourceReference.java | 5 +-
.../DatatablesCssBootstrap5ReferenceWkt.java | 3 +-
.../datatables/DatatablesCssReferenceWkt.java | 3 +-
...DatatablesJavaScriptBootstrap5ReferenceWkt.java | 3 +-
.../DatatablesJavaScriptReferenceWkt.java | 3 +-
.../fontawesome/FontAwesomeCssReferenceWkt.java | 3 +-
.../viewer/wicket/ui/pages/entity/EntityPage.java | 21 +++----
.../viewer/wicket/ui/pages/error/ErrorPage.java | 12 ++--
.../viewer/wicket/ui/pages/home/HomePage.java | 3 +-
.../wicket/ui/pages/login/CausewaySignInPanel.java | 13 ++---
.../wicket/ui/pages/login/SignInPanelAbstract.java | 2 +-
.../wicket/ui/pages/login/WicketLogoutPage.java | 5 +-
.../wicket/ui/pages/login/WicketSignInPage.java | 9 +--
.../wicket/ui/pages/mmverror/MmvErrorPage.java | 7 ++-
.../StandaloneCollectionPage.java | 3 +-
.../viewer/wicket/ui/pages/value/ValuePage.java | 3 +-
.../wicket/ui/pages/voidreturn/VoidReturnPage.java | 3 +-
.../wicket/ui/panels/FormExecutorDefault.java | 6 +-
.../viewer/wicket/ui/panels/PanelAbstract.java | 4 +-
.../viewer/wicket/ui/panels/PanelBase.java | 5 +-
.../viewer/wicket/ui/panels/PanelUtil.java | 3 +-
.../wicket/ui/panels/PromptFormAbstract.java | 10 ++--
.../wicket/ui/panels/PromptFormPanelAbstract.java | 3 +-
.../viewer/wicket/ui/util/BootstrapConstants.java | 3 +-
.../wicket/ui/util/LicensedTextTemplate.java | 3 +-
.../viewer/wicket/ui/util/PrismResourcesWkt.java | 3 +-
.../apache/causeway/viewer/wicket/ui/util/Wkt.java | 26 ++++-----
.../viewer/wicket/ui/util/WktComponents.java | 2 +-
.../viewer/wicket/ui/util/WktDecorators.java | 17 +++---
.../causeway/viewer/wicket/ui/util/WktLinks.java | 7 +--
.../viewer/wicket/ui/util/WktTooltips.java | 15 +++--
.../EntityIconAndTitlePanelTest_abbreviated.java | 3 +-
.../test/components/scalars/ConverterTester.java | 4 +-
.../jodatime/JodaDateTimeConverterTest.java | 9 +--
.../jodatime/JodaLocalDateConverterTest.java | 7 ++-
.../jodatime/JodaLocalDateTimeConverterTest.java | 7 ++-
.../choices/ChoiceProviderForReferencesTest.java | 2 +-
.../choices/ChoiceProviderForValuesTest.java | 2 +-
.../choices/ChoiceProviderTestAbstract.java | 3 +-
.../wicket/ui/test/errors/JGrowlUtilTest.java | 3 +-
.../wicket/ui/test/pages/PageAbstractTest.java | 3 +-
.../accmngt/SuccessFeedbackCookieUtilTest.java | 3 +-
.../password_reset/EmailAddressValidator_Test.java | 3 +-
.../viewer/CausewayModuleViewerWicketViewer.java | 2 +-
.../AuthenticatedWebSessionForCauseway.java | 2 +-
.../viewer/integration/LocalizerForCauseway.java | 6 +-
.../integration/WebRequestCycleForCauseway.java | 6 +-
.../ComponentFactoryRegistrarDefault.java | 16 +++---
.../ComponentFactoryRegistryDefault.java | 17 +++---
.../registries/pages/PageClassListDefault.java | 13 +++--
.../registries/pages/PageClassRegistryDefault.java | 20 ++++---
.../pages/PageNavigationServiceDefault.java | 15 ++---
.../services/HintStoreUsingWicketSession.java | 4 +-
.../services/TranslationsResolverWicket.java | 2 +-
.../wicket/viewer/webmodule/WebModuleWicket.java | 4 +-
.../wicketapp/CausewayWicketApplication.java | 7 +--
.../wicket/viewer/wicketapp/_CryptFactory.java | 3 +-
.../wicket/viewer/wicketapp/_PageFactory.java | 8 ++-
.../viewer/wicketapp/config/BootstrapInitWkt.java | 3 +-
.../viewer/wicketapp/config/JQueryInitWkt.java | 3 +-
.../viewer/wicketapp/config/Select2InitWkt.java | 3 +-
.../viewer/wicketapp/config/WebjarsInitWkt.java | 3 +-
.../config/WicketViewerCssBundleInit.java | 7 ++-
.../wicketapp/config/WicketViewerXrayEnable.java | 4 +-
...nticatedWebSessionForCauseway_Authenticate.java | 3 +-
...ticatedWebSessionForCauseway_Instantiation.java | 2 +-
.../AuthenticatedWebSessionForCauseway_SignIn.java | 3 +-
...nticatedWebSessionForCauseway_TestAbstract.java | 4 +-
.../ComponentFactoryRegistryDefaultTest.java | 11 ++--
.../pages/PageClassListDefault_Instantiation.java | 7 +--
...ageClassListDefault_RegistrationAndCaching.java | 7 +--
.../services/TranslationsResolverWicketTest.java | 1 -
.../CausewayWicketApplication_Defaults.java | 1 -
.../wicketapp/CausewayWicketApplication_Pages.java | 10 ++--
.../wicket/viewer/wicketapp/CryptFactoryTest.java | 1 -
460 files changed, 1181 insertions(+), 1258 deletions(-)
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/CausewayModuleIncViewerGraphqlModel.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/CausewayModuleIncViewerGraphqlModel.java
index b2571df20e..435db4961f 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/CausewayModuleIncViewerGraphqlModel.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/CausewayModuleIncViewerGraphqlModel.java
@@ -18,10 +18,11 @@
*/
package org.apache.causeway.viewer.graphql.model;
-import org.apache.causeway.viewer.graphql.applib.CausewayModuleIncViewerGraphqlApplib;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.viewer.graphql.applib.CausewayModuleIncViewerGraphqlApplib;
+
@Configuration
@Import({
// Modules
diff --git a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/EndToEnd_IntegTest.java b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/EndToEnd_IntegTest.java
index 68b2cd4e40..727ed22008 100644
--- a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/EndToEnd_IntegTest.java
+++ b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/EndToEnd_IntegTest.java
@@ -34,7 +34,6 @@ import javax.inject.Inject;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.causeway.commons.internal.resources._Resources;
import org.approvaltests.Approvals;
import org.approvaltests.core.Options;
import org.approvaltests.core.Scrubber;
@@ -49,11 +48,8 @@ import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.transaction.annotation.Propagation;
-import static org.apache.causeway.commons.internal.assertions._Assert.assertEquals;
-import static org.apache.causeway.commons.internal.assertions._Assert.assertNotNull;
-import static org.apache.causeway.commons.internal.assertions._Assert.assertTrue;
-
import org.apache.causeway.applib.services.xactn.TransactionService;
+import org.apache.causeway.commons.internal.resources._Resources;
import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
import org.apache.causeway.viewer.graphql.viewer.source.GraphQlSourceForCauseway;
@@ -62,6 +58,10 @@ import org.apache.causeway.viewer.graphql.viewer.test.source.gqltestdomain.E2;
import org.apache.causeway.viewer.graphql.viewer.test.source.gqltestdomain.GQLTestDomainMenu;
import org.apache.causeway.viewer.graphql.viewer.test.source.gqltestdomain.TestEntityRepository;
+import static org.apache.causeway.commons.internal.assertions._Assert.assertEquals;
+import static org.apache.causeway.commons.internal.assertions._Assert.assertNotNull;
+import static org.apache.causeway.commons.internal.assertions._Assert.assertTrue;
+
import lombok.Data;
import lombok.SneakyThrows;
import lombok.val;
diff --git a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/GQLSchema_IntegTest.java b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/GQLSchema_IntegTest.java
index f4ed0dd2ff..c49a74b826 100644
--- a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/GQLSchema_IntegTest.java
+++ b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/GQLSchema_IntegTest.java
@@ -27,10 +27,6 @@ import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.transaction.annotation.Transactional;
-import static org.apache.causeway.commons.internal.assertions._Assert.assertEquals;
-import static org.apache.causeway.commons.internal.assertions._Assert.assertNotNull;
-import static org.apache.causeway.commons.internal.assertions._Assert.assertTrue;
-
import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
@@ -39,6 +35,10 @@ import org.apache.causeway.viewer.graphql.viewer.test.source.gqltestdomain.E1;
import org.apache.causeway.viewer.graphql.viewer.test.source.gqltestdomain.E2;
import org.apache.causeway.viewer.graphql.viewer.test.source.gqltestdomain.GQLTestDomainMenu;
+import static org.apache.causeway.commons.internal.assertions._Assert.assertEquals;
+import static org.apache.causeway.commons.internal.assertions._Assert.assertNotNull;
+import static org.apache.causeway.commons.internal.assertions._Assert.assertTrue;
+
import graphql.GraphQL;
import graphql.Scalars;
import graphql.schema.DataFetcher;
diff --git a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/ScratchPad.java b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/ScratchPad.java
index dd01752832..824f1b4bc1 100644
--- a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/ScratchPad.java
+++ b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/ScratchPad.java
@@ -18,20 +18,21 @@
*/
package org.apache.causeway.viewer.graphql.viewer.test.source;
-import graphql.Scalars;
-import graphql.schema.*;
-import org.apache.causeway.core.config.presets.CausewayPresets;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.Import;
-import org.springframework.test.context.TestPropertySource;
-
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import graphql.Scalars;
+import graphql.schema.GraphQLFieldDefinition;
+import graphql.schema.GraphQLObjectType;
+import graphql.schema.GraphQLSchema;
+import graphql.schema.GraphQLType;
+import graphql.schema.GraphQLTypeReference;
+
class ScratchPad {
static class GQLObjectType {
diff --git a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/TestDomainModuleIntegTestAbstract.java b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/TestDomainModuleIntegTestAbstract.java
index b81c6c471e..4fa5dbe48b 100644
--- a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/TestDomainModuleIntegTestAbstract.java
+++ b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/TestDomainModuleIntegTestAbstract.java
@@ -18,13 +18,6 @@
*/
package org.apache.causeway.viewer.graphql.viewer.test.source;
-import org.apache.causeway.core.config.presets.CausewayPresets;
-import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
-import org.apache.causeway.persistence.jpa.eclipselink.CausewayModulePersistenceJpaEclipselink;
-import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
-import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib;
-import org.apache.causeway.viewer.graphql.viewer.CausewayModuleIncViewerGraphqlViewer;
-import org.apache.causeway.viewer.graphql.viewer.test.source.gqltestdomain.TestDomainModule;
import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
@@ -35,6 +28,14 @@ import org.springframework.context.annotation.PropertySources;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.springframework.test.context.ActiveProfiles;
+import org.apache.causeway.core.config.presets.CausewayPresets;
+import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
+import org.apache.causeway.persistence.jpa.eclipselink.CausewayModulePersistenceJpaEclipselink;
+import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
+import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib;
+import org.apache.causeway.viewer.graphql.viewer.CausewayModuleIncViewerGraphqlViewer;
+import org.apache.causeway.viewer.graphql.viewer.test.source.gqltestdomain.TestDomainModule;
+
@SpringBootTest(
classes = {
TestDomainModuleIntegTestAbstract.TestApp.class
diff --git a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/gqltestdomain/E1.java b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/gqltestdomain/E1.java
index 193908d633..2cb68b146c 100644
--- a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/gqltestdomain/E1.java
+++ b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/gqltestdomain/E1.java
@@ -33,8 +33,6 @@ import org.apache.causeway.applib.annotation.Property;
import lombok.Getter;
import lombok.Setter;
-import graphql.com.google.common.collect.ComparisonChain;
-
//@Profile("demo-jpa")
@Entity
@Table(
diff --git a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/gqltestdomain/TestDomainModule.java b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/gqltestdomain/TestDomainModule.java
index 6f1bb6a9b7..26ebcf8225 100644
--- a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/gqltestdomain/TestDomainModule.java
+++ b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/gqltestdomain/TestDomainModule.java
@@ -18,13 +18,14 @@
*/
package org.apache.causeway.viewer.graphql.viewer.test.source.gqltestdomain;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
-import org.apache.causeway.testing.fixtures.applib.modules.ModuleWithFixtures;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
+import org.apache.causeway.testing.fixtures.applib.modules.ModuleWithFixtures;
+
@Configuration
@ComponentScan
@EnableJpaRepositories
diff --git a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/gqltestdomain/TestEntity.java b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/gqltestdomain/TestEntity.java
index ca665e9184..b6ebc7575a 100644
--- a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/gqltestdomain/TestEntity.java
+++ b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/gqltestdomain/TestEntity.java
@@ -18,8 +18,6 @@
*/
package org.apache.causeway.viewer.graphql.viewer.test.source.gqltestdomain;
-import org.apache.causeway.applib.annotation.DomainObject;
-
public interface TestEntity {
public String getName();
diff --git a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/CausewayModuleIncViewerGraphqlViewer.java b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/CausewayModuleIncViewerGraphqlViewer.java
index 56c8e93c79..69148af5ba 100644
--- a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/CausewayModuleIncViewerGraphqlViewer.java
+++ b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/CausewayModuleIncViewerGraphqlViewer.java
@@ -18,7 +18,6 @@
*/
package org.apache.causeway.viewer.graphql.viewer;
-import org.apache.causeway.viewer.graphql.model.CausewayModuleIncViewerGraphqlModel;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.graphql.GraphQlAutoConfiguration;
import org.springframework.boot.autoconfigure.graphql.GraphQlCorsProperties;
@@ -32,6 +31,8 @@ import org.springframework.context.annotation.Import;
import org.springframework.graphql.execution.BatchLoaderRegistry;
import org.springframework.graphql.execution.DefaultBatchLoaderRegistry;
+import org.apache.causeway.viewer.graphql.model.CausewayModuleIncViewerGraphqlModel;
+
@Configuration
@Import({
// @Service's
diff --git a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/ExecutionStrategyResolvingWithinInteraction.java b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/ExecutionStrategyResolvingWithinInteraction.java
index 2b2a4e0270..d88f289bb3 100644
--- a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/ExecutionStrategyResolvingWithinInteraction.java
+++ b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/ExecutionStrategyResolvingWithinInteraction.java
@@ -26,12 +26,11 @@ import org.springframework.stereotype.Service;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
-import lombok.RequiredArgsConstructor;
-
import graphql.execution.AsyncExecutionStrategy;
import graphql.execution.ExecutionContext;
import graphql.execution.ExecutionStrategyParameters;
import graphql.execution.FieldValueInfo;
+import lombok.RequiredArgsConstructor;
@Service
@RequiredArgsConstructor(onConstructor_ = {@Inject})
diff --git a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GraphQlServiceForCauseway.java b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GraphQlServiceForCauseway.java
index 9c53797b80..281d2f709f 100644
--- a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GraphQlServiceForCauseway.java
+++ b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GraphQlServiceForCauseway.java
@@ -29,7 +29,6 @@ import org.springframework.graphql.execution.GraphQlSource;
import org.springframework.stereotype.Service;
import lombok.RequiredArgsConstructor;
-
import reactor.core.publisher.Mono;
/**
diff --git a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GraphQlSourceForCauseway.java b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GraphQlSourceForCauseway.java
index e4fa82a59b..5d76c596d6 100644
--- a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GraphQlSourceForCauseway.java
+++ b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GraphQlSourceForCauseway.java
@@ -18,6 +18,10 @@
*/
package org.apache.causeway.viewer.graphql.viewer.source;
+import static graphql.schema.FieldCoordinates.coordinates;
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+import static graphql.schema.GraphQLObjectType.newObject;
+
import java.util.HashSet;
import java.util.Set;
@@ -33,9 +37,6 @@ import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.config.metamodel.specloader.IntrospectionMode;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
-import lombok.RequiredArgsConstructor;
-import lombok.val;
-
import graphql.GraphQL;
import graphql.Scalars;
import graphql.schema.DataFetcher;
@@ -43,10 +44,8 @@ import graphql.schema.GraphQLCodeRegistry;
import graphql.schema.GraphQLObjectType;
import graphql.schema.GraphQLSchema;
import graphql.schema.GraphQLType;
-
-import static graphql.schema.FieldCoordinates.coordinates;
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
-import static graphql.schema.GraphQLObjectType.newObject;
+import lombok.RequiredArgsConstructor;
+import lombok.val;
@Service()
@RequiredArgsConstructor(onConstructor_ = {@Inject})
diff --git a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/ObjectTypeFactory.java b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/ObjectTypeFactory.java
index 1f55f750a4..82469262c8 100644
--- a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/ObjectTypeFactory.java
+++ b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/ObjectTypeFactory.java
@@ -18,6 +18,11 @@
*/
package org.apache.causeway.viewer.graphql.viewer.source;
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+import static graphql.schema.GraphQLInputObjectType.newInputObject;
+import static graphql.schema.GraphQLNonNull.nonNull;
+import static graphql.schema.GraphQLObjectType.newObject;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -27,9 +32,6 @@ import javax.inject.Inject;
import org.springframework.stereotype.Component;
-import static org.apache.causeway.viewer.graphql.viewer.source._Utils.metaTypeName;
-import static org.apache.causeway.viewer.graphql.viewer.source._Utils.mutatorsTypeName;
-
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.bookmark.BookmarkService;
import org.apache.causeway.applib.services.metamodel.BeanSort;
@@ -40,14 +42,11 @@ import org.apache.causeway.core.metamodel.spec.feature.MixedIn;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.RequiredArgsConstructor;
-import lombok.val;
+import static org.apache.causeway.viewer.graphql.viewer.source._Utils.metaTypeName;
+import static org.apache.causeway.viewer.graphql.viewer.source._Utils.mutatorsTypeName;
import graphql.Scalars;
import graphql.schema.DataFetcher;
-import graphql.schema.DataFetchingEnvironment;
import graphql.schema.FieldCoordinates;
import graphql.schema.GraphQLArgument;
import graphql.schema.GraphQLCodeRegistry;
@@ -60,11 +59,10 @@ import graphql.schema.GraphQLObjectType;
import graphql.schema.GraphQLOutputType;
import graphql.schema.GraphQLType;
import graphql.schema.GraphQLTypeReference;
-
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
-import static graphql.schema.GraphQLInputObjectType.newInputObject;
-import static graphql.schema.GraphQLNonNull.nonNull;
-import static graphql.schema.GraphQLObjectType.newObject;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+import lombok.val;
@Component
@RequiredArgsConstructor(onConstructor_ = {@Inject})
@@ -143,9 +141,6 @@ public class ObjectTypeFactory {
final MutatorsDataForEntity mutatorsDataForEntity,
final GraphQLObjectType graphQLObjectType) {
-
-
-
}
void addTypeIfNotAlreadyPresent(
@@ -466,45 +461,33 @@ public class ObjectTypeFactory {
final GraphQLFieldDefinition gql_meta,
final GraphQLObjectType graphQLObjectType) {
- codeRegistryBuilder.dataFetcher(FieldCoordinates.coordinates(graphQLObjectType, gql_meta), new DataFetcher<Object>() {
- @Override
- public Object get(final DataFetchingEnvironment environment) throws Exception {
+ codeRegistryBuilder.dataFetcher(FieldCoordinates.coordinates(graphQLObjectType, gql_meta), (DataFetcher<Object>) environment -> {
- Bookmark bookmark = bookmarkService.bookmarkFor(environment.getSource()).orElse(null);
- if (bookmark == null) return null; //TODO: is this correct ?
- return new GQLMeta(bookmark, bookmarkService);
- }
+ Bookmark bookmark = bookmarkService.bookmarkFor(environment.getSource()).orElse(null);
+ if (bookmark == null) return null; //TODO: is this correct ?
+ return new GQLMeta(bookmark, bookmarkService);
});
- codeRegistryBuilder.dataFetcher(FieldCoordinates.coordinates(metaType, idField), new DataFetcher<Object>() {
- @Override
- public Object get(final DataFetchingEnvironment environment) throws Exception {
+ codeRegistryBuilder.dataFetcher(FieldCoordinates.coordinates(metaType, idField), (DataFetcher<Object>) environment -> {
- GQLMeta gqlMeta = environment.getSource();
+ GQLMeta gqlMeta = environment.getSource();
- return gqlMeta.id();
- }
+ return gqlMeta.id();
});
- codeRegistryBuilder.dataFetcher(FieldCoordinates.coordinates(metaType, logicalTypeNameField), new DataFetcher<Object>() {
- @Override
- public Object get(final DataFetchingEnvironment environment) throws Exception {
+ codeRegistryBuilder.dataFetcher(FieldCoordinates.coordinates(metaType, logicalTypeNameField), (DataFetcher<Object>) environment -> {
- GQLMeta gqlMeta = environment.getSource();
+ GQLMeta gqlMeta = environment.getSource();
- return gqlMeta.logicalTypeName();
- }
+ return gqlMeta.logicalTypeName();
});
if (objectSpecificationBeanSort == BeanSort.ENTITY) {
- codeRegistryBuilder.dataFetcher(FieldCoordinates.coordinates(metaType, versionField), new DataFetcher<Object>() {
- @Override
- public Object get(final DataFetchingEnvironment environment) throws Exception {
+ codeRegistryBuilder.dataFetcher(FieldCoordinates.coordinates(metaType, versionField), (DataFetcher<Object>) environment -> {
- GQLMeta gqlMeta = environment.getSource();
+ GQLMeta gqlMeta = environment.getSource();
- return gqlMeta.version();
- }
+ return gqlMeta.version();
});
}
diff --git a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/QueryFieldFactory.java b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/QueryFieldFactory.java
index 7c70cf9462..6488f09124 100644
--- a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/QueryFieldFactory.java
+++ b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/QueryFieldFactory.java
@@ -18,16 +18,19 @@
*/
package org.apache.causeway.viewer.graphql.viewer.source;
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+import static graphql.schema.GraphQLObjectType.newObject;
+
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import javax.inject.Inject;
-import org.apache.causeway.commons.collections.Can;
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.facets.actions.semantics.ActionSemanticsFacet;
import org.apache.causeway.core.metamodel.interactions.managed.ActionInteractionHead;
@@ -38,9 +41,6 @@ import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
import org.apache.causeway.core.metamodel.spec.feature.ObjectActionParameter;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
-import lombok.RequiredArgsConstructor;
-import lombok.val;
-
import graphql.schema.DataFetcher;
import graphql.schema.DataFetchingEnvironment;
import graphql.schema.FieldCoordinates;
@@ -49,9 +49,8 @@ import graphql.schema.GraphQLCodeRegistry;
import graphql.schema.GraphQLFieldDefinition;
import graphql.schema.GraphQLObjectType;
import graphql.schema.GraphQLOutputType;
-
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
-import static graphql.schema.GraphQLObjectType.newObject;
+import lombok.RequiredArgsConstructor;
+import lombok.val;
@Component
@RequiredArgsConstructor(onConstructor_ = {@Inject})
diff --git a/incubator/viewers/javafx/model/src/main/java/org/apache/causeway/incubator/viewer/javafx/model/action/ActionUiModelFx.java b/incubator/viewers/javafx/model/src/main/java/org/apache/causeway/incubator/viewer/javafx/model/action/ActionUiModelFx.java
index a88b82c501..493c542b94 100644
--- a/incubator/viewers/javafx/model/src/main/java/org/apache/causeway/incubator/viewer/javafx/model/action/ActionUiModelFx.java
+++ b/incubator/viewers/javafx/model/src/main/java/org/apache/causeway/incubator/viewer/javafx/model/action/ActionUiModelFx.java
@@ -23,13 +23,12 @@ import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
import org.apache.causeway.incubator.viewer.javafx.model.context.UiContextFx;
import org.apache.causeway.viewer.commons.model.action.UiAction;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import lombok.val;
-
import javafx.scene.Node;
import javafx.scene.control.Label;
import javafx.scene.control.MenuItem;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.val;
@RequiredArgsConstructor(staticName = "of")
public class ActionUiModelFx
diff --git a/incubator/viewers/javafx/model/src/main/java/org/apache/causeway/incubator/viewer/javafx/model/binding/BindingsFx.java b/incubator/viewers/javafx/model/src/main/java/org/apache/causeway/incubator/viewer/javafx/model/binding/BindingsFx.java
index da59e9fe58..34be6ff192 100644
--- a/incubator/viewers/javafx/model/src/main/java/org/apache/causeway/incubator/viewer/javafx/model/binding/BindingsFx.java
+++ b/incubator/viewers/javafx/model/src/main/java/org/apache/causeway/incubator/viewer/javafx/model/binding/BindingsFx.java
@@ -25,16 +25,14 @@ import org.apache.causeway.commons.binding.Bindable;
import org.apache.causeway.commons.binding.ChangeListener;
import org.apache.causeway.commons.binding.Observable;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
-
import org.apache.causeway.viewer.commons.model.binding.BindingConverter;
-import lombok.NonNull;
-import lombok.val;
-import lombok.experimental.UtilityClass;
-
import javafx.beans.property.Property;
import javafx.beans.property.StringProperty;
import javafx.beans.value.ObservableValue;
+import lombok.NonNull;
+import lombok.val;
+import lombok.experimental.UtilityClass;
@UtilityClass
public class BindingsFx {
diff --git a/incubator/viewers/javafx/model/src/main/java/org/apache/causeway/incubator/viewer/javafx/model/events/JavaFxViewerConfig.java b/incubator/viewers/javafx/model/src/main/java/org/apache/causeway/incubator/viewer/javafx/model/events/JavaFxViewerConfig.java
index 73b32ba7f1..453c536ac5 100644
--- a/incubator/viewers/javafx/model/src/main/java/org/apache/causeway/incubator/viewer/javafx/model/events/JavaFxViewerConfig.java
+++ b/incubator/viewers/javafx/model/src/main/java/org/apache/causeway/incubator/viewer/javafx/model/events/JavaFxViewerConfig.java
@@ -21,11 +21,10 @@ package org.apache.causeway.incubator.viewer.javafx.model.events;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
+import javafx.scene.image.Image;
import lombok.Builder;
import lombok.Getter;
-import javafx.scene.image.Image;
-
@Getter @Builder
public class JavaFxViewerConfig {
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/CausewayModuleIncViewerJavaFxUi.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/CausewayModuleIncViewerJavaFxUi.java
index 9e79d29247..30a0e73e58 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/CausewayModuleIncViewerJavaFxUi.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/CausewayModuleIncViewerJavaFxUi.java
@@ -20,6 +20,7 @@ package org.apache.causeway.incubator.viewer.javafx.ui;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+
import org.apache.causeway.incubator.viewer.javafx.model.events.CausewayModuleIncViewerJavaFxModel;
import org.apache.causeway.incubator.viewer.javafx.ui.components.UiComponentFactoryFx;
import org.apache.causeway.incubator.viewer.javafx.ui.components.markup.MarkupFieldFactory;
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/UiComponentFactoryFx.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/UiComponentFactoryFx.java
index a96daee2cd..c2d84b1a7b 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/UiComponentFactoryFx.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/UiComponentFactoryFx.java
@@ -23,23 +23,25 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
-import org.apache.causeway.commons.handler.ChainOfResponsibility;
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.LabelPosition;
+import org.apache.causeway.commons.handler.ChainOfResponsibility;
import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedMember;
import org.apache.causeway.core.metamodel.util.Facets;
import org.apache.causeway.incubator.viewer.javafx.model.context.UiContextFx;
import org.apache.causeway.viewer.commons.model.components.UiComponentFactory;
+import org.apache.causeway.viewer.commons.model.components.UiComponentFactory.ButtonRequest;
+import org.apache.causeway.viewer.commons.model.components.UiComponentFactory.ComponentRequest;
+import org.apache.causeway.viewer.commons.model.components.UiComponentFactory.LabelAndPosition;
import org.apache.causeway.viewer.commons.model.decorators.PrototypingDecorator.PrototypingDecorationModel;
-import lombok.Getter;
-import lombok.val;
-
import javafx.scene.Node;
import javafx.scene.control.Button;
import javafx.scene.control.Label;
+import lombok.Getter;
+import lombok.val;
@Service
public class UiComponentFactoryFx implements UiComponentFactory<Node, Node> {
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/UiComponentHandlerFx.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/UiComponentHandlerFx.java
index 1d7d4cedb0..3d99096991 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/UiComponentHandlerFx.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/UiComponentHandlerFx.java
@@ -18,12 +18,9 @@
*/
package org.apache.causeway.incubator.viewer.javafx.ui.components;
-import org.apache.causeway.viewer.commons.model.binding.BindingConverterForManagedObject;
import org.apache.causeway.viewer.commons.model.components.UiComponentFactory;
import javafx.scene.Node;
-import javafx.util.StringConverter;
-import lombok.NonNull;
public interface UiComponentHandlerFx
extends UiComponentFactory.Handler<Node> {
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/collections/TableViewFx.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/collections/TableViewFx.java
index c40eb5374f..e0bde8d11e 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/collections/TableViewFx.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/collections/TableViewFx.java
@@ -20,14 +20,14 @@ package org.apache.causeway.incubator.viewer.javafx.ui.components.collections;
import java.util.Optional;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.collections._Multimaps;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.layout.grid.Grid;
import org.apache.causeway.applib.services.bookmark.Oid;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.base._NullSafe;
+import org.apache.causeway.commons.internal.collections._Multimaps;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedCollection;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.ManagedObjects;
@@ -39,17 +39,16 @@ import org.apache.causeway.core.metamodel.util.Facets;
import org.apache.causeway.incubator.viewer.javafx.model.context.UiContextFx;
import org.apache.causeway.incubator.viewer.javafx.model.util._fx;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.TableView;
+import javafx.scene.layout.VBox;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.NonNull;
import lombok.val;
import lombok.extern.log4j.Log4j2;
-import javafx.scene.control.Button;
-import javafx.scene.control.Label;
-import javafx.scene.control.TableView;
-import javafx.scene.layout.VBox;
-
@NoArgsConstructor(access = AccessLevel.PRIVATE)
@Log4j2
public class TableViewFx extends VBox {
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/dialog/Dialogs.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/dialog/Dialogs.java
index e506ba2343..53e4bd0cac 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/dialog/Dialogs.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/dialog/Dialogs.java
@@ -21,9 +21,6 @@ package org.apache.causeway.incubator.viewer.javafx.ui.components.dialog;
import java.io.PrintWriter;
import java.io.StringWriter;
-import lombok.val;
-import lombok.experimental.UtilityClass;
-
import javafx.scene.Node;
import javafx.scene.control.Alert;
import javafx.scene.control.Alert.AlertType;
@@ -32,6 +29,8 @@ import javafx.scene.control.Label;
import javafx.scene.control.TextArea;
import javafx.scene.layout.GridPane;
import javafx.scene.layout.Priority;
+import lombok.val;
+import lombok.experimental.UtilityClass;
@UtilityClass
public class Dialogs {
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/form/FormPane.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/form/FormPane.java
index 5671fe9329..3ce649d703 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/form/FormPane.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/form/FormPane.java
@@ -20,22 +20,21 @@ package org.apache.causeway.incubator.viewer.javafx.ui.components.form;
import java.util.List;
-import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.incubator.viewer.javafx.model.util._fx;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.annotation.LabelPosition;
-
-import lombok.Getter;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import lombok.val;
+import org.apache.causeway.commons.internal.collections._Lists;
+import org.apache.causeway.incubator.viewer.javafx.model.util._fx;
import javafx.geometry.Insets;
import javafx.geometry.Pos;
import javafx.scene.Node;
import javafx.scene.layout.FlowPane;
import javafx.scene.layout.GridPane;
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import lombok.val;
public class FormPane extends GridPane {
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/number/NumberFieldFactory.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/number/NumberFieldFactory.java
index bd254879d7..22b86570aa 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/number/NumberFieldFactory.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/number/NumberFieldFactory.java
@@ -28,12 +28,11 @@ import org.apache.causeway.incubator.viewer.javafx.model.util._fx;
import org.apache.causeway.incubator.viewer.javafx.ui.components.UiComponentHandlerFx;
import org.apache.causeway.viewer.commons.model.components.UiComponentFactory.ComponentRequest;
-import lombok.RequiredArgsConstructor;
-import lombok.val;
-
import javafx.scene.Node;
import javafx.scene.control.TextField;
import javafx.scene.layout.VBox;
+import lombok.RequiredArgsConstructor;
+import lombok.val;
@org.springframework.stereotype.Component
@javax.annotation.Priority(PriorityPrecedence.MIDPOINT)
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/object/ObjectViewFx.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/object/ObjectViewFx.java
index 94e44b72a0..7c3b5aa5a7 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/object/ObjectViewFx.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/object/ObjectViewFx.java
@@ -20,8 +20,6 @@ package org.apache.causeway.incubator.viewer.javafx.ui.components.object;
import java.util.function.Consumer;
-import org.apache.causeway.commons.internal.assertions._Assert;
-
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.layout.component.ActionLayoutData;
import org.apache.causeway.applib.layout.component.CollectionLayoutData;
@@ -33,6 +31,7 @@ import org.apache.causeway.applib.layout.grid.bootstrap.BSCol;
import org.apache.causeway.applib.layout.grid.bootstrap.BSRow;
import org.apache.causeway.applib.layout.grid.bootstrap.BSTab;
import org.apache.causeway.applib.layout.grid.bootstrap.BSTabGroup;
+import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.causeway.core.metamodel.interactions.managed.ActionInteraction;
import org.apache.causeway.core.metamodel.interactions.managed.CollectionInteraction;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedAction;
@@ -50,13 +49,12 @@ import org.apache.causeway.viewer.commons.model.components.UiComponentFactory;
import org.apache.causeway.viewer.commons.model.decorators.DisablingDecorator.DisablingDecorationModel;
import org.apache.causeway.viewer.commons.model.layout.UiGridLayout;
-import lombok.NonNull;
-import lombok.val;
-import lombok.extern.log4j.Log4j2;
-
import javafx.scene.control.TabPane;
import javafx.scene.layout.Pane;
import javafx.scene.layout.VBox;
+import lombok.NonNull;
+import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Log4j2
public class ObjectViewFx extends VBox {
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/objectref/ObjectReferenceFieldFactory.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/objectref/ObjectReferenceFieldFactory.java
index 5fd180a9aa..f343a00a01 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/objectref/ObjectReferenceFieldFactory.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/objectref/ObjectReferenceFieldFactory.java
@@ -26,11 +26,10 @@ import org.apache.causeway.core.metamodel.interactions.managed.ManagedProperty;
import org.apache.causeway.incubator.viewer.javafx.ui.components.UiComponentHandlerFx;
import org.apache.causeway.viewer.commons.model.components.UiComponentFactory.ComponentRequest;
-import lombok.RequiredArgsConstructor;
-import lombok.val;
-
import javafx.scene.Node;
import javafx.scene.control.Label;
+import lombok.RequiredArgsConstructor;
+import lombok.val;
@org.springframework.stereotype.Component
@javax.annotation.Priority(PriorityPrecedence.MIDPOINT)
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/other/FallbackFieldFactory.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/other/FallbackFieldFactory.java
index 8e322e493d..3e42a8b409 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/other/FallbackFieldFactory.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/other/FallbackFieldFactory.java
@@ -18,16 +18,13 @@
*/
package org.apache.causeway.incubator.viewer.javafx.ui.components.other;
-import org.springframework.core.annotation.Order;
-
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.incubator.viewer.javafx.ui.components.UiComponentHandlerFx;
import org.apache.causeway.viewer.commons.model.components.UiComponentFactory.ComponentRequest;
-import lombok.val;
-
import javafx.scene.Node;
import javafx.scene.control.Label;
+import lombok.val;
@org.springframework.stereotype.Component
@javax.annotation.Priority(PriorityPrecedence.LAST)
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/panel/TitledPanel.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/panel/TitledPanel.java
index c27290ac1b..59effaad18 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/panel/TitledPanel.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/panel/TitledPanel.java
@@ -21,11 +21,10 @@ package org.apache.causeway.incubator.viewer.javafx.ui.components.panel;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.incubator.viewer.javafx.model.util._fx;
-import lombok.Getter;
-
import javafx.scene.control.Label;
import javafx.scene.layout.FlowPane;
import javafx.scene.layout.VBox;
+import lombok.Getter;
public class TitledPanel extends VBox {
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/temporal/TemporalFieldFactory.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/temporal/TemporalFieldFactory.java
index 7e00852658..2380cd6c2c 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/temporal/TemporalFieldFactory.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/temporal/TemporalFieldFactory.java
@@ -33,12 +33,11 @@ import org.apache.causeway.incubator.viewer.javafx.ui.components.UiComponentHand
import org.apache.causeway.viewer.commons.model.binding.BindingConverterForManagedObject;
import org.apache.causeway.viewer.commons.model.components.UiComponentFactory.ComponentRequest;
-import lombok.RequiredArgsConstructor;
-import lombok.val;
-
import javafx.scene.Node;
import javafx.scene.control.DatePicker;
import javafx.scene.layout.VBox;
+import lombok.RequiredArgsConstructor;
+import lombok.val;
@org.springframework.stereotype.Component
@javax.annotation.Priority(PriorityPrecedence.MIDPOINT)
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/text/TextFieldFactory.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/text/TextFieldFactory.java
index 9fe00b05c4..b6e838d633 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/text/TextFieldFactory.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/text/TextFieldFactory.java
@@ -26,12 +26,11 @@ import org.apache.causeway.incubator.viewer.javafx.model.util._fx;
import org.apache.causeway.incubator.viewer.javafx.ui.components.UiComponentHandlerFx;
import org.apache.causeway.viewer.commons.model.components.UiComponentFactory.ComponentRequest;
-import lombok.RequiredArgsConstructor;
-import lombok.val;
-
import javafx.scene.Node;
import javafx.scene.control.TextField;
import javafx.scene.layout.VBox;
+import lombok.RequiredArgsConstructor;
+import lombok.val;
@org.springframework.stereotype.Component
@javax.annotation.Priority(PriorityPrecedence.MIDPOINT)
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/disabling/DisablingDecoratorForButton.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/disabling/DisablingDecoratorForButton.java
index 6109161b39..d8776eead9 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/disabling/DisablingDecoratorForButton.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/disabling/DisablingDecoratorForButton.java
@@ -23,12 +23,12 @@ import javax.inject.Inject;
import org.springframework.stereotype.Component;
import org.apache.causeway.viewer.commons.model.decorators.DisablingDecorator;
-
-import lombok.RequiredArgsConstructor;
-import lombok.val;
+import org.apache.causeway.viewer.commons.model.decorators.DisablingDecorator.DisablingDecorationModel;
import javafx.scene.control.Button;
import javafx.scene.control.Tooltip;
+import lombok.RequiredArgsConstructor;
+import lombok.val;
@Component
@RequiredArgsConstructor(onConstructor_ = {@Inject})
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/disabling/DisablingDecoratorForFormField.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/disabling/DisablingDecoratorForFormField.java
index ec317bd8d1..1b9066c786 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/disabling/DisablingDecoratorForFormField.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/disabling/DisablingDecoratorForFormField.java
@@ -23,12 +23,12 @@ import javax.inject.Inject;
import org.springframework.stereotype.Component;
import org.apache.causeway.viewer.commons.model.decorators.DisablingDecorator;
+import org.apache.causeway.viewer.commons.model.decorators.DisablingDecorator.DisablingDecorationModel;
+import javafx.scene.Node;
import lombok.RequiredArgsConstructor;
import lombok.val;
-import javafx.scene.Node;
-
@Component
@RequiredArgsConstructor(onConstructor_ = {@Inject})
public class DisablingDecoratorForFormField implements DisablingDecorator<Node> {
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/icon/IconDecoratorForLabeled.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/icon/IconDecoratorForLabeled.java
index 335d54c4e9..c7e5dc04b1 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/icon/IconDecoratorForLabeled.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/icon/IconDecoratorForLabeled.java
@@ -23,16 +23,15 @@ import java.util.Optional;
import javax.inject.Inject;
import org.springframework.stereotype.Component;
+
import org.apache.causeway.incubator.viewer.javafx.model.icon.IconService;
import org.apache.causeway.incubator.viewer.javafx.model.util._fx;
import org.apache.causeway.viewer.commons.model.decorators.IconDecorator;
-import lombok.RequiredArgsConstructor;
-import lombok.val;
-
import javafx.scene.control.Labeled;
import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
+import lombok.RequiredArgsConstructor;
@Component
@RequiredArgsConstructor(onConstructor_ = {@Inject})
@@ -41,9 +40,9 @@ public class IconDecoratorForLabeled implements IconDecorator<Labeled, Labeled>
private final IconService iconService;
@Override
- public Labeled decorate(Labeled uiComponent, Optional<FontAwesomeDecorationModel> fontAwesomeDecorationModel) {
+ public Labeled decorate(final Labeled uiComponent, final Optional<FontAwesomeDecorationModel> fontAwesomeDecorationModel) {
fontAwesomeDecorationModel.ifPresent(fa->{
- val icon = iconService.fontAwesome(fa);
+ var icon = iconService.fontAwesome(fa);
icon
.map(this::iconForImage)
.ifPresent(uiComponent::setGraphic);
@@ -51,7 +50,7 @@ public class IconDecoratorForLabeled implements IconDecorator<Labeled, Labeled>
return uiComponent;
}
- private ImageView iconForImage(Image image) {
+ private ImageView iconForImage(final Image image) {
return _fx.iconForImage(image, 16, 16);
}
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/icon/IconDecoratorForMenuItem.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/icon/IconDecoratorForMenuItem.java
index 8ceef70e1c..93dfdb9144 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/icon/IconDecoratorForMenuItem.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/icon/IconDecoratorForMenuItem.java
@@ -23,16 +23,16 @@ import java.util.Optional;
import javax.inject.Inject;
import org.springframework.stereotype.Component;
+
import org.apache.causeway.incubator.viewer.javafx.model.icon.IconService;
import org.apache.causeway.incubator.viewer.javafx.model.util._fx;
import org.apache.causeway.viewer.commons.model.decorators.IconDecorator;
-
-import lombok.RequiredArgsConstructor;
-import lombok.val;
+import org.apache.causeway.viewer.commons.model.decorators.IconDecorator.FontAwesomeDecorationModel;
import javafx.scene.control.MenuItem;
import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
+import lombok.RequiredArgsConstructor;
@Component
@RequiredArgsConstructor(onConstructor_ = {@Inject})
@@ -41,11 +41,11 @@ public class IconDecoratorForMenuItem implements IconDecorator<MenuItem, MenuIte
private final IconService iconService;
@Override
- public MenuItem decorate(MenuItem menuItem, Optional<FontAwesomeDecorationModel> fontAwesomeDecorationModel) {
+ public MenuItem decorate(final MenuItem menuItem, final Optional<FontAwesomeDecorationModel> fontAwesomeDecorationModel) {
// TODO honor icon position
fontAwesomeDecorationModel.ifPresent(fa->{
- val icon = iconService.fontAwesome(fa);
+ var icon = iconService.fontAwesome(fa);
icon
.map(this::iconForImage)
.ifPresent(menuItem::setGraphic);
@@ -53,7 +53,7 @@ public class IconDecoratorForMenuItem implements IconDecorator<MenuItem, MenuIte
return menuItem;
}
- private ImageView iconForImage(Image image) {
+ private ImageView iconForImage(final Image image) {
return _fx.iconForImage(image, 16, 16);
}
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/icon/IconServiceDefault.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/icon/IconServiceDefault.java
index 60bab10a9c..e9aa110c7b 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/icon/IconServiceDefault.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/icon/IconServiceDefault.java
@@ -24,17 +24,17 @@ import java.util.Optional;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
+import org.springframework.stereotype.Service;
+
import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.incubator.viewer.javafx.model.icon.IconService;
-import org.springframework.stereotype.Service;
import org.apache.causeway.viewer.commons.model.decorators.IconDecorator.FontAwesomeDecorationModel;
+import javafx.scene.image.Image;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
-import javafx.scene.image.Image;
-
@Service
@RequiredArgsConstructor(onConstructor_ = {@Inject})
@Getter
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingDecoratorForButton.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingDecoratorForButton.java
index 2eb0fe48bc..41131a75aa 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingDecoratorForButton.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingDecoratorForButton.java
@@ -21,17 +21,18 @@ package org.apache.causeway.incubator.viewer.javafx.ui.decorator.prototyping;
import javax.inject.Inject;
import org.springframework.stereotype.Component;
+
import org.apache.causeway.incubator.viewer.javafx.model.util._fx;
import org.apache.causeway.viewer.commons.model.decorators.PrototypingDecorator;
-
-import lombok.RequiredArgsConstructor;
-import lombok.val;
+import org.apache.causeway.viewer.commons.model.decorators.PrototypingDecorator.PrototypingDecorationModel;
import javafx.scene.Node;
import javafx.scene.control.Button;
import javafx.scene.control.Label;
import javafx.scene.control.Tooltip;
import javafx.scene.layout.HBox;
+import lombok.RequiredArgsConstructor;
+import lombok.val;
@Component
@RequiredArgsConstructor(onConstructor_ = {@Inject})
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingDecoratorForFormField.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingDecoratorForFormField.java
index 8f9ba14ed1..059e25ea65 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingDecoratorForFormField.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingDecoratorForFormField.java
@@ -21,16 +21,17 @@ package org.apache.causeway.incubator.viewer.javafx.ui.decorator.prototyping;
import javax.inject.Inject;
import org.springframework.stereotype.Component;
+
import org.apache.causeway.incubator.viewer.javafx.model.util._fx;
import org.apache.causeway.viewer.commons.model.decorators.PrototypingDecorator;
-
-import lombok.RequiredArgsConstructor;
-import lombok.val;
+import org.apache.causeway.viewer.commons.model.decorators.PrototypingDecorator.PrototypingDecorationModel;
import javafx.scene.Node;
import javafx.scene.control.Label;
import javafx.scene.control.Tooltip;
import javafx.scene.layout.HBox;
+import lombok.RequiredArgsConstructor;
+import lombok.val;
@Component
@RequiredArgsConstructor(onConstructor_ = {@Inject})
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingInfoPopupProvider.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingInfoPopupProvider.java
index 3931e8e732..925a89bb02 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingInfoPopupProvider.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingInfoPopupProvider.java
@@ -23,10 +23,10 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
import javax.inject.Provider;
-import org.apache.causeway.commons.internal.collections._Maps;
-import org.apache.causeway.commons.internal.collections._Sets;
import org.springframework.stereotype.Component;
+import org.apache.causeway.commons.internal.collections._Maps;
+import org.apache.causeway.commons.internal.collections._Sets;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetAbstract;
import org.apache.causeway.incubator.viewer.javafx.model.util._fx;
@@ -34,16 +34,15 @@ import org.apache.causeway.incubator.viewer.javafx.ui.components.UiComponentFact
import org.apache.causeway.incubator.viewer.javafx.ui.components.dialog.Dialogs;
import org.apache.causeway.viewer.commons.model.decorators.PrototypingDecorator.PrototypingDecorationModel;
-import lombok.RequiredArgsConstructor;
-import lombok.Value;
-import lombok.val;
-
import javafx.beans.property.SimpleStringProperty;
import javafx.scene.Node;
import javafx.scene.control.ScrollPane;
import javafx.scene.control.TableColumn;
import javafx.scene.control.TableView;
import javafx.scene.layout.VBox;
+import lombok.RequiredArgsConstructor;
+import lombok.Value;
+import lombok.val;
@Component
@RequiredArgsConstructor(onConstructor_ = {@Inject})
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/main/MainViewFx.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/main/MainViewFx.java
index 113819bbca..c3c0527986 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/main/MainViewFx.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/main/MainViewFx.java
@@ -35,10 +35,6 @@ import org.apache.causeway.incubator.viewer.javafx.ui.components.collections.Tab
import org.apache.causeway.incubator.viewer.javafx.ui.components.object.ObjectViewFx;
import org.apache.causeway.viewer.commons.applib.services.header.HeaderUiService;
-import lombok.RequiredArgsConstructor;
-import lombok.val;
-import lombok.extern.log4j.Log4j2;
-
import javafx.fxml.FXML;
import javafx.scene.Node;
import javafx.scene.control.MenuBar;
@@ -48,6 +44,9 @@ import javafx.scene.control.TextArea;
import javafx.scene.image.ImageView;
import javafx.scene.layout.HBox;
import javafx.scene.layout.VBox;
+import lombok.RequiredArgsConstructor;
+import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Component
@RequiredArgsConstructor(onConstructor_ = {@Inject})
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/main/MenuBuilderFx.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/main/MenuBuilderFx.java
index 2f7fe37015..7cb3862677 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/main/MenuBuilderFx.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/main/MenuBuilderFx.java
@@ -25,14 +25,13 @@ import org.apache.causeway.incubator.viewer.javafx.model.context.UiContextFx;
import org.apache.causeway.viewer.commons.applib.services.menu.MenuItemDto;
import org.apache.causeway.viewer.commons.applib.services.menu.MenuVisitor;
-import lombok.RequiredArgsConstructor;
-import lombok.val;
-import lombok.extern.log4j.Log4j2;
-
import javafx.scene.control.Menu;
import javafx.scene.control.MenuBar;
import javafx.scene.control.MenuItem;
import javafx.scene.control.SeparatorMenuItem;
+import lombok.RequiredArgsConstructor;
+import lombok.val;
+import lombok.extern.log4j.Log4j2;
@RequiredArgsConstructor(staticName = "of")
@Log4j2
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/main/UiActionHandlerFx.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/main/UiActionHandlerFx.java
index a3b4bc9d4b..ce7b333695 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/main/UiActionHandlerFx.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/main/UiActionHandlerFx.java
@@ -20,10 +20,10 @@ package org.apache.causeway.incubator.viewer.javafx.ui.main;
import javax.inject.Inject;
-import org.apache.causeway.commons.collections.Can;
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedAction;
import org.apache.causeway.core.metamodel.interactions.managed.ParameterNegotiationModel;
import org.apache.causeway.core.metamodel.object.ManagedObject;
@@ -31,14 +31,13 @@ import org.apache.causeway.incubator.viewer.javafx.model.context.UiContextFx;
import org.apache.causeway.incubator.viewer.javafx.ui.components.UiComponentFactoryFx;
import org.apache.causeway.viewer.commons.model.components.UiComponentFactory.ComponentRequest;
-import lombok.RequiredArgsConstructor;
-import lombok.val;
-import lombok.extern.log4j.Log4j2;
-
import javafx.geometry.Insets;
import javafx.scene.control.ButtonType;
import javafx.scene.control.Dialog;
import javafx.scene.layout.GridPane;
+import lombok.RequiredArgsConstructor;
+import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Service
@RequiredArgsConstructor(onConstructor_ = {@Inject})
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/main/UiBuilderFx.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/main/UiBuilderFx.java
index 800b79b348..eaae1d0b7a 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/main/UiBuilderFx.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/main/UiBuilderFx.java
@@ -22,15 +22,15 @@ import java.util.Optional;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.debug._Probe;
-import org.apache.causeway.core.interaction.scope.TransactionBoundaryAware;
-import org.apache.causeway.incubator.viewer.javafx.model.events.JavaFxViewerConfig;
-import org.apache.causeway.incubator.viewer.javafx.model.events.PrimaryStageReadyEvent;
import org.springframework.context.ApplicationContext;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.services.iactn.Interaction;
+import org.apache.causeway.commons.internal.debug._Probe;
+import org.apache.causeway.core.interaction.scope.TransactionBoundaryAware;
+import org.apache.causeway.incubator.viewer.javafx.model.events.JavaFxViewerConfig;
+import org.apache.causeway.incubator.viewer.javafx.model.events.PrimaryStageReadyEvent;
import javafx.fxml.FXMLLoader;
import javafx.scene.Parent;
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/main/UiContextFxDefault.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/main/UiContextFxDefault.java
index b6641e2652..659f85d73e 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/main/UiContextFxDefault.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/main/UiContextFxDefault.java
@@ -35,16 +35,14 @@ import org.apache.causeway.viewer.commons.model.decorators.DisablingDecorator;
import org.apache.causeway.viewer.commons.model.decorators.IconDecorator;
import org.apache.causeway.viewer.commons.model.decorators.PrototypingDecorator;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import lombok.Setter;
-import lombok.val;
-import lombok.extern.log4j.Log4j2;
-
import javafx.scene.Node;
import javafx.scene.control.Button;
import javafx.scene.control.Labeled;
import javafx.scene.control.MenuItem;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.extern.log4j.Log4j2;
@Service
@RequiredArgsConstructor(onConstructor_ = {@Inject})
@@ -65,15 +63,15 @@ public class UiContextFxDefault implements UiContextFx {
private Function<ManagedObject, Node> pageFactory;
@Override
- public void route(ManagedObject object) {
+ public void route(final ManagedObject object) {
log.info("about to render object {}", object);
newPage(pageFor(object));
}
@Override
- public void route(Supplier<ManagedObject> objectSupplier) {
+ public void route(final Supplier<ManagedObject> objectSupplier) {
interactionService.runAnonymous(()->{
- val object = objectSupplier.get();
+ var object = objectSupplier.get();
route(object);
});
}
@@ -97,13 +95,13 @@ public class UiContextFxDefault implements UiContextFx {
// -- HELPER
- private void newPage(Node content) {
+ private void newPage(final Node content) {
if(newPageHandler!=null && content!=null) {
newPageHandler.accept(content);
}
}
- private Node pageFor(ManagedObject object) {
+ private Node pageFor(final ManagedObject object) {
return pageFactory!=null
? pageFactory.apply(object)
: null;
diff --git a/incubator/viewers/javafx/viewer/src/main/java/org/apache/causeway/incubator/viewer/javafx/viewer/CausewayModuleIncViewerJavaFxViewer.java b/incubator/viewers/javafx/viewer/src/main/java/org/apache/causeway/incubator/viewer/javafx/viewer/CausewayModuleIncViewerJavaFxViewer.java
index 1be454d7c8..720b5bd38e 100644
--- a/incubator/viewers/javafx/viewer/src/main/java/org/apache/causeway/incubator/viewer/javafx/viewer/CausewayModuleIncViewerJavaFxViewer.java
+++ b/incubator/viewers/javafx/viewer/src/main/java/org/apache/causeway/incubator/viewer/javafx/viewer/CausewayModuleIncViewerJavaFxViewer.java
@@ -18,10 +18,11 @@
*/
package org.apache.causeway.incubator.viewer.javafx.viewer;
-import org.apache.causeway.incubator.viewer.javafx.ui.CausewayModuleIncViewerJavaFxUi;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.incubator.viewer.javafx.ui.CausewayModuleIncViewerJavaFxUi;
+
/**
*
* @since 2.0
diff --git a/incubator/viewers/javafx/viewer/src/main/java/org/apache/causeway/incubator/viewer/javafx/viewer/JavafxViewer.java b/incubator/viewers/javafx/viewer/src/main/java/org/apache/causeway/incubator/viewer/javafx/viewer/JavafxViewer.java
index b886afa959..580c9e87c7 100644
--- a/incubator/viewers/javafx/viewer/src/main/java/org/apache/causeway/incubator/viewer/javafx/viewer/JavafxViewer.java
+++ b/incubator/viewers/javafx/viewer/src/main/java/org/apache/causeway/incubator/viewer/javafx/viewer/JavafxViewer.java
@@ -18,9 +18,8 @@
*/
package org.apache.causeway.incubator.viewer.javafx.viewer;
-import lombok.experimental.UtilityClass;
-
import javafx.application.Application;
+import lombok.experimental.UtilityClass;
@UtilityClass
public class JavafxViewer {
diff --git a/incubator/viewers/javafx/viewer/src/main/java/org/apache/causeway/incubator/viewer/javafx/viewer/JavafxViewerApplication.java b/incubator/viewers/javafx/viewer/src/main/java/org/apache/causeway/incubator/viewer/javafx/viewer/JavafxViewerApplication.java
index c6de17ec3d..383eb725ce 100644
--- a/incubator/viewers/javafx/viewer/src/main/java/org/apache/causeway/incubator/viewer/javafx/viewer/JavafxViewerApplication.java
+++ b/incubator/viewers/javafx/viewer/src/main/java/org/apache/causeway/incubator/viewer/javafx/viewer/JavafxViewerApplication.java
@@ -18,13 +18,14 @@
*/
package org.apache.causeway.incubator.viewer.javafx.viewer;
-import org.apache.causeway.commons.internal._Constants;
-import org.apache.causeway.incubator.viewer.javafx.model.events.PrimaryStageReadyEvent;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.context.ApplicationContextInitializer;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.support.GenericApplicationContext;
+import org.apache.causeway.commons.internal._Constants;
+import org.apache.causeway.incubator.viewer.javafx.model.events.PrimaryStageReadyEvent;
+
import javafx.application.Application;
import javafx.application.HostServices;
import javafx.application.Platform;
diff --git a/incubator/viewers/vaadin/model/src/main/java/org/apache/causeway/incubator/viewer/vaadin/model/decorator/Decorators.java b/incubator/viewers/vaadin/model/src/main/java/org/apache/causeway/incubator/viewer/vaadin/model/decorator/Decorators.java
index 9fe7bb6b65..c0e4a6a3b4 100644
--- a/incubator/viewers/vaadin/model/src/main/java/org/apache/causeway/incubator/viewer/vaadin/model/decorator/Decorators.java
+++ b/incubator/viewers/vaadin/model/src/main/java/org/apache/causeway/incubator/viewer/vaadin/model/decorator/Decorators.java
@@ -34,7 +34,9 @@ import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.viewer.commons.applib.services.userprof.UserProfileUiModel;
import org.apache.causeway.viewer.commons.applib.services.userprof.UserProfileUiService;
import org.apache.causeway.viewer.commons.model.decorators.IconDecorator;
+import org.apache.causeway.viewer.commons.model.decorators.IconDecorator.FontAwesomeDecorationModel;
import org.apache.causeway.viewer.commons.model.decorators.TooltipDecorator;
+import org.apache.causeway.viewer.commons.model.decorators.TooltipDecorator.TooltipDecorationModel;
import lombok.Getter;
import lombok.val;
diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/CausewayModuleIncViewerVaadinUi.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/CausewayModuleIncViewerVaadinUi.java
index 47629716f9..028adf0941 100644
--- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/CausewayModuleIncViewerVaadinUi.java
+++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/CausewayModuleIncViewerVaadinUi.java
@@ -22,6 +22,7 @@ import com.vaadin.flow.spring.annotation.EnableVaadin;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+
import org.apache.causeway.incubator.viewer.vaadin.model.CausewayModuleIncViewerVaadinModel;
import org.apache.causeway.incubator.viewer.vaadin.ui.auth.LogoutHandlerVaa;
import org.apache.causeway.incubator.viewer.vaadin.ui.auth.VaadinAuthenticationHandler;
diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/auth/VaadinAuthenticationHandler.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/auth/VaadinAuthenticationHandler.java
index 845344dbe4..80f94cf1f5 100644
--- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/auth/VaadinAuthenticationHandler.java
+++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/auth/VaadinAuthenticationHandler.java
@@ -31,10 +31,10 @@ import com.vaadin.flow.server.VaadinServiceInitListener;
import com.vaadin.flow.theme.Theme;
import com.vaadin.flow.theme.lumo.Lumo;
-import org.apache.causeway.commons.functional.ThrowingRunnable;
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.commons.functional.ThrowingRunnable;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.security.authentication.AuthenticationRequest;
import org.apache.causeway.incubator.viewer.vaadin.ui.pages.login.VaadinLoginView;
diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/binding/BindingsVaa.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/binding/BindingsVaa.java
index c12a67dc0d..a7baea24c6 100644
--- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/binding/BindingsVaa.java
+++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/binding/BindingsVaa.java
@@ -28,13 +28,13 @@ import com.vaadin.flow.data.binder.Setter;
import com.vaadin.flow.data.converter.Converter;
import com.vaadin.flow.function.ValueProvider;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.binding.Bindable;
import org.apache.causeway.commons.binding.Observable;
import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
-import org.springframework.lang.Nullable;
-
import org.apache.causeway.core.metamodel.interactions.managed.ManagedFeature;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedParameter;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedProperty;
diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/UiComponentFactoryVaa.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/UiComponentFactoryVaa.java
index d386584ecc..6028a4ee57 100644
--- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/UiComponentFactoryVaa.java
+++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/UiComponentFactoryVaa.java
@@ -25,11 +25,15 @@ import javax.inject.Inject;
import com.vaadin.flow.component.Component;
+import org.springframework.stereotype.Service;
+
import org.apache.causeway.commons.handler.ChainOfResponsibility;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.incubator.viewer.vaadin.model.util._vaa;
-import org.springframework.stereotype.Service;
import org.apache.causeway.viewer.commons.model.components.UiComponentFactory;
+import org.apache.causeway.viewer.commons.model.components.UiComponentFactory.ButtonRequest;
+import org.apache.causeway.viewer.commons.model.components.UiComponentFactory.ComponentRequest;
+import org.apache.causeway.viewer.commons.model.components.UiComponentFactory.LabelAndPosition;
import lombok.Getter;
import lombok.val;
diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/action/ActionDialog.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/action/ActionDialog.java
index 587f06b8f6..5587ea70d1 100644
--- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/action/ActionDialog.java
+++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/action/ActionDialog.java
@@ -34,7 +34,6 @@ import com.vaadin.flow.component.icon.VaadinIcon;
import com.vaadin.flow.theme.lumo.Lumo;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.interactions.managed.ManagedAction;
import org.apache.causeway.core.metamodel.interactions.managed.ParameterNegotiationModel;
import org.apache.causeway.core.metamodel.object.ManagedObject;
diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/collection/TableViewVaa.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/collection/TableViewVaa.java
index f344030b10..2b601105a2 100644
--- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/collection/TableViewVaa.java
+++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/collection/TableViewVaa.java
@@ -24,11 +24,10 @@ import com.vaadin.flow.component.Component;
import com.vaadin.flow.component.grid.Grid;
import com.vaadin.flow.component.orderedlayout.VerticalLayout;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.collections._Multimaps;
-
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.services.bookmark.Oid;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.collections._Multimaps;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedCollection;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.ManagedObjects;
diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/object/ObjectViewVaa.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/object/ObjectViewVaa.java
index ffdf2658b3..1ab6d0b880 100644
--- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/object/ObjectViewVaa.java
+++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/object/ObjectViewVaa.java
@@ -32,8 +32,6 @@ import com.vaadin.flow.component.orderedlayout.VerticalLayout;
import com.vaadin.flow.component.tabs.Tab;
import com.vaadin.flow.component.tabs.Tabs;
-import org.apache.causeway.commons.internal.assertions._Assert;
-
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.layout.component.ActionLayoutData;
import org.apache.causeway.applib.layout.component.CollectionLayoutData;
@@ -45,6 +43,7 @@ import org.apache.causeway.applib.layout.grid.bootstrap.BSCol;
import org.apache.causeway.applib.layout.grid.bootstrap.BSRow;
import org.apache.causeway.applib.layout.grid.bootstrap.BSTab;
import org.apache.causeway.applib.layout.grid.bootstrap.BSTabGroup;
+import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.causeway.core.metamodel.interactions.managed.ActionInteraction;
import org.apache.causeway.core.metamodel.interactions.managed.CollectionInteraction;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedAction;
diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/other/FallbackFieldFactory.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/other/FallbackFieldFactory.java
index 1089589f50..bd632f3c89 100644
--- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/other/FallbackFieldFactory.java
+++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/other/FallbackFieldFactory.java
@@ -25,9 +25,8 @@ import javax.inject.Provider;
import com.vaadin.flow.component.Component;
-import org.apache.causeway.commons.internal.collections._Maps;
-
import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetAbstract;
import org.apache.causeway.incubator.viewer.vaadin.ui.components.UiComponentFactoryVaa;
diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/temporal/TemporalFieldFactory.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/temporal/TemporalFieldFactory.java
index d99a48bd1a..b1d985ba55 100644
--- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/temporal/TemporalFieldFactory.java
+++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/temporal/TemporalFieldFactory.java
@@ -25,12 +25,11 @@ import com.vaadin.flow.component.Component;
import com.vaadin.flow.data.converter.DateToSqlDateConverter;
import com.vaadin.flow.data.converter.LocalDateToDateConverter;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
-
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.value.semantics.TemporalValueSemantics;
import org.apache.causeway.applib.value.semantics.TemporalValueSemantics.OffsetCharacteristic;
import org.apache.causeway.applib.value.semantics.TemporalValueSemantics.TemporalCharacteristic;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.metamodel.util.Facets;
import org.apache.causeway.incubator.viewer.vaadin.ui.binding.BindingsVaa;
import org.apache.causeway.incubator.viewer.vaadin.ui.components.UiComponentHandlerVaa;
diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/pages/main/UiActionHandlerVaa.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/pages/main/UiActionHandlerVaa.java
index 0441d1c96e..bf8119e449 100644
--- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/pages/main/UiActionHandlerVaa.java
+++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/pages/main/UiActionHandlerVaa.java
@@ -20,10 +20,10 @@ package org.apache.causeway.incubator.viewer.vaadin.ui.pages.main;
import javax.inject.Inject;
-import org.apache.causeway.commons.collections.Can;
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedAction;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.incubator.viewer.vaadin.model.context.UiContextVaa;
diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/pages/main/UiContextVaaDefault.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/pages/main/UiContextVaaDefault.java
index 47692482bc..16c5eb6a53 100644
--- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/pages/main/UiContextVaaDefault.java
+++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/pages/main/UiContextVaaDefault.java
@@ -35,7 +35,6 @@ import org.apache.causeway.incubator.viewer.vaadin.model.context.UiContextVaa;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
@Service
@@ -57,15 +56,15 @@ public class UiContextVaaDefault implements UiContextVaa {
private Function<ManagedObject, Component> pageFactory;
@Override
- public void route(ManagedObject object) {
+ public void route(final ManagedObject object) {
log.info("about to render object {}", object);
newPage(pageFor(object));
}
@Override
- public void route(Supplier<ManagedObject> objectSupplier) {
+ public void route(final Supplier<ManagedObject> objectSupplier) {
interactionService.runAnonymous(()->{
- val object = objectSupplier.get();
+ var object = objectSupplier.get();
route(object);
});
}
@@ -89,13 +88,13 @@ public class UiContextVaaDefault implements UiContextVaa {
// -- HELPER
- private void newPage(Component content) {
+ private void newPage(final Component content) {
if(newPageHandler!=null && content!=null) {
newPageHandler.accept(content);
}
}
- private Component pageFor(ManagedObject object) {
+ private Component pageFor(final ManagedObject object) {
return pageFactory!=null
? pageFactory.apply(object)
: null;
diff --git a/viewers/commons/applib/src/main/java/org/apache/causeway/viewer/commons/applib/CausewayModuleViewerCommonsApplib.java b/viewers/commons/applib/src/main/java/org/apache/causeway/viewer/commons/applib/CausewayModuleViewerCommonsApplib.java
index dd7fc82262..4b48674f20 100644
--- a/viewers/commons/applib/src/main/java/org/apache/causeway/viewer/commons/applib/CausewayModuleViewerCommonsApplib.java
+++ b/viewers/commons/applib/src/main/java/org/apache/causeway/viewer/commons/applib/CausewayModuleViewerCommonsApplib.java
@@ -18,11 +18,12 @@
*/
package org.apache.causeway.viewer.commons.applib;
-import org.apache.causeway.viewer.commons.applib.mixins.Object_impersonate;
-import org.apache.causeway.viewer.commons.applib.mixins.Object_impersonateWithRoles;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.viewer.commons.applib.mixins.Object_impersonate;
+import org.apache.causeway.viewer.commons.applib.mixins.Object_impersonateWithRoles;
+
@Configuration
@Import({
diff --git a/viewers/commons/applib/src/main/java/org/apache/causeway/viewer/commons/applib/services/menu/MenuItemDto.java b/viewers/commons/applib/src/main/java/org/apache/causeway/viewer/commons/applib/services/menu/MenuItemDto.java
index caf02fefca..06b4c4ef5d 100644
--- a/viewers/commons/applib/src/main/java/org/apache/causeway/viewer/commons/applib/services/menu/MenuItemDto.java
+++ b/viewers/commons/applib/src/main/java/org/apache/causeway/viewer/commons/applib/services/menu/MenuItemDto.java
@@ -18,9 +18,9 @@
*/
package org.apache.causeway.viewer.commons.applib.services.menu;
-import org.apache.causeway.commons.internal.base._Strings;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedAction;
import lombok.NonNull;
diff --git a/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/action/UiActionForm.java b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/action/UiActionForm.java
index a715f4923e..a28668723b 100644
--- a/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/action/UiActionForm.java
+++ b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/action/UiActionForm.java
@@ -20,10 +20,9 @@ package org.apache.causeway.viewer.commons.model.action;
import java.util.stream.Stream;
+import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.assertions._Assert;
-
-import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.core.metamodel.consent.Consent;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.consent.Veto;
diff --git a/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/binding/BindingConverterForManagedObject.java b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/binding/BindingConverterForManagedObject.java
index 049a04a702..b4901b8c5f 100644
--- a/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/binding/BindingConverterForManagedObject.java
+++ b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/binding/BindingConverterForManagedObject.java
@@ -19,7 +19,6 @@
package org.apache.causeway.viewer.commons.model.binding;
import org.apache.causeway.commons.internal.base._Casts;
-
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.MmUnwrapUtil;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
diff --git a/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/components/UiComponentFactory.java b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/components/UiComponentFactory.java
index a82864f172..16e420c3cc 100644
--- a/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/components/UiComponentFactory.java
+++ b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/components/UiComponentFactory.java
@@ -21,11 +21,11 @@ package org.apache.causeway.viewer.commons.model.components;
import java.util.Optional;
import java.util.function.Consumer;
-import org.apache.causeway.commons.handler.ChainOfResponsibility;
-import org.apache.causeway.commons.internal.functions._Predicates;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.annotation.LabelPosition;
+import org.apache.causeway.commons.handler.ChainOfResponsibility;
+import org.apache.causeway.commons.internal.functions._Predicates;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedAction;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedFeature;
diff --git a/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/decorators/IconDecorator.java b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/decorators/IconDecorator.java
index 4e5bf7322f..137a66efc2 100644
--- a/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/decorators/IconDecorator.java
+++ b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/decorators/IconDecorator.java
@@ -23,9 +23,8 @@ import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.layout.component.CssClassFaPosition;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFactory;
import lombok.AccessLevel;
diff --git a/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/decorators/TooltipDecorator.java b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/decorators/TooltipDecorator.java
index e788dbccb9..974a739789 100644
--- a/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/decorators/TooltipDecorator.java
+++ b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/decorators/TooltipDecorator.java
@@ -21,9 +21,10 @@ package org.apache.causeway.viewer.commons.model.decorators;
import java.io.Serializable;
import java.util.Optional;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.viewer.commons.model.layout.UiPlacementDirection;
-import org.springframework.lang.Nullable;
import lombok.NonNull;
import lombok.Value;
diff --git a/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/layout/UiGridLayout.java b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/layout/UiGridLayout.java
index ab24a00e1f..f33c465c61 100644
--- a/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/layout/UiGridLayout.java
+++ b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/layout/UiGridLayout.java
@@ -21,10 +21,6 @@ package org.apache.causeway.viewer.commons.model.layout;
import java.util.Optional;
import java.util.Set;
-import org.apache.causeway.commons.internal.base._Lazy;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.collections._Sets;
-
import org.apache.causeway.applib.layout.component.ActionLayoutData;
import org.apache.causeway.applib.layout.component.CollectionLayoutData;
import org.apache.causeway.applib.layout.component.DomainObjectLayoutData;
@@ -36,6 +32,9 @@ import org.apache.causeway.applib.layout.grid.bootstrap.BSGrid;
import org.apache.causeway.applib.layout.grid.bootstrap.BSRow;
import org.apache.causeway.applib.layout.grid.bootstrap.BSTab;
import org.apache.causeway.applib.layout.grid.bootstrap.BSTabGroup;
+import org.apache.causeway.commons.internal.base._Lazy;
+import org.apache.causeway.commons.internal.base._NullSafe;
+import org.apache.causeway.commons.internal.collections._Sets;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.spec.feature.MixedIn;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
diff --git a/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/scalar/HasUiParameter.java b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/scalar/HasUiParameter.java
index d70ce21708..0d373bf795 100644
--- a/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/scalar/HasUiParameter.java
+++ b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/scalar/HasUiParameter.java
@@ -21,7 +21,6 @@ package org.apache.causeway.viewer.commons.model.scalar;
import java.util.Optional;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.interactions.managed.ActionInteractionHead;
diff --git a/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/scalar/UiParameter.java b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/scalar/UiParameter.java
index 9efa1ae27d..d3d925f065 100644
--- a/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/scalar/UiParameter.java
+++ b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/scalar/UiParameter.java
@@ -21,7 +21,6 @@ package org.apache.causeway.viewer.commons.model.scalar;
import java.util.Optional;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.interactions.managed.ActionInteractionHead;
diff --git a/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/scalar/UiProperty.java b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/scalar/UiProperty.java
index 9624748741..4617424bef 100644
--- a/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/scalar/UiProperty.java
+++ b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/scalar/UiProperty.java
@@ -19,7 +19,6 @@
package org.apache.causeway.viewer.commons.model.scalar;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedProperty;
import org.apache.causeway.core.metamodel.interactions.managed.PropertyNegotiationModel;
diff --git a/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/scalar/UiScalar.java b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/scalar/UiScalar.java
index fdcdfac6f2..3a48ab8676 100644
--- a/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/scalar/UiScalar.java
+++ b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/scalar/UiScalar.java
@@ -21,7 +21,6 @@ package org.apache.causeway.viewer.commons.model.scalar;
import java.util.Optional;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
diff --git a/viewers/commons/services/src/main/java/org/apache/causeway/viewer/commons/services/CausewayModuleViewerCommonsServices.java b/viewers/commons/services/src/main/java/org/apache/causeway/viewer/commons/services/CausewayModuleViewerCommonsServices.java
index a8af392554..9413d6dd75 100644
--- a/viewers/commons/services/src/main/java/org/apache/causeway/viewer/commons/services/CausewayModuleViewerCommonsServices.java
+++ b/viewers/commons/services/src/main/java/org/apache/causeway/viewer/commons/services/CausewayModuleViewerCommonsServices.java
@@ -18,13 +18,14 @@
*/
package org.apache.causeway.viewer.commons.services;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
import org.apache.causeway.viewer.commons.applib.CausewayModuleViewerCommonsApplib;
import org.apache.causeway.viewer.commons.services.branding.BrandingUiServiceDefault;
import org.apache.causeway.viewer.commons.services.header.HeaderUiServiceDefault;
import org.apache.causeway.viewer.commons.services.menu.MenuUiServiceDefault;
import org.apache.causeway.viewer.commons.services.userprof.UserProfileUiServiceDefault;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
@Configuration
@Import({
diff --git a/viewers/commons/services/src/main/java/org/apache/causeway/viewer/commons/services/header/HeaderUiServiceDefault.java b/viewers/commons/services/src/main/java/org/apache/causeway/viewer/commons/services/header/HeaderUiServiceDefault.java
index dd21c650f2..80b4bdbae8 100644
--- a/viewers/commons/services/src/main/java/org/apache/causeway/viewer/commons/services/header/HeaderUiServiceDefault.java
+++ b/viewers/commons/services/src/main/java/org/apache/causeway/viewer/commons/services/header/HeaderUiServiceDefault.java
@@ -26,13 +26,13 @@ import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.DomainServiceLayout.MenuBar;
+import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.viewer.commons.applib.services.branding.BrandingUiService;
import org.apache.causeway.viewer.commons.applib.services.header.HeaderUiModel;
import org.apache.causeway.viewer.commons.applib.services.header.HeaderUiService;
import org.apache.causeway.viewer.commons.applib.services.menu.MenuUiService;
import org.apache.causeway.viewer.commons.applib.services.userprof.UserProfileUiService;
import org.apache.causeway.viewer.commons.services.CausewayModuleViewerCommonsServices;
-import org.apache.causeway.applib.annotation.PriorityPrecedence;
import lombok.RequiredArgsConstructor;
diff --git a/viewers/commons/services/src/main/java/org/apache/causeway/viewer/commons/services/menu/_MenuItemBuilder.java b/viewers/commons/services/src/main/java/org/apache/causeway/viewer/commons/services/menu/_MenuItemBuilder.java
index 63d3dcc1d1..77fe38c045 100644
--- a/viewers/commons/services/src/main/java/org/apache/causeway/viewer/commons/services/menu/_MenuItemBuilder.java
+++ b/viewers/commons/services/src/main/java/org/apache/causeway/viewer/commons/services/menu/_MenuItemBuilder.java
@@ -20,13 +20,12 @@ package org.apache.causeway.viewer.commons.services.menu;
import java.util.concurrent.atomic.LongAdder;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.layout.component.ServiceActionLayoutData;
import org.apache.causeway.applib.layout.menubars.bootstrap.BSMenu;
import org.apache.causeway.applib.layout.menubars.bootstrap.BSMenuBar;
import org.apache.causeway.applib.layout.menubars.bootstrap.BSMenuSection;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedAction;
import org.apache.causeway.viewer.commons.applib.services.menu.MenuItemDto;
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 3a05156e01..18b61917af 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
@@ -43,6 +43,11 @@ import com.fasterxml.jackson.databind.node.NullNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
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;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.internal.base._Strings;
@@ -51,10 +56,6 @@ import org.apache.causeway.commons.internal.resources._Json;
import org.apache.causeway.viewer.restfulobjects.applib.util.JsonNodeUtils;
import org.apache.causeway.viewer.restfulobjects.applib.util.PathNode;
import org.apache.causeway.viewer.restfulobjects.applib.util.UrlEncodingUtils;
-import org.joda.time.LocalTime;
-import org.joda.time.format.DateTimeFormatter;
-import org.joda.time.format.ISODateTimeFormat;
-import org.springframework.lang.Nullable;
import lombok.val;
diff --git a/viewers/restfulobjects/applib/src/main/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/DomainRepresentation.java b/viewers/restfulobjects/applib/src/main/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/DomainRepresentation.java
index 9570605b53..bfd8370ebb 100644
--- a/viewers/restfulobjects/applib/src/main/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/DomainRepresentation.java
+++ b/viewers/restfulobjects/applib/src/main/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/DomainRepresentation.java
@@ -21,11 +21,11 @@ package org.apache.causeway.viewer.restfulobjects.applib.domainobjects;
import com.fasterxml.jackson.databind.JsonNode;
import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
-import org.apache.causeway.viewer.restfulobjects.applib.LinkRepresentation;
-import org.apache.causeway.viewer.restfulobjects.applib.Rel;
import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation.HasExtensions;
import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation.HasLinkToSelf;
import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation.HasLinks;
+import org.apache.causeway.viewer.restfulobjects.applib.LinkRepresentation;
+import org.apache.causeway.viewer.restfulobjects.applib.Rel;
/**
* @since 1.x {@index}
diff --git a/viewers/restfulobjects/applib/src/main/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/ListRepresentation.java b/viewers/restfulobjects/applib/src/main/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/ListRepresentation.java
index 0d436f057a..f529211751 100644
--- a/viewers/restfulobjects/applib/src/main/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/ListRepresentation.java
+++ b/viewers/restfulobjects/applib/src/main/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/ListRepresentation.java
@@ -21,9 +21,9 @@ package org.apache.causeway.viewer.restfulobjects.applib.domainobjects;
import com.fasterxml.jackson.databind.JsonNode;
import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
+import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation.HasLinkToUp;
import org.apache.causeway.viewer.restfulobjects.applib.LinkRepresentation;
import org.apache.causeway.viewer.restfulobjects.applib.Rel;
-import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation.HasLinkToUp;
/**
* @since 1.x {@index}
diff --git a/viewers/restfulobjects/applib/src/main/java/org/apache/causeway/viewer/restfulobjects/applib/health/HealthRepresentation.java b/viewers/restfulobjects/applib/src/main/java/org/apache/causeway/viewer/restfulobjects/applib/health/HealthRepresentation.java
index 99978bc979..47405fdf33 100644
--- a/viewers/restfulobjects/applib/src/main/java/org/apache/causeway/viewer/restfulobjects/applib/health/HealthRepresentation.java
+++ b/viewers/restfulobjects/applib/src/main/java/org/apache/causeway/viewer/restfulobjects/applib/health/HealthRepresentation.java
@@ -20,9 +20,9 @@ package org.apache.causeway.viewer.restfulobjects.applib.health;
import com.fasterxml.jackson.databind.JsonNode;
+import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation.HasLinkToUp;
import org.apache.causeway.viewer.restfulobjects.applib.LinkRepresentation;
import org.apache.causeway.viewer.restfulobjects.applib.Rel;
-import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation.HasLinkToUp;
import org.apache.causeway.viewer.restfulobjects.applib.domainobjects.DomainRepresentation;
/**
diff --git a/viewers/restfulobjects/applib/src/main/java/org/apache/causeway/viewer/restfulobjects/applib/user/UserRepresentation.java b/viewers/restfulobjects/applib/src/main/java/org/apache/causeway/viewer/restfulobjects/applib/user/UserRepresentation.java
index a9096574df..05543a6456 100644
--- a/viewers/restfulobjects/applib/src/main/java/org/apache/causeway/viewer/restfulobjects/applib/user/UserRepresentation.java
+++ b/viewers/restfulobjects/applib/src/main/java/org/apache/causeway/viewer/restfulobjects/applib/user/UserRepresentation.java
@@ -21,9 +21,9 @@ package org.apache.causeway.viewer.restfulobjects.applib.user;
import com.fasterxml.jackson.databind.JsonNode;
import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
+import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation.HasLinkToUp;
import org.apache.causeway.viewer.restfulobjects.applib.LinkRepresentation;
import org.apache.causeway.viewer.restfulobjects.applib.Rel;
-import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation.HasLinkToUp;
import org.apache.causeway.viewer.restfulobjects.applib.domainobjects.DomainRepresentation;
/**
diff --git a/viewers/restfulobjects/applib/src/main/java/org/apache/causeway/viewer/restfulobjects/applib/version/VersionRepresentation.java b/viewers/restfulobjects/applib/src/main/java/org/apache/causeway/viewer/restfulobjects/applib/version/VersionRepresentation.java
index 7482621259..b4a82f6ecb 100644
--- a/viewers/restfulobjects/applib/src/main/java/org/apache/causeway/viewer/restfulobjects/applib/version/VersionRepresentation.java
+++ b/viewers/restfulobjects/applib/src/main/java/org/apache/causeway/viewer/restfulobjects/applib/version/VersionRepresentation.java
@@ -21,9 +21,9 @@ package org.apache.causeway.viewer.restfulobjects.applib.version;
import com.fasterxml.jackson.databind.JsonNode;
import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
+import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation.HasLinkToUp;
import org.apache.causeway.viewer.restfulobjects.applib.LinkRepresentation;
import org.apache.causeway.viewer.restfulobjects.applib.Rel;
-import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation.HasLinkToUp;
import org.apache.causeway.viewer.restfulobjects.applib.domainobjects.DomainRepresentation;
/**
diff --git a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_arrayGet_arraySetElementAt.java b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_arrayGet_arraySetElementAt.java
index a355bf9007..ca43199963 100644
--- a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_arrayGet_arraySetElementAt.java
+++ b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_arrayGet_arraySetElementAt.java
@@ -20,16 +20,16 @@ package org.apache.causeway.viewer.restfulobjects.applib;
import java.io.IOException;
-import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
import org.junit.Before;
import org.junit.Test;
-import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class JsonRepresentationTest_arrayGet_arraySetElementAt {
private JsonRepresentation jsonRepresentation;
diff --git a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_asInputStream.java b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_asInputStream.java
index 56754600f1..8a8e35f6cb 100644
--- a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_asInputStream.java
+++ b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_asInputStream.java
@@ -22,18 +22,19 @@ import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
-import org.apache.causeway.commons.internal.base._Bytes;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
import org.junit.Before;
import org.junit.Test;
-import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.apache.causeway.commons.internal.base._Bytes;
+import org.apache.causeway.commons.internal.base._Strings;
+
+import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class JsonRepresentationTest_asInputStream {
private JsonRepresentation jsonRepresentation;
diff --git a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getArray.java b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getArray.java
index 4df0c6b432..b8ce28025f 100644
--- a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getArray.java
+++ b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getArray.java
@@ -20,17 +20,17 @@ package org.apache.causeway.viewer.restfulobjects.applib;
import java.io.IOException;
-import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
import org.junit.Before;
import org.junit.Test;
-import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.fail;
+import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class JsonRepresentationTest_getArray {
private JsonRepresentation jsonRepresentation;
diff --git a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getBigDecimal.java b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getBigDecimal.java
index b77724a4f1..2725521b41 100644
--- a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getBigDecimal.java
+++ b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getBigDecimal.java
@@ -21,17 +21,17 @@ package org.apache.causeway.viewer.restfulobjects.applib;
import java.io.IOException;
import java.math.BigDecimal;
-import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class JsonRepresentationTest_getBigDecimal {
@Rule
diff --git a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getBigInteger.java b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getBigInteger.java
index 4b82a3f987..07348ed6b9 100644
--- a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getBigInteger.java
+++ b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getBigInteger.java
@@ -21,17 +21,17 @@ package org.apache.causeway.viewer.restfulobjects.applib;
import java.io.IOException;
import java.math.BigInteger;
-import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class JsonRepresentationTest_getBigInteger {
@Rule
diff --git a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getBoolean.java b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getBoolean.java
index df5e95dcc7..3c46b36655 100644
--- a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getBoolean.java
+++ b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getBoolean.java
@@ -20,16 +20,16 @@ package org.apache.causeway.viewer.restfulobjects.applib;
import java.io.IOException;
-import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
import org.junit.Before;
import org.junit.Test;
-import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.fail;
+import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class JsonRepresentationTest_getBoolean {
private JsonRepresentation jsonRepresentation;
diff --git a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getDouble.java b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getDouble.java
index 792bce3c11..fefc03680e 100644
--- a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getDouble.java
+++ b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getDouble.java
@@ -20,18 +20,18 @@ package org.apache.causeway.viewer.restfulobjects.applib;
import java.io.IOException;
-import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.fail;
+import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class JsonRepresentationTest_getDouble {
@Rule
diff --git a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getInt.java b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getInt.java
index 4cf1196d58..14d658695f 100644
--- a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getInt.java
+++ b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getInt.java
@@ -20,16 +20,16 @@ package org.apache.causeway.viewer.restfulobjects.applib;
import java.io.IOException;
-import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
import org.junit.Before;
import org.junit.Test;
-import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.fail;
+import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class JsonRepresentationTest_getInt {
private JsonRepresentation jsonRepresentation;
diff --git a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getLink_isLink.java b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getLink_isLink.java
index 6f683cba28..722d322b5b 100644
--- a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getLink_isLink.java
+++ b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getLink_isLink.java
@@ -20,20 +20,17 @@ package org.apache.causeway.viewer.restfulobjects.applib;
import java.io.IOException;
-import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
-import org.apache.causeway.viewer.restfulobjects.applib.LinkRepresentation;
-import org.apache.causeway.viewer.restfulobjects.applib.Rel;
-import org.apache.causeway.viewer.restfulobjects.applib.RestfulHttpMethod;
import org.junit.Before;
import org.junit.Test;
-import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.fail;
+import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class JsonRepresentationTest_getLink_isLink {
private LinkRepresentation link;
diff --git a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getLong.java b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getLong.java
index a94e2a7cf3..9285c378d3 100644
--- a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getLong.java
+++ b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getLong.java
@@ -20,16 +20,16 @@ package org.apache.causeway.viewer.restfulobjects.applib;
import java.io.IOException;
-import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
import org.junit.Before;
import org.junit.Test;
-import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.fail;
+import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class JsonRepresentationTest_getLong {
private JsonRepresentation jsonRepresentation;
diff --git a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getNull_isNull.java b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getNull_isNull.java
index 82acd9a279..f0773fb843 100644
--- a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getNull_isNull.java
+++ b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getNull_isNull.java
@@ -20,17 +20,17 @@ package org.apache.causeway.viewer.restfulobjects.applib;
import java.io.IOException;
-import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
import org.junit.Before;
import org.junit.Test;
-import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.fail;
+import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class JsonRepresentationTest_getNull_isNull {
private JsonRepresentation jsonRepresentation;
diff --git a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getRepresentation.java b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getRepresentation.java
index 4c2298a7e2..ed9a6e6653 100644
--- a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getRepresentation.java
+++ b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getRepresentation.java
@@ -20,15 +20,15 @@ package org.apache.causeway.viewer.restfulobjects.applib;
import java.io.IOException;
-import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
import org.junit.Before;
import org.junit.Test;
-import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class JsonRepresentationTest_getRepresentation {
private JsonRepresentation jsonRepresentation;
diff --git a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getString_isString.java b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getString_isString.java
index 7dce759b76..eb35dab5ae 100644
--- a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getString_isString.java
+++ b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getString_isString.java
@@ -20,16 +20,16 @@ package org.apache.causeway.viewer.restfulobjects.applib;
import java.io.IOException;
-import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
import org.junit.Before;
import org.junit.Test;
-import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.fail;
+import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class JsonRepresentationTest_getString_isString {
private JsonRepresentation jsonRepresentation;
diff --git a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_isArray_isMap_isValue.java b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_isArray_isMap_isValue.java
index 231d49d4f0..78cf7a5164 100644
--- a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_isArray_isMap_isValue.java
+++ b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_isArray_isMap_isValue.java
@@ -20,14 +20,14 @@ package org.apache.causeway.viewer.restfulobjects.applib;
import java.io.IOException;
-import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
import org.junit.Before;
import org.junit.Test;
-import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class JsonRepresentationTest_isArray_isMap_isValue {
private JsonRepresentation jsonRepresentation;
diff --git a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_mapHas.java b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_mapHas.java
index 4a20b25047..d7c9a08905 100644
--- a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_mapHas.java
+++ b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_mapHas.java
@@ -20,13 +20,13 @@ package org.apache.causeway.viewer.restfulobjects.applib;
import java.io.IOException;
-import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
import org.junit.Test;
-import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class JsonRepresentationTest_mapHas {
private JsonRepresentation jsonRepresentation;
diff --git a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_newArray.java b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_newArray.java
index ee20d5568e..d71cacb8f2 100644
--- a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_newArray.java
+++ b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_newArray.java
@@ -18,7 +18,6 @@
*/
package org.apache.causeway.viewer.restfulobjects.applib;
-import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
diff --git a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_newObject.java b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_newObject.java
index 1945bed4f4..eaf3241e59 100644
--- a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_newObject.java
+++ b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_newObject.java
@@ -20,7 +20,6 @@ package org.apache.causeway.viewer.restfulobjects.applib;
import java.io.IOException;
-import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
diff --git a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_putXxx.java b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_putXxx.java
index b1e4717987..831d689ef0 100644
--- a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_putXxx.java
+++ b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_putXxx.java
@@ -21,8 +21,6 @@ package org.apache.causeway.viewer.restfulobjects.applib;
import java.io.IOException;
import java.util.Random;
-import org.apache.causeway.commons.functional.IndexedConsumer;
-import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -30,6 +28,8 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.apache.causeway.commons.functional.IndexedConsumer;
+
class JsonRepresentationTest_putXxx {
private JsonRepresentation jsonRepresentation;
diff --git a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_size.java b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_size.java
index 16b7278836..7631d1f72a 100644
--- a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_size.java
+++ b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_size.java
@@ -20,13 +20,13 @@ package org.apache.causeway.viewer.restfulobjects.applib;
import java.io.IOException;
-import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
import org.junit.Test;
-import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class JsonRepresentationTest_size {
private JsonRepresentation jsonRepresentation;
diff --git a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_streamArrayElements.java b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_streamArrayElements.java
index b03e7c7b73..0039e9dd30 100644
--- a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_streamArrayElements.java
+++ b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_streamArrayElements.java
@@ -21,13 +21,13 @@ package org.apache.causeway.viewer.restfulobjects.applib;
import java.io.IOException;
import java.util.Iterator;
-import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
import org.junit.Test;
-import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class JsonRepresentationTest_streamArrayElements {
private JsonRepresentation jsonRepresentation;
diff --git a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_streamMapEntries.java b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_streamMapEntries.java
index c48d00923b..07e20c7581 100644
--- a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_streamMapEntries.java
+++ b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_streamMapEntries.java
@@ -22,15 +22,15 @@ import java.io.IOException;
import java.util.Iterator;
import java.util.Map.Entry;
-import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
import org.junit.jupiter.api.Test;
-import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
+
import lombok.val;
class JsonRepresentationTest_streamMapEntries {
diff --git a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_urlEncoding.java b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_urlEncoding.java
index d204918420..51ccf1c778 100644
--- a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_urlEncoding.java
+++ b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_urlEncoding.java
@@ -22,8 +22,6 @@ import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
-import org.apache.causeway.viewer.restfulobjects.applib.LinkRepresentation;
-import org.apache.causeway.viewer.restfulobjects.applib.RestfulHttpMethod;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
diff --git a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/LinkRepresentationTest_equals.java b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/LinkRepresentationTest_equals.java
index bdc82b5465..1c7a3b5157 100644
--- a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/LinkRepresentationTest_equals.java
+++ b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/LinkRepresentationTest_equals.java
@@ -20,8 +20,6 @@ package org.apache.causeway.viewer.restfulobjects.applib;
import java.io.UnsupportedEncodingException;
-import org.apache.causeway.viewer.restfulobjects.applib.LinkRepresentation;
-import org.apache.causeway.viewer.restfulobjects.applib.RestfulHttpMethod;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.equalTo;
diff --git a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/Rel_getName_Test.java b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/Rel_getName_Test.java
index 41c625ee4c..26a78e673c 100644
--- a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/Rel_getName_Test.java
+++ b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/Rel_getName_Test.java
@@ -18,7 +18,6 @@
*/
package org.apache.causeway.viewer.restfulobjects.applib;
-import org.apache.causeway.viewer.restfulobjects.applib.Rel;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.equalTo;
diff --git a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulRequest_DomainModelTest_parser.java b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulRequest_DomainModelTest_parser.java
index 6fe69ddeb6..0c9271ceeb 100644
--- a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulRequest_DomainModelTest_parser.java
+++ b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulRequest_DomainModelTest_parser.java
@@ -18,13 +18,14 @@
*/
package org.apache.causeway.viewer.restfulobjects.applib.client;
-import org.apache.causeway.viewer.restfulobjects.applib.RestfulRequest;
-import org.apache.causeway.viewer.restfulobjects.applib.RestfulRequest.DomainModel;
-import org.apache.causeway.viewer.restfulobjects.applib.util.Parser;
import org.junit.Test;
import static org.junit.Assert.assertSame;
+import org.apache.causeway.viewer.restfulobjects.applib.RestfulRequest;
+import org.apache.causeway.viewer.restfulobjects.applib.RestfulRequest.DomainModel;
+import org.apache.causeway.viewer.restfulobjects.applib.util.Parser;
+
public class RestfulRequest_DomainModelTest_parser {
@Test
diff --git a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrodomainmodel.java b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrodomainmodel.java
index 649a49959c..0c5485f6ec 100644
--- a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrodomainmodel.java
+++ b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrodomainmodel.java
@@ -18,16 +18,17 @@
*/
package org.apache.causeway.viewer.restfulobjects.applib.client;
-import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
-import org.apache.causeway.viewer.restfulobjects.applib.RestfulRequest;
-import org.apache.causeway.viewer.restfulobjects.applib.RestfulRequest.DomainModel;
-import org.apache.causeway.viewer.restfulobjects.applib.RestfulRequest.RequestParameter;
import org.junit.Before;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
+import org.apache.causeway.viewer.restfulobjects.applib.RestfulRequest;
+import org.apache.causeway.viewer.restfulobjects.applib.RestfulRequest.DomainModel;
+import org.apache.causeway.viewer.restfulobjects.applib.RestfulRequest.RequestParameter;
+
public class RestfulRequest_RequestParameterTest_valueOf_xrodomainmodel {
private final RequestParameter<DomainModel> requestParameter = RestfulRequest.RequestParameter.DOMAIN_MODEL;
diff --git a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrofollowlinks.java b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrofollowlinks.java
index db0f93c575..19d1d2eb0d 100644
--- a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrofollowlinks.java
+++ b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrofollowlinks.java
@@ -20,15 +20,16 @@ package org.apache.causeway.viewer.restfulobjects.applib.client;
import java.util.List;
-import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
-import org.apache.causeway.viewer.restfulobjects.applib.RestfulRequest;
-import org.apache.causeway.viewer.restfulobjects.applib.RestfulRequest.RequestParameter;
import org.junit.Before;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
+import org.apache.causeway.viewer.restfulobjects.applib.RestfulRequest;
+import org.apache.causeway.viewer.restfulobjects.applib.RestfulRequest.RequestParameter;
+
public class RestfulRequest_RequestParameterTest_valueOf_xrofollowlinks {
private final RequestParameter<List<List<String>>> requestParameter = RestfulRequest.RequestParameter.FOLLOW_LINKS;
diff --git a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulResponse_HeaderTest_Warning.java b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulResponse_HeaderTest_Warning.java
index 27ed0df8b6..6f5996bb6f 100644
--- a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulResponse_HeaderTest_Warning.java
+++ b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulResponse_HeaderTest_Warning.java
@@ -18,12 +18,13 @@
*/
package org.apache.causeway.viewer.restfulobjects.applib.client;
-import org.apache.causeway.viewer.restfulobjects.applib.RestfulResponse;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.apache.causeway.viewer.restfulobjects.applib.RestfulResponse;
+
public class RestfulResponse_HeaderTest_Warning {
diff --git a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulResponse_HttpStatusCodeTest.java b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulResponse_HttpStatusCodeTest.java
index d769b4fb46..e6e5fcce1a 100644
--- a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulResponse_HttpStatusCodeTest.java
+++ b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulResponse_HttpStatusCodeTest.java
@@ -20,12 +20,13 @@ package org.apache.causeway.viewer.restfulobjects.applib.client;
import javax.ws.rs.core.Response.Status.Family;
-import org.apache.causeway.viewer.restfulobjects.applib.RestfulResponse.HttpStatusCode;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.apache.causeway.viewer.restfulobjects.applib.RestfulResponse.HttpStatusCode;
+
public class RestfulResponse_HttpStatusCodeTest {
@Test
diff --git a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollection.java b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollection.java
index 6dcfe4701e..f40d0f9ac3 100644
--- a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollection.java
+++ b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollection.java
@@ -20,17 +20,18 @@ package org.apache.causeway.viewer.restfulobjects.applib.domainobjects;
import java.io.IOException;
-import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
-import org.apache.causeway.viewer.restfulobjects.applib.domainobjects.DomainObjectRepresentation;
import org.junit.Before;
import org.junit.Test;
-import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
+
+import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class DomainObjectRepresentationTest_getCollection {
private DomainObjectRepresentation representation;
diff --git a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollections.java b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollections.java
index 90ee2391f7..6e0abe48b5 100644
--- a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollections.java
+++ b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollections.java
@@ -20,15 +20,16 @@ package org.apache.causeway.viewer.restfulobjects.applib.domainobjects;
import java.io.IOException;
-import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
-import org.apache.causeway.viewer.restfulobjects.applib.domainobjects.DomainObjectRepresentation;
import org.junit.Before;
import org.junit.Test;
-import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
+
+import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class DomainObjectRepresentationTest_getCollections {
private DomainObjectRepresentation representation;
diff --git a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperties.java b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperties.java
index 59296fc73d..dad805be29 100644
--- a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperties.java
+++ b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperties.java
@@ -20,15 +20,16 @@ package org.apache.causeway.viewer.restfulobjects.applib.domainobjects;
import java.io.IOException;
-import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
-import org.apache.causeway.viewer.restfulobjects.applib.domainobjects.DomainObjectRepresentation;
import org.junit.Before;
import org.junit.Test;
-import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
+
+import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class DomainObjectRepresentationTest_getProperties {
private DomainObjectRepresentation representation;
diff --git a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperty.java b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperty.java
index 7001019014..6f14c5ff8d 100644
--- a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperty.java
+++ b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperty.java
@@ -20,17 +20,18 @@ package org.apache.causeway.viewer.restfulobjects.applib.domainobjects;
import java.io.IOException;
-import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
-import org.apache.causeway.viewer.restfulobjects.applib.domainobjects.DomainObjectRepresentation;
import org.junit.Before;
import org.junit.Test;
-import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
+
+import static org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class DomainObjectRepresentationTest_getProperty {
private DomainObjectRepresentation representation;
diff --git a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/util/Parser_Test.java b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/util/Parser_Test.java
index 2e850d9688..e3e42d0842 100644
--- a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/util/Parser_Test.java
+++ b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/util/Parser_Test.java
@@ -23,7 +23,6 @@ import java.util.Calendar;
import java.util.Date;
import java.util.List;
-import org.apache.causeway.viewer.restfulobjects.applib.util.Parser;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
diff --git a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/util/PathNodeTest_equalsHashcode.java b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/util/PathNodeTest_equalsHashcode.java
index 990e3a1aa8..cf34b33bd8 100644
--- a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/util/PathNodeTest_equalsHashcode.java
+++ b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/util/PathNodeTest_equalsHashcode.java
@@ -18,7 +18,6 @@
*/
package org.apache.causeway.viewer.restfulobjects.applib.util;
-import org.apache.causeway.viewer.restfulobjects.applib.util.PathNode;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/util/PathNodeTest_parse.java b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/util/PathNodeTest_parse.java
index 4a3cb98768..e7f529f7b7 100644
--- a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/util/PathNodeTest_parse.java
+++ b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/util/PathNodeTest_parse.java
@@ -20,7 +20,6 @@ package org.apache.causeway.viewer.restfulobjects.applib.util;
import java.util.Map;
-import org.apache.causeway.viewer.restfulobjects.applib.util.PathNode;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
diff --git a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/util/PathNodeTest_split.java b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/util/PathNodeTest_split.java
index 5a5880ff20..d41090a9cd 100644
--- a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/util/PathNodeTest_split.java
+++ b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/util/PathNodeTest_split.java
@@ -20,7 +20,6 @@ package org.apache.causeway.viewer.restfulobjects.applib.util;
import java.util.List;
-import org.apache.causeway.viewer.restfulobjects.applib.util.PathNode;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
diff --git a/viewers/restfulobjects/client/src/main/java/org/apache/causeway/viewer/restfulobjects/client/ResponseDigest.java b/viewers/restfulobjects/client/src/main/java/org/apache/causeway/viewer/restfulobjects/client/ResponseDigest.java
index 5fa55f63d1..2a681cd1bf 100644
--- a/viewers/restfulobjects/client/src/main/java/org/apache/causeway/viewer/restfulobjects/client/ResponseDigest.java
+++ b/viewers/restfulobjects/client/src/main/java/org/apache/causeway/viewer/restfulobjects/client/ResponseDigest.java
@@ -34,14 +34,14 @@ import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.lang.Nullable;
+
+import org.apache.causeway.applib.client.RepresentationTypeSimplifiedV2;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.viewer.restfulobjects.applib.dtos.ScalarValueDtoV2;
-import org.springframework.lang.Nullable;
-
-import org.apache.causeway.applib.client.RepresentationTypeSimplifiedV2;
import lombok.NonNull;
import lombok.val;
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 630eb398f0..b9898e91b0 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
@@ -29,6 +29,7 @@ import javax.ws.rs.client.Invocation.Builder;
import javax.ws.rs.core.GenericType;
import javax.ws.rs.core.Response;
+import org.apache.causeway.applib.client.SuppressionType;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.functional.Try;
import org.apache.causeway.commons.internal.base._Strings;
@@ -39,8 +40,6 @@ import org.apache.causeway.viewer.restfulobjects.client.log.ClientConversationLo
import static org.apache.causeway.commons.internal.base._NullSafe.stream;
-import org.apache.causeway.applib.client.SuppressionType;
-
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/CausewayModuleViewerRestfulObjectsJaxrsResteasy4.java b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/CausewayModuleViewerRestfulObjectsJaxrsResteasy4.java
index 73417e748c..40284f19d8 100644
--- a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/CausewayModuleViewerRestfulObjectsJaxrsResteasy4.java
+++ b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/CausewayModuleViewerRestfulObjectsJaxrsResteasy4.java
@@ -18,11 +18,12 @@
*/
package org.apache.causeway.viewer.restfulobjects.jaxrsresteasy4;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
import org.apache.causeway.viewer.restfulobjects.jaxrsresteasy4.conneg.RestfulObjectsJaxbWriterForXml;
import org.apache.causeway.viewer.restfulobjects.jaxrsresteasy4.webmodule.WebModuleJaxrsResteasy4;
import org.apache.causeway.viewer.restfulobjects.viewer.CausewayModuleViewerRestfulObjectsViewer;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
/**
* @since 1.x {@index}
diff --git a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
index 8241a333a1..aabd618734 100644
--- a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
+++ b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
@@ -24,7 +24,6 @@ import javax.servlet.ServletContext;
import javax.servlet.ServletContextListener;
import javax.servlet.ServletException;
-import org.apache.causeway.commons.collections.Can;
import org.jboss.resteasy.core.providerfactory.ResteasyProviderFactoryImpl;
import org.jboss.resteasy.spi.ResteasyProviderFactory;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -32,15 +31,15 @@ import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.inject.ServiceInjector;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.RestEasyConfiguration;
+import org.apache.causeway.core.webapp.modules.WebModuleAbstract;
+import org.apache.causeway.core.webapp.modules.WebModuleContext;
import org.apache.causeway.viewer.restfulobjects.applib.CausewayModuleViewerRestfulObjectsApplib;
import org.apache.causeway.viewer.restfulobjects.viewer.webmodule.CausewayRestfulObjectsInteractionFilter;
import org.apache.causeway.viewer.restfulobjects.viewer.webmodule.auth.AuthenticationStrategyBasicAuth;
-import org.apache.causeway.core.webapp.modules.WebModuleAbstract;
-import org.apache.causeway.core.webapp.modules.WebModuleContext;
-
import lombok.Getter;
import lombok.val;
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/CausewayModuleRestfulObjectsRendering.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/CausewayModuleRestfulObjectsRendering.java
index ab0596404e..89363e8193 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/CausewayModuleRestfulObjectsRendering.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/CausewayModuleRestfulObjectsRendering.java
@@ -18,13 +18,16 @@
*/
package org.apache.causeway.viewer.restfulobjects.rendering;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
import org.apache.causeway.core.runtime.CausewayModuleCoreRuntime;
import org.apache.causeway.viewer.restfulobjects.applib.CausewayModuleViewerRestfulObjectsApplib;
import org.apache.causeway.viewer.restfulobjects.rendering.service.RepresentationService;
import org.apache.causeway.viewer.restfulobjects.rendering.service.acceptheader.AcceptHeaderServiceForRest;
import org.apache.causeway.viewer.restfulobjects.rendering.service.conneg.ContentNegotiationServiceForRestfulObjectsV1_0;
-import org.apache.causeway.viewer.restfulobjects.rendering.service.conneg.ContentNegotiationServiceOrgApacheIsisV1;
import org.apache.causeway.viewer.restfulobjects.rendering.service.conneg.ContentNegotiationServiceOrgApacheCausewayV2;
+import org.apache.causeway.viewer.restfulobjects.rendering.service.conneg.ContentNegotiationServiceOrgApacheIsisV1;
import org.apache.causeway.viewer.restfulobjects.rendering.service.conneg.ContentNegotiationServiceXRoDomainType;
import org.apache.causeway.viewer.restfulobjects.rendering.service.swagger.SwaggerServiceDefault;
import org.apache.causeway.viewer.restfulobjects.rendering.service.swagger.SwaggerServiceMenu;
@@ -33,8 +36,6 @@ import org.apache.causeway.viewer.restfulobjects.rendering.service.swagger.inter
import org.apache.causeway.viewer.restfulobjects.rendering.service.swagger.internal.TaggerDefault;
import org.apache.causeway.viewer.restfulobjects.rendering.service.swagger.internal.ValuePropertyFactoryDefault;
import org.apache.causeway.viewer.restfulobjects.rendering.service.valuerender.JsonValueEncoderServiceDefault;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
/**
* @since 1.x {@index}
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/ReprRendererAbstract.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/ReprRendererAbstract.java
index 36ffb70ba2..04fb1defca 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/ReprRendererAbstract.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/ReprRendererAbstract.java
@@ -27,7 +27,6 @@ import javax.ws.rs.core.MediaType;
import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.commons.internal.collections._Maps;
-
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/AbstractObjectMemberReprRenderer.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/AbstractObjectMemberReprRenderer.java
index 9fcefe44f3..5a46a136b5 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/AbstractObjectMemberReprRenderer.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/AbstractObjectMemberReprRenderer.java
@@ -20,9 +20,8 @@ package org.apache.causeway.viewer.restfulobjects.rendering.domainobjects;
import com.fasterxml.jackson.databind.node.NullNode;
-import org.apache.causeway.commons.internal.base._Casts;
-
import org.apache.causeway.applib.annotation.Where;
+import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.core.metamodel.consent.Consent;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedMember;
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/MemberType.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/MemberType.java
index 2c378aac97..fc46f95b59 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/MemberType.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/MemberType.java
@@ -21,9 +21,8 @@ package org.apache.causeway.viewer.restfulobjects.rendering.domainobjects;
import java.util.Collections;
import java.util.Map;
-import org.apache.causeway.commons.internal.collections._Maps;
-
import org.apache.causeway.applib.util.Enums;
+import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.core.metamodel.facets.actions.action.invocation.ActionInvocationFacet;
import org.apache.causeway.core.metamodel.facets.properties.update.clear.PropertyClearFacet;
import org.apache.causeway.core.metamodel.facets.properties.update.modify.PropertySetterFacet;
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java
index f3fcab4c33..a41f818a0e 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java
@@ -23,11 +23,10 @@ import java.util.Map;
import com.fasterxml.jackson.databind.node.NullNode;
-import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.commons.internal.collections._Maps;
-
import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.annotation.Where;
+import org.apache.causeway.commons.internal.collections._Lists;
+import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedAction;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedParameter;
import org.apache.causeway.core.metamodel.interactions.managed.ParameterNegotiationModel;
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/ObjectAndActionInvocation.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/ObjectAndActionInvocation.java
index cf61d2a69f..898ced1d5e 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/ObjectAndActionInvocation.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/ObjectAndActionInvocation.java
@@ -22,7 +22,6 @@ import java.util.stream.Stream;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._Lazy;
-
import org.apache.causeway.core.metamodel.interactions.managed.ActionInteraction;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.ManagedObjects;
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java
index bc41c5562c..023da8342d 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java
@@ -20,9 +20,8 @@ package org.apache.causeway.viewer.restfulobjects.rendering.domainobjects;
import java.util.List;
-import org.apache.causeway.commons.internal.collections._Lists;
-
import org.apache.causeway.applib.annotation.Where;
+import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.core.metamodel.facets.collections.CollectionFacet;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedCollection;
import org.apache.causeway.core.metamodel.object.ManagedObjects;
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
index 471717f245..3df4bce9aa 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
@@ -22,9 +22,8 @@ import java.util.List;
import com.fasterxml.jackson.databind.node.NullNode;
-import org.apache.causeway.commons.internal.collections._Lists;
-
import org.apache.causeway.applib.annotation.Where;
+import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedProperty;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.ManagedObjects;
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domaintypes/ActionParameterDescriptionReprRenderer.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domaintypes/ActionParameterDescriptionReprRenderer.java
index b43bc64e1f..4d8f063ce5 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domaintypes/ActionParameterDescriptionReprRenderer.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domaintypes/ActionParameterDescriptionReprRenderer.java
@@ -19,7 +19,6 @@
package org.apache.causeway.viewer.restfulobjects.rendering.domaintypes;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
-
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
import org.apache.causeway.core.metamodel.spec.feature.ObjectActionParameter;
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domaintypes/DomainTypeReprRenderer.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domaintypes/DomainTypeReprRenderer.java
index d0030f9b34..dc8fb0e895 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domaintypes/DomainTypeReprRenderer.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domaintypes/DomainTypeReprRenderer.java
@@ -21,7 +21,6 @@ package org.apache.causeway.viewer.restfulobjects.rendering.domaintypes;
import com.fasterxml.jackson.databind.node.NullNode;
import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.spec.feature.MixedIn;
import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domaintypes/TypeListReprRenderer.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domaintypes/TypeListReprRenderer.java
index fcb7b6c429..85c8724178 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domaintypes/TypeListReprRenderer.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domaintypes/TypeListReprRenderer.java
@@ -19,7 +19,6 @@
package org.apache.causeway.viewer.restfulobjects.rendering.domaintypes;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.causeway.viewer.restfulobjects.applib.Rel;
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.java
index b75c42163d..400e99d603 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.java
@@ -18,16 +18,9 @@
*/
package org.apache.causeway.viewer.restfulobjects.rendering.service.acceptheader;
-import static org.apache.causeway.commons.internal.base._NullSafe.stream;
-
-import org.apache.causeway.applib.annotation.InteractionScope;
-import org.apache.causeway.applib.annotation.PriorityPrecedence;
-import org.apache.causeway.applib.services.acceptheader.AcceptHeaderService;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.viewer.restfulobjects.applib.CausewayModuleViewerRestfulObjectsApplib;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
+import java.io.IOException;
+import java.util.List;
+import java.util.stream.Collectors;
import javax.inject.Named;
import javax.ws.rs.container.ContainerRequestContext;
@@ -36,9 +29,18 @@ import javax.ws.rs.container.ContainerResponseContext;
import javax.ws.rs.container.ContainerResponseFilter;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.ext.Provider;
-import java.io.IOException;
-import java.util.List;
-import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+
+import org.apache.causeway.applib.annotation.InteractionScope;
+import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.applib.services.acceptheader.AcceptHeaderService;
+import org.apache.causeway.commons.internal.base._NullSafe;
+import org.apache.causeway.viewer.restfulobjects.applib.CausewayModuleViewerRestfulObjectsApplib;
+
+import static org.apache.causeway.commons.internal.base._NullSafe.stream;
/**
* @since 1.x {@index}
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceAbstract.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceAbstract.java
index f98553dc86..8abc7bc1ad 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceAbstract.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceAbstract.java
@@ -28,7 +28,6 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.commons.internal.factory._InstanceUtil;
-
import org.apache.causeway.core.metamodel.interactions.managed.ManagedAction;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedCollection;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedProperty;
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
index de54bcc1f1..7060e3011b 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
@@ -30,12 +30,12 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.ResponseBuilder;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.domain.DomainObjectList;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedAction;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedCollection;
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheCausewayV2.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheCausewayV2.java
index 4322528a86..ec7b14abf1 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheCausewayV2.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheCausewayV2.java
@@ -28,13 +28,13 @@ import javax.ws.rs.core.Response;
import com.fasterxml.jackson.databind.node.POJONode;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.client.RepresentationTypeSimplifiedV2;
import org.apache.causeway.applib.client.SuppressionType;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.metamodel.consent.Consent;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedAction;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedCollection;
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceDefault.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceDefault.java
index 9cee38a2ba..67bd042087 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceDefault.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceDefault.java
@@ -22,7 +22,6 @@ import javax.annotation.Priority;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.causeway.commons.internal.base._Strings;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
@@ -30,6 +29,7 @@ import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.swagger.Format;
import org.apache.causeway.applib.services.swagger.SwaggerService;
import org.apache.causeway.applib.services.swagger.Visibility;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.config.RestEasyConfiguration;
import org.apache.causeway.core.config.viewer.web.WebAppContextPath;
import org.apache.causeway.viewer.restfulobjects.applib.CausewayModuleViewerRestfulObjectsApplib;
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceMenu.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceMenu.java
index c9b14feea2..4455f66605 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceMenu.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceMenu.java
@@ -23,8 +23,6 @@ import java.util.Optional;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.causeway.commons.internal.base._Strings;
-
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
@@ -42,6 +40,7 @@ import org.apache.causeway.applib.services.swagger.SwaggerService;
import org.apache.causeway.applib.services.swagger.Visibility;
import org.apache.causeway.applib.value.Clob;
import org.apache.causeway.applib.value.LocalResourcePath;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.config.RestEasyConfiguration;
import org.apache.causeway.viewer.restfulobjects.rendering.CausewayModuleRestfulObjectsRendering;
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluderAbstract.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluderAbstract.java
index 3c1d3a7d2e..433da6cf93 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluderAbstract.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluderAbstract.java
@@ -21,7 +21,6 @@ package org.apache.causeway.viewer.restfulobjects.rendering.service.swagger.inte
import java.util.Set;
import org.apache.causeway.commons.internal.collections._Sets;
-
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluderDefault.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluderDefault.java
index 07026513b1..4620d44d21 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluderDefault.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluderDefault.java
@@ -20,9 +20,10 @@ package org.apache.causeway.viewer.restfulobjects.rendering.service.swagger.inte
import javax.inject.Named;
-import org.apache.causeway.viewer.restfulobjects.applib.CausewayModuleViewerRestfulObjectsApplib;
import org.springframework.stereotype.Component;
+import org.apache.causeway.viewer.restfulobjects.applib.CausewayModuleViewerRestfulObjectsApplib;
+
@Component
@Named(CausewayModuleViewerRestfulObjectsApplib.NAMESPACE + ".ClassExcluderDefault")
public class ClassExcluderDefault extends ClassExcluderAbstract {
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/Generation.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/Generation.java
index 7bc5f709cc..338f5cf9ed 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/Generation.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/Generation.java
@@ -29,11 +29,10 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.collections._Sets;
-
import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.services.swagger.Visibility;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.collections._Sets;
import org.apache.causeway.core.metamodel.facets.object.domainservice.DomainServiceFacet;
import org.apache.causeway.core.metamodel.services.ServiceUtil;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
@@ -45,8 +44,6 @@ 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.models.Info;
import io.swagger.models.ModelImpl;
import io.swagger.models.Operation;
@@ -62,6 +59,7 @@ import io.swagger.models.properties.ObjectProperty;
import io.swagger.models.properties.Property;
import io.swagger.models.properties.RefProperty;
import io.swagger.models.properties.StringProperty;
+import lombok.val;
class Generation {
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 53d1cfb219..3844be0f8e 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,11 +25,11 @@ import java.util.stream.Stream;
import javax.inject.Named;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.viewer.restfulobjects.applib.CausewayModuleViewerRestfulObjectsApplib;
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;
@Component
@Named(CausewayModuleViewerRestfulObjectsApplib.NAMESPACE + ".TaggerDefault")
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyFactoryDefault.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyFactoryDefault.java
index 9e7dfb016e..381d0622f9 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyFactoryDefault.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyFactoryDefault.java
@@ -28,17 +28,18 @@ import java.util.function.Supplier;
import javax.inject.Named;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.commons.internal.collections._Maps;
-import org.apache.causeway.viewer.restfulobjects.applib.CausewayModuleViewerRestfulObjectsApplib;
-import org.apache.causeway.viewer.restfulobjects.rendering.service.swagger.internal.ValuePropertyPlugin.ValuePropertyCollector;
import org.joda.time.DateTime;
import org.joda.time.LocalDate;
import org.joda.time.LocalDateTime;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import org.apache.causeway.commons.internal.base._NullSafe;
+import org.apache.causeway.commons.internal.collections._Lists;
+import org.apache.causeway.commons.internal.collections._Maps;
+import org.apache.causeway.viewer.restfulobjects.applib.CausewayModuleViewerRestfulObjectsApplib;
+import org.apache.causeway.viewer.restfulobjects.rendering.service.swagger.internal.ValuePropertyPlugin.ValuePropertyCollector;
+
import io.swagger.models.properties.BooleanProperty;
import io.swagger.models.properties.ByteArrayProperty;
import io.swagger.models.properties.DateProperty;
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyPlugin.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyPlugin.java
index 114697cdd7..00200428c4 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyPlugin.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyPlugin.java
@@ -22,9 +22,10 @@ import java.util.Map;
import java.util.Objects;
import java.util.function.BiConsumer;
+import org.springframework.stereotype.Component;
+
import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.viewer.restfulobjects.rendering.service.swagger.internal.ValuePropertyFactoryDefault.Factory;
-import org.springframework.stereotype.Component;
/**
* Not used by the framework yet, supposed to be reconsidered in the process of
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/_Util.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/_Util.java
index 5957db2990..e8ab769be5 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/_Util.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/_Util.java
@@ -23,12 +23,11 @@ import java.util.List;
import java.util.function.Predicate;
import java.util.stream.Collectors;
+import org.apache.causeway.applib.services.swagger.Visibility;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.collections.ImmutableEnumSet;
import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
-
-import org.apache.causeway.applib.services.swagger.Visibility;
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;
@@ -38,11 +37,10 @@ import org.apache.causeway.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.causeway.core.metamodel.util.Facets;
+import io.swagger.models.Response;
import lombok.val;
import lombok.experimental.UtilityClass;
-import io.swagger.models.Response;
-
@UtilityClass
final class _Util {
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/valuerender/JsonValueConverter.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/valuerender/JsonValueConverter.java
index 9aaa172af7..a2d44b494e 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/valuerender/JsonValueConverter.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/valuerender/JsonValueConverter.java
@@ -23,10 +23,10 @@ import java.util.OptionalInt;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.NullNode;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.ManagedObjects;
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/valuerender/JsonValueEncoderServiceDefault.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/valuerender/JsonValueEncoderServiceDefault.java
index daa6d4f050..432bf86479 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/valuerender/JsonValueEncoderServiceDefault.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/valuerender/JsonValueEncoderServiceDefault.java
@@ -27,10 +27,6 @@ import javax.annotation.Priority;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.causeway.commons.functional.Try;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.collections._Maps;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.lang.Nullable;
import org.springframework.stereotype.Service;
@@ -38,6 +34,10 @@ import org.springframework.util.ClassUtils;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.value.semantics.ValueDecomposition;
+import org.apache.causeway.commons.functional.Try;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.commons.internal.collections._Maps;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.metamodel.facets.object.value.ValueSerializer;
import org.apache.causeway.core.metamodel.facets.object.value.ValueSerializer.Format;
import org.apache.causeway.core.metamodel.object.ManagedObject;
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/valuerender/_JsonValueConverters.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/valuerender/_JsonValueConverters.java
index b4f008a4b4..ff289d9062 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/valuerender/_JsonValueConverters.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/valuerender/_JsonValueConverters.java
@@ -23,7 +23,6 @@ import java.math.BigInteger;
import java.util.Arrays;
import java.util.List;
-import org.apache.causeway.commons.internal.collections._Lists;
import org.joda.time.DateTime;
import org.joda.time.LocalDate;
import org.joda.time.LocalDateTime;
@@ -31,6 +30,7 @@ import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
import org.joda.time.format.ISODateTimeFormat;
+import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
diff --git a/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/LinkFollowSpecsTest_follow.java b/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/LinkFollowSpecsTest_follow.java
index cac915fc1f..b1b2b04c92 100644
--- a/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/LinkFollowSpecsTest_follow.java
+++ b/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/LinkFollowSpecsTest_follow.java
@@ -20,14 +20,14 @@ package org.apache.causeway.viewer.restfulobjects.rendering;
import java.util.List;
-import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
-import org.apache.causeway.viewer.restfulobjects.applib.util.Parser;
-import org.apache.causeway.viewer.restfulobjects.rendering.LinkFollowSpecs;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
+import org.apache.causeway.viewer.restfulobjects.applib.util.Parser;
+
public class LinkFollowSpecsTest_follow {
@Test
diff --git a/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest.java b/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest.java
index 1af661e7b3..5d60a0bf96 100644
--- a/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest.java
+++ b/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest.java
@@ -29,7 +29,6 @@ import com.fasterxml.jackson.databind.node.IntNode;
import com.fasterxml.jackson.databind.node.LongNode;
import com.fasterxml.jackson.databind.node.TextNode;
-import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -42,6 +41,8 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
+
import lombok.val;
class JsonValueEncoderTest
diff --git a/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/GenerationTest.java b/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/GenerationTest.java
index d3d7a63768..a7c5f79722 100644
--- a/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/GenerationTest.java
+++ b/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/GenerationTest.java
@@ -20,15 +20,11 @@ package org.apache.causeway.viewer.restfulobjects.rendering.service.swagger.inte
import java.util.Set;
-import org.apache.causeway.viewer.restfulobjects.rendering.service.swagger.internal.ClassExcluderDefault;
-import org.apache.causeway.viewer.restfulobjects.rendering.service.swagger.internal.Generation;
-import org.apache.causeway.viewer.restfulobjects.rendering.service.swagger.internal.TaggerDefault;
-import org.apache.causeway.viewer.restfulobjects.rendering.service.swagger.internal.ValuePropertyFactoryDefault;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.Matchers.contains;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
public class GenerationTest {
diff --git a/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/TaggerTest.java b/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/TaggerTest.java
index 51c2335ac8..12ace00443 100644
--- a/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/TaggerTest.java
+++ b/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/TaggerTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.causeway.viewer.restfulobjects.rendering.service.swagger.internal;
-import org.apache.causeway.viewer.restfulobjects.rendering.service.swagger.internal.TaggerDefault;
import org.junit.Before;
import org.junit.Test;
diff --git a/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/util/MapUtilsTest.java b/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/util/MapUtilsTest.java
index 0dc9f8739a..d5cb366ad2 100644
--- a/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/util/MapUtilsTest.java
+++ b/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/util/MapUtilsTest.java
@@ -20,7 +20,6 @@ package org.apache.causeway.viewer.restfulobjects.rendering.util;
import java.util.Map;
-import org.apache.causeway.viewer.restfulobjects.rendering.util.MapUtils;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
diff --git a/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/Parser_forCacheControl_ContractTest.java b/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/Parser_forCacheControl_ContractTest.java
index 59740598d6..3c52f4225b 100644
--- a/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/Parser_forCacheControl_ContractTest.java
+++ b/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/Parser_forCacheControl_ContractTest.java
@@ -20,13 +20,14 @@ package org.apache.causeway.viewer.restfulobjects.testing;
import javax.ws.rs.core.CacheControl;
-import org.apache.causeway.viewer.restfulobjects.applib.util.Parser;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.apache.causeway.viewer.restfulobjects.applib.util.Parser;
+
public abstract class Parser_forCacheControl_ContractTest {
diff --git a/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/Parser_forJaxRsMediaType_ContractTest.java b/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/Parser_forJaxRsMediaType_ContractTest.java
index 431aac2430..64558c00cf 100644
--- a/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/Parser_forJaxRsMediaType_ContractTest.java
+++ b/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/Parser_forJaxRsMediaType_ContractTest.java
@@ -18,15 +18,16 @@
*/
package org.apache.causeway.viewer.restfulobjects.testing;
-import org.apache.causeway.viewer.restfulobjects.applib.RestfulMediaType;
-import org.apache.causeway.viewer.restfulobjects.applib.util.MediaTypes;
-import org.apache.causeway.viewer.restfulobjects.applib.util.Parser;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.apache.causeway.viewer.restfulobjects.applib.RestfulMediaType;
+import org.apache.causeway.viewer.restfulobjects.applib.util.MediaTypes;
+import org.apache.causeway.viewer.restfulobjects.applib.util.Parser;
+
public abstract class Parser_forJaxRsMediaType_ContractTest {
@Test
diff --git a/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/RepresentationTypeTest_getMediaType_ContractTest.java b/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/RepresentationTypeTest_getMediaType_ContractTest.java
index c37c713125..66993c2239 100644
--- a/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/RepresentationTypeTest_getMediaType_ContractTest.java
+++ b/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/RepresentationTypeTest_getMediaType_ContractTest.java
@@ -18,13 +18,14 @@
*/
package org.apache.causeway.viewer.restfulobjects.testing;
-import org.apache.causeway.viewer.restfulobjects.applib.RepresentationType;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.apache.causeway.viewer.restfulobjects.applib.RepresentationType;
+
/**
* contract test.
*/
diff --git a/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/RepresentationTypeTest_getName_ContractTest.java b/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/RepresentationTypeTest_getName_ContractTest.java
index 1ff126e643..313ddb4aca 100644
--- a/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/RepresentationTypeTest_getName_ContractTest.java
+++ b/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/RepresentationTypeTest_getName_ContractTest.java
@@ -18,12 +18,13 @@
*/
package org.apache.causeway.viewer.restfulobjects.testing;
-import org.apache.causeway.viewer.restfulobjects.applib.RepresentationType;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.apache.causeway.viewer.restfulobjects.applib.RepresentationType;
+
/**
* contract test.
*/
diff --git a/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/RepresentationTypeTest_lookup_ContractTest.java b/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/RepresentationTypeTest_lookup_ContractTest.java
index 13377bfefa..16141f369d 100644
--- a/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/RepresentationTypeTest_lookup_ContractTest.java
+++ b/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/RepresentationTypeTest_lookup_ContractTest.java
@@ -20,12 +20,13 @@ package org.apache.causeway.viewer.restfulobjects.testing;
import javax.ws.rs.core.MediaType;
-import org.apache.causeway.viewer.restfulobjects.applib.RepresentationType;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertSame;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertSame;
+
+import org.apache.causeway.viewer.restfulobjects.applib.RepresentationType;
/**
diff --git a/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/RepresentationTypeTest_parser_ContractTest.java b/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/RepresentationTypeTest_parser_ContractTest.java
index d17438d51b..ddf159688a 100644
--- a/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/RepresentationTypeTest_parser_ContractTest.java
+++ b/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/RepresentationTypeTest_parser_ContractTest.java
@@ -18,12 +18,13 @@
*/
package org.apache.causeway.viewer.restfulobjects.testing;
-import org.apache.causeway.viewer.restfulobjects.applib.RepresentationType;
-import org.apache.causeway.viewer.restfulobjects.applib.util.Parser;
import org.junit.Test;
import static org.junit.Assert.assertSame;
+import org.apache.causeway.viewer.restfulobjects.applib.RepresentationType;
+import org.apache.causeway.viewer.restfulobjects.applib.util.Parser;
+
/**
* contract test.
*/
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 54e84824ca..32b3dec037 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
@@ -33,6 +33,9 @@ import org.junit.Rule;
import org.junit.Test;
import org.springframework.web.context.WebApplicationContext;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import org.apache.causeway.applib.services.iactn.Interaction;
import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker;
@@ -49,9 +52,6 @@ import org.apache.causeway.viewer.restfulobjects.rendering.RestfulObjectsApplica
import org.apache.causeway.viewer.restfulobjects.viewer.context.ResourceContext;
import org.apache.causeway.viewer.restfulobjects.viewer.resources.ResourceDescriptor;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
import lombok.val;
public abstract class ResourceContext_ensureCompatibleAcceptHeader_ContractTest {
diff --git a/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/RestfulObjectsApplicationExceptionMapper_Test_Contract.java b/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/RestfulObjectsApplicationExceptionMapper_Test_Contract.java
index 25b242db4d..f3fea7d7dd 100644
--- a/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/RestfulObjectsApplicationExceptionMapper_Test_Contract.java
+++ b/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/RestfulObjectsApplicationExceptionMapper_Test_Contract.java
@@ -21,11 +21,6 @@ package org.apache.causeway.viewer.restfulobjects.testing;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
-import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
-import org.apache.causeway.viewer.restfulobjects.applib.RestfulResponse.HttpStatusCode;
-import org.apache.causeway.viewer.restfulobjects.applib.util.JsonMapper;
-import org.apache.causeway.viewer.restfulobjects.rendering.RestfulObjectsApplicationException;
-import org.apache.causeway.viewer.restfulobjects.viewer.mappers.ExceptionMapperForRestfulObjectsApplication;
import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
@@ -37,6 +32,11 @@ import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import org.apache.causeway.core.internaltestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
+import org.apache.causeway.viewer.restfulobjects.applib.RestfulResponse.HttpStatusCode;
+import org.apache.causeway.viewer.restfulobjects.applib.util.JsonMapper;
+import org.apache.causeway.viewer.restfulobjects.rendering.RestfulObjectsApplicationException;
+import org.apache.causeway.viewer.restfulobjects.viewer.mappers.ExceptionMapperForRestfulObjectsApplication;
import lombok.val;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/CausewayModuleViewerRestfulObjectsViewer.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/CausewayModuleViewerRestfulObjectsViewer.java
index 8489bc3854..cec4ac8c0e 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/CausewayModuleViewerRestfulObjectsViewer.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/CausewayModuleViewerRestfulObjectsViewer.java
@@ -18,6 +18,9 @@
*/
package org.apache.causeway.viewer.restfulobjects.viewer;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
import org.apache.causeway.core.webapp.CausewayModuleCoreWebapp;
import org.apache.causeway.viewer.commons.services.CausewayModuleViewerCommonsServices;
import org.apache.causeway.viewer.restfulobjects.rendering.CausewayModuleRestfulObjectsRendering;
@@ -34,8 +37,6 @@ import org.apache.causeway.viewer.restfulobjects.viewer.resources.MenuBarsResour
import org.apache.causeway.viewer.restfulobjects.viewer.resources.SwaggerSpecResource;
import org.apache.causeway.viewer.restfulobjects.viewer.resources.UserResourceServerside;
import org.apache.causeway.viewer.restfulobjects.viewer.resources.VersionResourceServerside;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
/**
* @since 1.x {@index}
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/context/ResourceContext.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/context/ResourceContext.java
index fb610ec192..9ed35a1ee1 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/context/ResourceContext.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/context/ResourceContext.java
@@ -31,12 +31,11 @@ import javax.ws.rs.core.Request;
import javax.ws.rs.core.SecurityContext;
import javax.ws.rs.ext.Providers;
+import org.apache.causeway.applib.annotation.Where;
+import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.collections._Sets;
import org.apache.causeway.commons.internal.primitives._Ints;
-
-import org.apache.causeway.applib.annotation.Where;
-import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.object.ManagedObject;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/mappers/ExceptionMapperAbstract.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/mappers/ExceptionMapperAbstract.java
index 606c582b94..2c81805070 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/mappers/ExceptionMapperAbstract.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/mappers/ExceptionMapperAbstract.java
@@ -28,6 +28,10 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.ResponseBuilder;
import javax.ws.rs.ext.ExceptionMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.apache.causeway.applib.exceptions.RecoverableException;
+import org.apache.causeway.applib.services.exceprecog.RootCauseFinder;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.causeway.viewer.restfulobjects.applib.RepresentationType;
@@ -37,13 +41,9 @@ import org.apache.causeway.viewer.restfulobjects.rendering.ExceptionWithHttpStat
import org.apache.causeway.viewer.restfulobjects.viewer.mappers.entity.ExceptionDetail;
import org.apache.causeway.viewer.restfulobjects.viewer.mappers.entity.ExceptionPojo;
import org.apache.causeway.viewer.restfulobjects.viewer.resources.serialization.SerializationStrategy;
-import org.springframework.beans.factory.annotation.Autowired;
import static org.apache.causeway.commons.internal.base._NullSafe.stream;
-import org.apache.causeway.applib.exceptions.RecoverableException;
-import org.apache.causeway.applib.services.exceprecog.RootCauseFinder;
-
public abstract class ExceptionMapperAbstract<T extends Throwable> implements ExceptionMapper<T> {
@Context protected HttpHeaders httpHeaders;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/mappers/FailureUtil.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/mappers/FailureUtil.java
index 4beeb7fbe5..1dac393288 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/mappers/FailureUtil.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/mappers/FailureUtil.java
@@ -23,7 +23,6 @@ import java.util.Optional;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.functional.Try;
import org.apache.causeway.commons.internal.reflection._Reflect;
-
import org.apache.causeway.core.metamodel.methods.MethodFinder;
import org.apache.causeway.viewer.restfulobjects.applib.RestfulResponse;
import org.apache.causeway.viewer.restfulobjects.applib.RestfulResponse.HttpStatusCode;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/mappers/entity/ExceptionDetail.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/mappers/entity/ExceptionDetail.java
index 31ec355a34..2806a33dd5 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/mappers/entity/ExceptionDetail.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/mappers/entity/ExceptionDetail.java
@@ -28,11 +28,11 @@ import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.services.exceprecog.RootCauseFinder;
+import org.apache.causeway.commons.internal.collections._Lists;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import lombok.Getter;
import lombok.NoArgsConstructor;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java
index b3817a23cd..c97789e2b1 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java
@@ -35,7 +35,6 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.apache.causeway.commons.internal.codec._UrlDecoderUtil;
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.Where;
@@ -46,6 +45,7 @@ import org.apache.causeway.applib.layout.component.PropertyLayoutData;
import org.apache.causeway.applib.layout.grid.Grid;
import org.apache.causeway.applib.layout.links.Link;
import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker;
+import org.apache.causeway.commons.internal.codec._UrlDecoderUtil;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.consent.Consent;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java
index 677b32f7e5..857f250e1a 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java
@@ -35,11 +35,11 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.apache.causeway.commons.internal.codec._UrlDecoderUtil;
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker;
+import org.apache.causeway.commons.internal.codec._UrlDecoderUtil;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facets.object.domainservice.DomainServiceFacet;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java
index 82aa73aefc..658a2f80c3 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java
@@ -29,11 +29,11 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.apache.causeway.commons.internal.base._Strings;
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.spec.feature.ObjectActionParameter;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ImageResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ImageResourceServerside.java
index 49a1ed61a3..97006c02bf 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ImageResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ImageResourceServerside.java
@@ -27,11 +27,11 @@ import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.Response;
-import org.apache.causeway.commons.internal.base._Bytes;
-import org.apache.causeway.commons.internal.resources._Resources;
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker;
+import org.apache.causeway.commons.internal.base._Bytes;
+import org.apache.causeway.commons.internal.resources._Resources;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ObjectActionArgHelper.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ObjectActionArgHelper.java
index 6ebf5b1901..aa10b96e68 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ObjectActionArgHelper.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ObjectActionArgHelper.java
@@ -26,7 +26,6 @@ import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.functional.Railway;
import org.apache.causeway.commons.functional.Try;
import org.apache.causeway.commons.internal.collections._Lists;
-
import org.apache.causeway.core.metamodel.interactions.managed.InteractionVeto;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ObjectAdapterAccessHelper.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ObjectAdapterAccessHelper.java
index 96ebbfc7db..01b22db439 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ObjectAdapterAccessHelper.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ObjectAdapterAccessHelper.java
@@ -20,13 +20,13 @@ package org.apache.causeway.viewer.restfulobjects.viewer.resources;
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.core.metamodel.interactions.managed.ActionInteraction;
+import org.apache.causeway.core.metamodel.interactions.managed.ActionInteraction.SemanticConstraint;
import org.apache.causeway.core.metamodel.interactions.managed.CollectionInteraction;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedAction;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedCollection;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedProperty;
-import org.apache.causeway.core.metamodel.interactions.managed.PropertyInteraction;
-import org.apache.causeway.core.metamodel.interactions.managed.ActionInteraction.SemanticConstraint;
import org.apache.causeway.core.metamodel.interactions.managed.MemberInteraction.AccessIntent;
+import org.apache.causeway.core.metamodel.interactions.managed.PropertyInteraction;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.viewer.restfulobjects.rendering.IResourceContext;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ObjectAdapterUpdateHelper.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ObjectAdapterUpdateHelper.java
index 8d4c19f685..0d788f92d1 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ObjectAdapterUpdateHelper.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ObjectAdapterUpdateHelper.java
@@ -19,7 +19,6 @@
package org.apache.causeway.viewer.restfulobjects.viewer.resources;
import org.apache.causeway.commons.internal.base._Refs;
-
import org.apache.causeway.core.metamodel.consent.Consent;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.object.ManagedObject;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ResourceAbstract.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
index 8fdb1cb5b4..99b59631e1 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
@@ -32,13 +32,12 @@ import javax.ws.rs.core.SecurityContext;
import javax.ws.rs.core.UriInfo;
import javax.ws.rs.ext.Providers;
-import org.apache.causeway.commons.internal.base._Refs;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.codec._UrlDecoderUtil;
-
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker;
+import org.apache.causeway.commons.internal.base._Refs;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.codec._UrlDecoderUtil;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.viewer.web.WebAppContextPath;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/_DomainResourceHelper.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/_DomainResourceHelper.java
index f89f1d5d3e..72d65cadd4 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/_DomainResourceHelper.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/_DomainResourceHelper.java
@@ -22,7 +22,6 @@ import java.util.concurrent.atomic.LongAdder;
import javax.ws.rs.core.Response;
-import org.apache.causeway.commons.functional.Railway;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.Identifier;
@@ -30,6 +29,7 @@ import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.id.LogicalType;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
import org.apache.causeway.applib.services.xactn.TransactionService;
+import org.apache.causeway.commons.functional.Railway;
import org.apache.causeway.core.metamodel.interactions.managed.ActionInteraction;
import org.apache.causeway.core.metamodel.interactions.managed.ActionInteraction.Result;
import org.apache.causeway.core.metamodel.interactions.managed.ActionInteraction.SemanticConstraint;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/_EndpointLogging.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/_EndpointLogging.java
index fb8f3e63da..73126c9505 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/_EndpointLogging.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/_EndpointLogging.java
@@ -20,11 +20,12 @@ package org.apache.causeway.viewer.restfulobjects.viewer.resources;
import javax.ws.rs.core.Response;
+import org.apache.logging.log4j.Logger;
+
import org.apache.causeway.commons.internal.collections._Collections;
import org.apache.causeway.commons.internal.resources._Xml;
import org.apache.causeway.commons.internal.resources._Xml.WriteOptions;
import org.apache.causeway.viewer.restfulobjects.rendering.RestfulObjectsApplicationException;
-import org.apache.logging.log4j.Logger;
import lombok.val;
import lombok.experimental.UtilityClass;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/CausewayRestfulObjectsInteractionFilter.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/CausewayRestfulObjectsInteractionFilter.java
index 5bce2b8d61..8f4c3c49aa 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/CausewayRestfulObjectsInteractionFilter.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/CausewayRestfulObjectsInteractionFilter.java
@@ -39,22 +39,21 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.transaction.TransactionalException;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
-import org.apache.causeway.commons.internal.factory._InstanceUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.xactn.TransactionService;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.collections._Lists;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
+import org.apache.causeway.commons.internal.factory._InstanceUtil;
import org.apache.causeway.core.metamodel.commons.StringExtensions;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
import org.apache.causeway.core.metamodel.specloader.validator.MetaModelInvalidException;
+import org.apache.causeway.core.webapp.modules.templresources.TemplateResourceCachingFilter;
import org.apache.causeway.viewer.restfulobjects.viewer.webmodule.auth.AuthenticationStrategy;
import org.apache.causeway.viewer.restfulobjects.viewer.webmodule.auth.AuthenticationStrategyDefault;
-import org.apache.causeway.core.webapp.modules.templresources.TemplateResourceCachingFilter;
-
import lombok.val;
/**
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationStrategyAbstract.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationStrategyAbstract.java
index 791aba634e..7d70298653 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationStrategyAbstract.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationStrategyAbstract.java
@@ -24,9 +24,9 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.springframework.web.context.support.WebApplicationContextUtils;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.security.authentication.manager.AuthenticationManager;
import lombok.val;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationStrategyBasicAuth.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationStrategyBasicAuth.java
index 3be8539f8e..ae1286984f 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationStrategyBasicAuth.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationStrategyBasicAuth.java
@@ -26,10 +26,9 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
+import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
import org.apache.causeway.commons.internal.base._Bytes;
import org.apache.causeway.commons.internal.base._Strings;
-
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
import org.apache.causeway.core.security.authentication.AuthenticationRequestPassword;
import lombok.val;
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 bcd6417bb4..2d90b5fb98 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
@@ -21,8 +21,6 @@ package org.apache.causeway.viewer.restfulobjects.viewer.context;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
-import org.apache.causeway.commons.internal.codec._UrlDecoderUtil;
-import org.apache.causeway.core.interaction.session.CausewayInteraction;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Before;
@@ -30,9 +28,13 @@ import org.junit.Rule;
import org.junit.Test;
import org.springframework.web.context.WebApplicationContext;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
-
+import org.apache.causeway.commons.internal.codec._UrlDecoderUtil;
+import org.apache.causeway.core.interaction.session.CausewayInteraction;
import org.apache.causeway.core.internaltestsupport.jmocking.JUnitRuleMockery2;
import org.apache.causeway.core.internaltestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.causeway.core.metamodel._testing.MetaModelContext_forTesting;
@@ -43,12 +45,8 @@ import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.causeway.viewer.restfulobjects.applib.RepresentationType;
import org.apache.causeway.viewer.restfulobjects.applib.RestfulRequest.RequestParameter;
import org.apache.causeway.viewer.restfulobjects.applib.util.UrlEncodingUtils;
-import org.apache.causeway.viewer.restfulobjects.viewer.context.ResourceContext;
import org.apache.causeway.viewer.restfulobjects.viewer.resources.ResourceDescriptor;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.MatcherAssert.assertThat;
-
public class ResourceContext_getArg_Test {
@Rule public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
diff --git a/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/context/ResourceContext_stripQuotes_Test.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/context/ResourceContext_stripQuotes_Test.java
index 1659fed243..59777a54b5 100644
--- a/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/context/ResourceContext_stripQuotes_Test.java
+++ b/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/context/ResourceContext_stripQuotes_Test.java
@@ -18,12 +18,11 @@
*/
package org.apache.causeway.viewer.restfulobjects.viewer.context;
-import org.apache.causeway.viewer.restfulobjects.viewer.context.ResourceContext;
import org.junit.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
public class ResourceContext_stripQuotes_Test {
diff --git a/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainResourceHelper_readBodyAsMap_Test.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainResourceHelper_readBodyAsMap_Test.java
index 18f88cb4a7..a204326035 100644
--- a/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainResourceHelper_readBodyAsMap_Test.java
+++ b/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainResourceHelper_readBodyAsMap_Test.java
@@ -18,13 +18,14 @@
*/
package org.apache.causeway.viewer.restfulobjects.viewer.resources;
-import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
-import org.apache.causeway.viewer.restfulobjects.rendering.RestfulObjectsApplicationException;
-import org.apache.causeway.viewer.restfulobjects.rendering.util.Util;
import org.hamcrest.CoreMatchers;
import org.junit.Assert;
import org.junit.Test;
+import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
+import org.apache.causeway.viewer.restfulobjects.rendering.RestfulObjectsApplicationException;
+import org.apache.causeway.viewer.restfulobjects.rendering.util.Util;
+
public class DomainResourceHelper_readBodyAsMap_Test {
private JsonRepresentation representation;
diff --git a/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/JsonParserHelper_Test.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/JsonParserHelper_Test.java
index 10803d7708..7b521b3ccf 100644
--- a/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/JsonParserHelper_Test.java
+++ b/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/JsonParserHelper_Test.java
@@ -18,11 +18,11 @@
*/
package org.apache.causeway.viewer.restfulobjects.viewer.resources;
-import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
-import org.apache.causeway.viewer.restfulobjects.viewer.resources.JsonParserHelper;
import org.junit.Assert;
import org.junit.Test;
+import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
+
public class JsonParserHelper_Test {
@Test
diff --git a/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/util/UrlParserUtils_Test.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/util/UrlParserUtils_Test.java
index 7c61dbec7f..95c586fbb7 100644
--- a/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/util/UrlParserUtils_Test.java
+++ b/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/util/UrlParserUtils_Test.java
@@ -18,12 +18,12 @@
*/
package org.apache.causeway.viewer.restfulobjects.viewer.util;
-import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
-import org.apache.causeway.viewer.restfulobjects.viewer.util.UrlParserUtils;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
+import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
+
public class UrlParserUtils_Test {
@Test
diff --git a/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/CausewayRestfulObjectsSessionFilter_lookupPassThru_Test.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/CausewayRestfulObjectsSessionFilter_lookupPassThru_Test.java
index 14f9fe14ff..0382169f1f 100644
--- a/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/CausewayRestfulObjectsSessionFilter_lookupPassThru_Test.java
+++ b/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/CausewayRestfulObjectsSessionFilter_lookupPassThru_Test.java
@@ -22,7 +22,6 @@ import java.util.List;
import javax.servlet.FilterConfig;
-import org.apache.causeway.viewer.restfulobjects.viewer.webmodule.CausewayRestfulObjectsInteractionFilter;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Assert;
diff --git a/viewers/wicket/applib/src/main/java/org/apache/causeway/viewer/wicket/applib/CausewayModuleViewerWicketApplibMixins.java b/viewers/wicket/applib/src/main/java/org/apache/causeway/viewer/wicket/applib/CausewayModuleViewerWicketApplibMixins.java
index 96666129de..4e0a6b21d9 100644
--- a/viewers/wicket/applib/src/main/java/org/apache/causeway/viewer/wicket/applib/CausewayModuleViewerWicketApplibMixins.java
+++ b/viewers/wicket/applib/src/main/java/org/apache/causeway/viewer/wicket/applib/CausewayModuleViewerWicketApplibMixins.java
@@ -18,10 +18,11 @@
*/
package org.apache.causeway.viewer.wicket.applib;
-import org.apache.causeway.viewer.wicket.applib.mixins.Object_clearHints;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.viewer.wicket.applib.mixins.Object_clearHints;
+
/**
* @since 1.x {@index}
*/
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/links/LinkAndLabel.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/links/LinkAndLabel.java
index 10be593b69..b954527654 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/links/LinkAndLabel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/links/LinkAndLabel.java
@@ -22,17 +22,16 @@ import java.io.Serializable;
import java.util.Optional;
import java.util.function.Predicate;
-import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.causeway.applib.annotation.ActionLayout.Position;
+import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedAction;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
-import org.apache.causeway.viewer.wicket.model.models.ActionModel;
-
import org.apache.causeway.viewer.commons.model.action.HasManagedAction;
import org.apache.causeway.viewer.commons.model.mixin.HasUiComponent;
+import org.apache.causeway.viewer.wicket.model.models.ActionModel;
import lombok.AccessLevel;
import lombok.Getter;
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/links/LinksProvider.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/links/LinksProvider.java
index 839f76404d..49f59bdd35 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/links/LinksProvider.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/links/LinksProvider.java
@@ -18,9 +18,10 @@
*/
package org.apache.causeway.viewer.wicket.model.links;
+import org.apache.wicket.markup.html.link.Link;
+
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel;
-import org.apache.wicket.markup.html.link.Link;
/**
* For models - such as {@link EntityCollectionModel} - that can provide an
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/links/ListOfLinksModel.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/links/ListOfLinksModel.java
index 30254c30be..fbcb3ad404 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/links/ListOfLinksModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/links/ListOfLinksModel.java
@@ -20,9 +20,10 @@ package org.apache.causeway.viewer.wicket.model.links;
import java.util.List;
-import org.apache.causeway.commons.collections.Can;
import org.apache.wicket.model.ChainingModel;
+import org.apache.causeway.commons.collections.Can;
+
import lombok.NonNull;
import lombok.val;
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/mementos/PageParameterNames.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/mementos/PageParameterNames.java
index 30dbdb5220..96eb053a8a 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/mementos/PageParameterNames.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/mementos/PageParameterNames.java
@@ -20,11 +20,11 @@ package org.apache.causeway.viewer.wicket.model.mementos;
import java.util.List;
-import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.string.StringValue;
import org.apache.causeway.applib.services.bookmark.Bookmark;
+import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.core.metamodel.commons.StringExtensions;
public enum PageParameterNames {
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ActionModel.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ActionModel.java
index 24a8512368..bde90e3193 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ActionModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ActionModel.java
@@ -18,10 +18,10 @@
*/
package org.apache.causeway.viewer.wicket.model.models;
-import org.apache.causeway.commons.collections.Can;
import org.apache.wicket.model.IModel;
import org.apache.causeway.applib.annotation.PromptStyle;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.interactions.managed.ActionInteractionHead;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.viewer.commons.model.action.UiActionForm;
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ActionModelImpl.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ActionModelImpl.java
index 5849c2bc65..60ae4ab273 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ActionModelImpl.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ActionModelImpl.java
@@ -21,12 +21,12 @@ package org.apache.causeway.viewer.wicket.model.models;
import java.util.Optional;
import java.util.stream.Stream;
-import org.apache.causeway.commons.collections.Can;
import org.apache.wicket.model.ChainingModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.annotation.Where;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.interactions.managed.ActionInteraction;
import org.apache.causeway.core.metamodel.interactions.managed.ActionInteractionHead;
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/BookmarkTreeNode.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/BookmarkTreeNode.java
index 27338edc42..b0de7ac283 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/BookmarkTreeNode.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/BookmarkTreeNode.java
@@ -22,13 +22,13 @@ import java.io.Serializable;
import java.util.List;
import java.util.Objects;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.base._Refs;
-import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.services.bookmark.Bookmark;
+import org.apache.causeway.commons.internal.base._NullSafe;
+import org.apache.causeway.commons.internal.base._Refs;
+import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.object.ManagedObjects;
import org.apache.causeway.core.metamodel.spec.feature.MixedIn;
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/BookmarkedPagesModel.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/BookmarkedPagesModel.java
index 52d1ffcec7..722a5929a0 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/BookmarkedPagesModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/BookmarkedPagesModel.java
@@ -23,9 +23,9 @@ import java.util.Iterator;
import java.util.List;
import java.util.Objects;
-import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import lombok.val;
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ChainingObjectModel.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ChainingObjectModel.java
index 7bd76f5b77..f6a631b039 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ChainingObjectModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ChainingObjectModel.java
@@ -18,9 +18,9 @@
*/
package org.apache.causeway.viewer.wicket.model.models;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.wicket.model.ChainingModel;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.metamodel.commons.ScalarRepresentation;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.object.ManagedObject;
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 102d7b243e..a14f77bffb 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
@@ -28,9 +28,8 @@ import org.apache.causeway.core.metamodel.interactions.managed.nonscalar.DataTab
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.spec.feature.ObjectMember;
-import org.apache.causeway.viewer.wicket.model.links.LinksProvider;
-
import org.apache.causeway.viewer.commons.model.hints.RenderingHint;
+import org.apache.causeway.viewer.wicket.model.links.LinksProvider;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/EntityCollectionModelAbstract.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/EntityCollectionModelAbstract.java
index 17d2c33ccf..a9eb474f32 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/EntityCollectionModelAbstract.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/EntityCollectionModelAbstract.java
@@ -20,6 +20,8 @@ package org.apache.causeway.viewer.wicket.model.models;
import java.util.List;
+import org.apache.wicket.model.ChainingModel;
+
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.collections._Lists;
@@ -29,7 +31,6 @@ import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.spec.feature.ObjectMember;
import org.apache.causeway.viewer.wicket.model.links.LinkAndLabel;
import org.apache.causeway.viewer.wicket.model.models.interaction.coll.DataTableModelWkt;
-import org.apache.wicket.model.ChainingModel;
import lombok.NonNull;
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/EntityCollectionModelParented.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/EntityCollectionModelParented.java
index 90f05b8305..f3bf57eeca 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/EntityCollectionModelParented.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/EntityCollectionModelParented.java
@@ -20,11 +20,11 @@ package org.apache.causeway.viewer.wicket.model.models;
import java.util.Optional;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.wicket.Component;
import org.apache.causeway.applib.layout.component.CollectionLayoutData;
import org.apache.causeway.applib.services.bookmark.Bookmark;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.causeway.viewer.wicket.model.hints.UiHintContainer;
import org.apache.causeway.viewer.wicket.model.models.interaction.coll.DataTableModelWkt;
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/EntityCollectionModelStandalone.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/EntityCollectionModelStandalone.java
index 68c8801c19..27afcdd287 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/EntityCollectionModelStandalone.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/EntityCollectionModelStandalone.java
@@ -19,7 +19,6 @@
package org.apache.causeway.viewer.wicket.model.models;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.PackedManagedObject;
import org.apache.causeway.viewer.wicket.model.models.interaction.BookmarkedObjectWkt;
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/InlinePromptContext.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/InlinePromptContext.java
index 3a154ca28a..5dc2828a8c 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/InlinePromptContext.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/InlinePromptContext.java
@@ -20,12 +20,13 @@ package org.apache.causeway.viewer.wicket.model.models;
import java.io.Serializable;
-import org.apache.causeway.commons.functional.Either;
-import org.apache.causeway.commons.internal.functions._Functions;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.causeway.commons.functional.Either;
+import org.apache.causeway.commons.internal.functions._Functions;
+
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ObjectAdapterModel.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ObjectAdapterModel.java
index ddfb26213b..c9110afb12 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ObjectAdapterModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ObjectAdapterModel.java
@@ -23,10 +23,9 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
-import org.apache.causeway.viewer.wicket.model.util.PageParameterUtils;
-
import org.apache.causeway.viewer.commons.model.hints.HasRenderingHints;
import org.apache.causeway.viewer.commons.model.hints.RenderingHint;
+import org.apache.causeway.viewer.wicket.model.util.PageParameterUtils;
public interface ObjectAdapterModel
extends
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 1954784ac4..04077dee0c 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
@@ -18,10 +18,10 @@
*/
package org.apache.causeway.viewer.wicket.model.models;
-import org.apache.causeway.commons.internal.base._Casts;
import org.apache.wicket.model.ChainingModel;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.ManagedObjects;
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 362719a7e1..0b0795d4f3 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
@@ -22,28 +22,27 @@ import java.util.List;
import java.util.Optional;
import java.util.OptionalInt;
+import org.apache.wicket.model.ChainingModel;
+import org.apache.wicket.model.IModel;
+
+import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.functional.Either;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.commons.internal.debug._Debug;
import org.apache.causeway.commons.internal.debug.xray.XrayUi;
-import org.apache.wicket.model.ChainingModel;
-import org.apache.wicket.model.IModel;
-
-import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.core.metamodel.commons.ScalarRepresentation;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedValue;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.ManagedObjects;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
import org.apache.causeway.core.metamodel.util.Facets;
-import org.apache.causeway.viewer.wicket.model.links.LinkAndLabel;
-import org.apache.causeway.viewer.wicket.model.links.LinksProvider;
-
import org.apache.causeway.viewer.commons.model.hints.HasRenderingHints;
import org.apache.causeway.viewer.commons.model.hints.RenderingHint;
import org.apache.causeway.viewer.commons.model.scalar.UiScalar;
+import org.apache.causeway.viewer.wicket.model.links.LinkAndLabel;
+import org.apache.causeway.viewer.wicket.model.links.LinksProvider;
import lombok.Getter;
import lombok.NonNull;
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarParameterModel.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarParameterModel.java
index 1e96419566..1cc6d5b516 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarParameterModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarParameterModel.java
@@ -19,15 +19,13 @@
package org.apache.causeway.viewer.wicket.model.models;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.interactions.managed.ManagedValue;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.spec.ActionScope;
import org.apache.causeway.core.metamodel.spec.feature.MixedIn;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
-import org.apache.causeway.viewer.wicket.model.models.interaction.act.UiParameterWkt;
-
import org.apache.causeway.viewer.commons.model.scalar.HasUiParameter;
+import org.apache.causeway.viewer.wicket.model.models.interaction.act.UiParameterWkt;
import lombok.Getter;
import lombok.NonNull;
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarPropertyModel.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarPropertyModel.java
index 2c3630ce65..f76392dcc0 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarPropertyModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarPropertyModel.java
@@ -19,16 +19,14 @@
package org.apache.causeway.viewer.wicket.model.models;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.commons.ScalarRepresentation;
import org.apache.causeway.core.metamodel.interactions.managed.InteractionVeto;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedValue;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
-import org.apache.causeway.viewer.wicket.model.models.interaction.prop.UiPropertyWkt;
-
import org.apache.causeway.viewer.commons.model.hints.RenderingHint;
import org.apache.causeway.viewer.commons.model.scalar.HasUiProperty;
+import org.apache.causeway.viewer.wicket.model.models.interaction.prop.UiPropertyWkt;
import lombok.Getter;
import lombok.val;
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 af6f648186..8618017f29 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
@@ -18,11 +18,11 @@
*/
package org.apache.causeway.viewer.wicket.model.models;
-import org.apache.causeway.commons.internal.assertions._Assert;
-import org.apache.causeway.commons.internal.base._Casts;
import org.apache.wicket.model.ChainingModel;
import org.springframework.util.ClassUtils;
+import org.apache.causeway.commons.internal.assertions._Assert;
+import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.MmUnwrapUtil;
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 a4fe39af3a..74f9a1ad94 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
@@ -21,8 +21,6 @@ package org.apache.causeway.viewer.wicket.model.models;
import java.util.Map;
import java.util.Objects;
-import org.apache.causeway.commons.internal.assertions._Assert;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.wicket.Component;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.springframework.lang.Nullable;
@@ -30,11 +28,15 @@ import org.springframework.lang.Nullable;
import org.apache.causeway.applib.layout.component.CollectionLayoutData;
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.hint.HintStore;
+import org.apache.causeway.commons.internal.assertions._Assert;
+import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.core.metamodel.commons.ScalarRepresentation;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.causeway.core.metamodel.spec.feature.memento.PropertyMemento;
+import org.apache.causeway.viewer.commons.model.hints.RenderingHint;
+import org.apache.causeway.viewer.commons.model.object.UiObject;
import org.apache.causeway.viewer.wicket.model.hints.UiHintContainer;
import org.apache.causeway.viewer.wicket.model.models.interaction.BookmarkedObjectWkt;
import org.apache.causeway.viewer.wicket.model.models.interaction.HasBookmarkedOwnerAbstract;
@@ -42,9 +44,6 @@ import org.apache.causeway.viewer.wicket.model.models.interaction.prop.PropertyI
import org.apache.causeway.viewer.wicket.model.util.ComponentHintKey;
import org.apache.causeway.viewer.wicket.model.util.PageParameterUtils;
-import org.apache.causeway.viewer.commons.model.hints.RenderingHint;
-import org.apache.causeway.viewer.commons.model.object.UiObject;
-
import lombok.Getter;
import lombok.NonNull;
import lombok.Setter;
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/WicketComponentUtils.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/WicketComponentUtils.java
index ad6d2ea25d..3c096d0933 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/WicketComponentUtils.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/WicketComponentUtils.java
@@ -18,12 +18,13 @@
*/
package org.apache.causeway.viewer.wicket.model.models;
-import org.apache.causeway.commons.internal.base._Casts;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
import org.apache.wicket.markup.renderStrategy.DeepChildFirstVisitor;
import org.apache.wicket.util.visit.IVisit;
+import org.apache.causeway.commons.internal.base._Casts;
+
public class WicketComponentUtils {
public WicketComponentUtils(){}
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 acbb38fdbb..2c0eafa733 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
@@ -20,12 +20,13 @@ package org.apache.causeway.viewer.wicket.model.models.binding;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.binding._BindableAbstract;
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;
+import org.apache.causeway.commons.internal.binding._BindableAbstract;
+
import lombok.val;
/**
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/BookmarkedObjectWkt.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/BookmarkedObjectWkt.java
index 69ac7ca52b..23893d8193 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/BookmarkedObjectWkt.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/BookmarkedObjectWkt.java
@@ -18,10 +18,10 @@
*/
package org.apache.causeway.viewer.wicket.model.models.interaction;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.services.bookmark.Bookmark;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.viewer.wicket.model.models.ModelAbstract;
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 53d120792c..1754516c11 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
@@ -22,15 +22,15 @@ import java.util.Optional;
import java.util.stream.IntStream;
import java.util.stream.Stream;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.assertions._Assert;
-import org.apache.causeway.commons.internal.base._Lazy;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.wicket.model.ChainingModel;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.annotation.Where;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.assertions._Assert;
+import org.apache.causeway.commons.internal.base._Lazy;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.metamodel.interactions.managed.ActionInteraction;
import org.apache.causeway.core.metamodel.interactions.managed.ParameterNegotiationModel;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/act/UiParameterWkt.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/act/UiParameterWkt.java
index fbb33bd3d1..b67827a8df 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/act/UiParameterWkt.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/act/UiParameterWkt.java
@@ -25,11 +25,10 @@ import org.apache.causeway.core.metamodel.interactions.managed.ActionInteraction
import org.apache.causeway.core.metamodel.interactions.managed.ParameterNegotiationModel;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.causeway.viewer.wicket.model.models.HasCommonContext;
-
import org.apache.causeway.viewer.commons.model.object.HasUiParentObject;
import org.apache.causeway.viewer.commons.model.object.UiObject;
import org.apache.causeway.viewer.commons.model.scalar.UiParameter;
+import org.apache.causeway.viewer.wicket.model.models.HasCommonContext;
import lombok.NonNull;
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 67f3a86a9d..9449991a64 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
@@ -20,10 +20,10 @@ package org.apache.causeway.viewer.wicket.model.models.interaction.coll;
import java.util.Optional;
-import org.apache.causeway.commons.internal.binding._BindableAbstract;
import org.apache.wicket.model.IModel;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.internal.binding._BindableAbstract;
import org.apache.causeway.core.metamodel.interactions.managed.nonscalar.DataRow;
import org.apache.causeway.core.metamodel.interactions.managed.nonscalar.DataTableModel;
import org.apache.causeway.viewer.wicket.model.models.binding.BooleanBinding;
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/coll/DataTableModelWkt.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/coll/DataTableModelWkt.java
index 8122b106a4..832308ebed 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/coll/DataTableModelWkt.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/coll/DataTableModelWkt.java
@@ -18,21 +18,19 @@
*/
package org.apache.causeway.viewer.wicket.model.models.interaction.coll;
-import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.annotation.Where;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedAction;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedCollection;
import org.apache.causeway.core.metamodel.interactions.managed.nonscalar.DataTableModel;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
import org.apache.causeway.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.causeway.viewer.wicket.model.models.interaction.BookmarkedObjectWkt;
-import org.apache.causeway.viewer.wicket.model.models.interaction.HasBookmarkedOwnerAbstract;
-
import org.apache.causeway.viewer.commons.model.object.HasUiParentObject;
import org.apache.causeway.viewer.commons.model.object.UiObject;
+import org.apache.causeway.viewer.wicket.model.models.interaction.BookmarkedObjectWkt;
+import org.apache.causeway.viewer.wicket.model.models.interaction.HasBookmarkedOwnerAbstract;
import lombok.Getter;
import lombok.NonNull;
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/prop/PropertyInteractionWkt.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/prop/PropertyInteractionWkt.java
index 156687ebbb..be94516afa 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/prop/PropertyInteractionWkt.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/prop/PropertyInteractionWkt.java
@@ -21,14 +21,14 @@ package org.apache.causeway.viewer.wicket.model.models.interaction.prop;
import java.util.Optional;
import java.util.stream.Stream;
+import org.apache.wicket.model.ChainingModel;
+
+import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.causeway.commons.internal.base._Blackhole;
import org.apache.causeway.commons.internal.base._Lazy;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
-import org.apache.wicket.model.ChainingModel;
-
-import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedProperty;
import org.apache.causeway.core.metamodel.interactions.managed.PropertyInteraction;
import org.apache.causeway.core.metamodel.interactions.managed.PropertyNegotiationModel;
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/prop/UiPropertyWkt.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/prop/UiPropertyWkt.java
index 09429f549a..1fd44636f6 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/prop/UiPropertyWkt.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/prop/UiPropertyWkt.java
@@ -25,11 +25,10 @@ import org.apache.causeway.core.metamodel.interactions.managed.PropertyInteracti
import org.apache.causeway.core.metamodel.interactions.managed.PropertyNegotiationModel;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.causeway.viewer.wicket.model.models.HasCommonContext;
-
import org.apache.causeway.viewer.commons.model.object.HasUiParentObject;
import org.apache.causeway.viewer.commons.model.object.UiObject;
import org.apache.causeway.viewer.commons.model.scalar.UiProperty;
+import org.apache.causeway.viewer.wicket.model.models.HasCommonContext;
/**
* <i>Property Interaction</i> model bound to its owner {@link PropertyInteractionWkt}.
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 a6a08acc70..ff93f2e1be 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
@@ -21,8 +21,6 @@ package org.apache.causeway.viewer.wicket.model.util;
import java.util.Optional;
import java.util.stream.Stream;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.base._Strings;
import org.apache.wicket.core.request.handler.IPageRequestHandler;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.cycle.PageRequestHandlerTracker;
@@ -34,6 +32,8 @@ import org.springframework.lang.Nullable;
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.services.bookmark.Bookmark;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.ManagedObjects;
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/value/ConverterBasedOnValueSemantics.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/value/ConverterBasedOnValueSemantics.java
index c927e76d64..f62db22f5e 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/value/ConverterBasedOnValueSemantics.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/value/ConverterBasedOnValueSemantics.java
@@ -20,11 +20,11 @@ package org.apache.causeway.viewer.wicket.model.value;
import java.util.Locale;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.wicket.util.convert.ConversionException;
import org.apache.wicket.util.convert.IConverter;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.metamodel.commons.ScalarRepresentation;
import org.apache.causeway.core.metamodel.facets.object.value.ValueFacet;
import org.apache.causeway.core.metamodel.spec.feature.ObjectFeature;
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/value/OptionsBasedOnValueSemantics.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/value/OptionsBasedOnValueSemantics.java
index 0a5a28457c..203d771a64 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/value/OptionsBasedOnValueSemantics.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/value/OptionsBasedOnValueSemantics.java
@@ -20,10 +20,9 @@ package org.apache.causeway.viewer.wicket.model.value;
import java.util.Optional;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
-
import org.apache.causeway.applib.value.semantics.Renderer;
import org.apache.causeway.applib.value.semantics.Renderer.SyntaxHighlighter;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.metamodel.commons.ScalarRepresentation;
import org.apache.causeway.core.metamodel.spec.feature.ObjectFeature;
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/value/ValueSemanticsModelAbstract.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/value/ValueSemanticsModelAbstract.java
index f9a63b254c..094fac3278 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/value/ValueSemanticsModelAbstract.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/value/ValueSemanticsModelAbstract.java
@@ -20,10 +20,9 @@ package org.apache.causeway.viewer.wicket.model.value;
import java.io.Serializable;
+import org.apache.causeway.applib.Identifier;
import org.apache.causeway.commons.functional.Either;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
-
-import org.apache.causeway.applib.Identifier;
import org.apache.causeway.core.metamodel.commons.ScalarRepresentation;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facets.object.value.ValueFacet;
diff --git a/viewers/wicket/model/src/test/java/org/apache/causeway/viewer/wicket/model/models/test/UiObjectWkt_hintsTest.java b/viewers/wicket/model/src/test/java/org/apache/causeway/viewer/wicket/model/models/test/UiObjectWkt_hintsTest.java
index b6650692fe..48f44a4d80 100644
--- a/viewers/wicket/model/src/test/java/org/apache/causeway/viewer/wicket/model/models/test/UiObjectWkt_hintsTest.java
+++ b/viewers/wicket/model/src/test/java/org/apache/causeway/viewer/wicket/model/models/test/UiObjectWkt_hintsTest.java
@@ -21,7 +21,6 @@ package org.apache.causeway.viewer.wicket.model.models.test;
import java.util.Map;
import java.util.Set;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Page;
@@ -40,6 +39,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.hint.HintStore;
+import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.core.metamodel._testing.MetaModelContext_forTesting;
import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/CausewayModuleViewerWicketUi.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/CausewayModuleViewerWicketUi.java
index 731ff4ef4d..0d13297f21 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/CausewayModuleViewerWicketUi.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/CausewayModuleViewerWicketUi.java
@@ -18,12 +18,13 @@
*/
package org.apache.causeway.viewer.wicket.ui;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
import org.apache.causeway.viewer.commons.services.CausewayModuleViewerCommonsServices;
import org.apache.causeway.viewer.wicket.model.CausewayModuleViewerWicketModel;
import org.apache.causeway.viewer.wicket.ui.app.logout.LogoutHandlerWkt;
import org.apache.causeway.viewer.wicket.ui.components.widgets.themepicker.CausewayWicketThemeSupportDefault;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
/**
* @since 1.x {@index}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/ComponentFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/ComponentFactory.java
index 67709f9623..9ea6429dd1 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/ComponentFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/ComponentFactory.java
@@ -20,12 +20,13 @@ package org.apache.causeway.viewer.wicket.ui;
import java.io.Serializable;
-import org.apache.causeway.viewer.commons.model.components.UiComponentType;
-import org.apache.causeway.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.resource.CssResourceReference;
+import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
+
/**
* Creates {@link Component}s of a specified {@link UiComponentType}, optionally
* {@link #appliesTo(UiComponentType, IModel) dependent on} the provided
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/ComponentFactoryAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/ComponentFactoryAbstract.java
index a3c4c68e3b..a1fe315c9a 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/ComponentFactoryAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/ComponentFactoryAbstract.java
@@ -23,9 +23,8 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.request.resource.CssResourceReference;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
-import org.apache.causeway.viewer.wicket.ui.panels.PanelUtil;
-
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.wicket.ui.panels.PanelUtil;
import lombok.Getter;
import lombok.Setter;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java
index cd0dfa415d..63fd2027e3 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java
@@ -20,7 +20,6 @@ package org.apache.causeway.viewer.wicket.ui.actionresponse;
import java.time.Duration;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -32,6 +31,7 @@ import org.apache.wicket.request.handler.resource.ResourceStreamRequestHandler;
import org.apache.wicket.request.resource.ContentDisposition;
import org.apache.wicket.util.resource.IResourceStream;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.viewer.wicket.model.models.RedirectRequestHandlerWithOpenUrlStrategy;
import org.apache.causeway.viewer.wicket.model.models.VoidModel;
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 a2ce527142..8a33444eae 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
@@ -20,10 +20,6 @@ package org.apache.causeway.viewer.wicket.ui.actionresponse;
import java.net.URL;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.assertions._Assert;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.request.IRequestHandler;
import org.springframework.lang.Nullable;
@@ -32,6 +28,10 @@ import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.applib.value.Clob;
import org.apache.causeway.applib.value.LocalResourcePath;
import org.apache.causeway.applib.value.OpenUrlStrategy;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.assertions._Assert;
+import org.apache.causeway.commons.internal.base._NullSafe;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.ManagedObjects;
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 81e31f3fe3..13b2b975b1 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
@@ -24,7 +24,6 @@ import org.springframework.stereotype.Service;
import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker;
import org.apache.causeway.core.interaction.session.CausewayInteraction;
-
import org.apache.causeway.core.security.authentication.logout.LogoutHandler;
import lombok.RequiredArgsConstructor;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/app/registry/ComponentFactoryRegistrar.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/app/registry/ComponentFactoryRegistrar.java
index f478db0648..65a4aa8451 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/app/registry/ComponentFactoryRegistrar.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/app/registry/ComponentFactoryRegistrar.java
@@ -24,9 +24,8 @@ import java.util.function.Predicate;
import java.util.stream.Stream;
import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
-
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
/**
* Defines an API for registering {@link ComponentFactory}s.
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 534af5083b..d36f3f8f6e 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
@@ -20,14 +20,14 @@ package org.apache.causeway.viewer.wicket.ui.app.registry;
import java.util.stream.Stream;
-import org.apache.causeway.commons.collections.ImmutableEnumSet;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
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;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
/**
* API for finding registered {@link ComponentFactory}s.
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/AboutPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/AboutPanel.java
index 3549d1e148..418b1169df 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/AboutPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/AboutPanel.java
@@ -24,11 +24,11 @@ import javax.inject.Inject;
import javax.inject.Provider;
import javax.servlet.ServletContext;
-import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LambdaModel;
+import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.wicket.model.models.AboutModel;
import org.apache.causeway.viewer.wicket.ui.pages.home.HomePage;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/AboutPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/AboutPanelFactory.java
index f241971d57..a9fb44e1a5 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/AboutPanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/AboutPanelFactory.java
@@ -18,13 +18,14 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.about;
-import org.apache.causeway.viewer.wicket.model.models.AboutModel;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.wicket.model.models.AboutModel;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory.ApplicationAdvice;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
/**
* {@link ComponentFactory} for {@link AboutPanel}.
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/JarManifestListView.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/JarManifestListView.java
index f3f567a621..e1ad7c4dfd 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/JarManifestListView.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/JarManifestListView.java
@@ -20,11 +20,12 @@ package org.apache.causeway.viewer.wicket.ui.components.about;
import java.util.List;
-import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
+import org.apache.causeway.viewer.wicket.ui.util.Wkt;
+
public final class JarManifestListView extends ListView<JarManifestAttributes> {
private static final long serialVersionUID = 1L;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/JarManifestModel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/JarManifestModel.java
index 3e1c30cdee..ce60ddf328 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/JarManifestModel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/JarManifestModel.java
@@ -36,12 +36,9 @@ import javax.inject.Provider;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.commons.internal.context._Context;
-
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.viewer.wicket.model.models.ModelAbstract;
-import lombok.val;
-
public class JarManifestModel extends ModelAbstract<JarManifestModel> {
private static final long serialVersionUID = 1L;
@@ -84,7 +81,7 @@ public class JarManifestModel extends ModelAbstract<JarManifestModel> {
jarManifests.add(jarManifest);
- try(val is = url.openStream()) {
+ try(var is = url.openStream()) {
if (is != null) {
manifest = new Manifest(is);
jarManifest.addAttributesFrom(manifest);
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/JarManifestPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/JarManifestPanel.java
index 4616cb3d53..89eae7f4e3 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/JarManifestPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/JarManifestPanel.java
@@ -18,12 +18,13 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.about;
-import org.apache.causeway.viewer.wicket.ui.panels.PanelUtil;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.causeway.viewer.wicket.ui.panels.PanelUtil;
+
public class JarManifestPanel extends Panel {
private static final long serialVersionUID = 1L;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actioninfo/ActionInfoPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actioninfo/ActionInfoPanelFactory.java
index d60ed625d7..51e6315db5 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actioninfo/ActionInfoPanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actioninfo/ActionInfoPanelFactory.java
@@ -18,13 +18,13 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.actioninfo;
-import org.apache.causeway.viewer.wicket.model.models.ActionModel;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.wicket.model.models.ActionModel;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
/**
* {@link ComponentFactory} for {@link ActionInfoPanel}.
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksPanel.java
index 84d83215e7..6bdc311814 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksPanel.java
@@ -20,6 +20,8 @@ package org.apache.causeway.viewer.wicket.ui.components.actionmenu.entityactions
import java.util.List;
+import org.apache.wicket.MarkupContainer;
+
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.viewer.wicket.model.links.LinkAndLabel;
import org.apache.causeway.viewer.wicket.model.links.ListOfLinksModel;
@@ -27,7 +29,6 @@ import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.causeway.viewer.wicket.ui.util.WktComponents;
import org.apache.causeway.viewer.wicket.ui.util.WktLinks;
-import org.apache.wicket.MarkupContainer;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
index 1a7b4a203e..399c3d6cd1 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
@@ -20,13 +20,13 @@ import java.io.Serializable;
import java.util.Collections;
import java.util.List;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.model.Model;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
import org.apache.causeway.viewer.wicket.model.links.LinkAndLabel;
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/actionmenu/serviceactions/CssMenuItemPanelAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItemPanelAbstract.java
index 0cce629f20..f98a6b9173 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItemPanelAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItemPanelAbstract.java
@@ -18,10 +18,11 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.actionmenu.serviceactions;
-import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.model.IModel;
+import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
+
/**
* Package-level adapter for menu items and submenu-items.
*/
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/serviceactions/MenuActionPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/serviceactions/MenuActionPanel.java
index 7a09038d4b..9855ea9a38 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/serviceactions/MenuActionPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/serviceactions/MenuActionPanel.java
@@ -20,14 +20,15 @@ package org.apache.causeway.viewer.wicket.ui.components.actionmenu.serviceaction
import java.util.List;
-import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.viewer.wicket.ui.panels.PanelBase;
-import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.causeway.commons.internal.collections._Lists;
+import org.apache.causeway.viewer.wicket.ui.panels.PanelBase;
+import org.apache.causeway.viewer.wicket.ui.util.Wkt;
+
import lombok.val;
@SuppressWarnings("rawtypes")
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
index a608c7dd30..8b58620648 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
@@ -27,16 +27,15 @@ import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedAction;
+import org.apache.causeway.viewer.commons.applib.services.menu.MenuItemDto;
+import org.apache.causeway.viewer.commons.applib.services.menu.MenuUiModel;
+import org.apache.causeway.viewer.commons.applib.services.menu.MenuVisitor;
import org.apache.causeway.viewer.wicket.model.links.LinkAndLabel;
import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
import org.apache.causeway.viewer.wicket.ui.components.actionmenu.entityactions.LinkAndLabelFactory;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.causeway.viewer.wicket.ui.util.WktDecorators;
-import org.apache.causeway.viewer.commons.applib.services.menu.MenuItemDto;
-import org.apache.causeway.viewer.commons.applib.services.menu.MenuUiModel;
-import org.apache.causeway.viewer.commons.applib.services.menu.MenuVisitor;
-
import lombok.RequiredArgsConstructor;
import lombok.val;
import lombok.experimental.UtilityClass;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.java
index b9af0cf2c7..9a7c4ae2bb 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.java
@@ -20,13 +20,14 @@ package org.apache.causeway.viewer.wicket.ui.components.actionmenu.serviceaction
import java.util.List;
-import org.apache.causeway.viewer.wicket.ui.pages.common.serversentevents.js.ServerSentEventsJsReference;
-import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.request.resource.CssResourceReference;
+import org.apache.causeway.viewer.wicket.ui.pages.common.serversentevents.js.ServerSentEventsJsReference;
+import org.apache.causeway.viewer.wicket.ui.util.Wkt;
+
import lombok.val;
// import de.agilecoders.wicket.extensions.markup.html.bootstrap.button.DropdownAutoOpenJavaScriptReference;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanelFactory.java
index c805d3b422..b971d865cd 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanelFactory.java
@@ -18,15 +18,15 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.actionmenu.serviceactions;
-import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.viewer.wicket.model.models.ServiceActionsModel;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.causeway.applib.annotation.DomainServiceLayout;
+import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.wicket.model.models.ServiceActionsModel;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryMenuPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryMenuPanelFactory.java
index c9bacbedb7..a82b8c2d6d 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryMenuPanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryMenuPanelFactory.java
@@ -18,14 +18,15 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.actionmenu.serviceactions;
-import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.viewer.wicket.model.models.ServiceActionsModel;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.causeway.applib.annotation.DomainServiceLayout;
+import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.wicket.model.models.ServiceActionsModel;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory.ApplicationAdvice;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.java
index c9c2f9b10f..848821c559 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.java
@@ -19,14 +19,12 @@
package org.apache.causeway.viewer.wicket.ui.components.actionprompt;
import org.apache.causeway.commons.internal.base._Blackhole;
-
import org.apache.causeway.core.metamodel.object.ManagedObject;
+import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.model.models.ActionModel;
import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
-import org.apache.causeway.viewer.commons.model.components.UiComponentType;
-
import lombok.val;
/**
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.java
index 17868d7ba4..a2bf5698f9 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.java
@@ -18,16 +18,17 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.actionprompt;
-import org.apache.causeway.viewer.wicket.model.models.ActionPromptWithExtraContent;
-import org.apache.causeway.viewer.wicket.ui.components.widgets.bootstrap.ModalDialog;
-import org.apache.causeway.viewer.wicket.ui.util.Wkt;
-import org.apache.causeway.viewer.wicket.ui.util.Wkt.EventTopic;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.causeway.viewer.wicket.model.models.ActionPromptWithExtraContent;
+import org.apache.causeway.viewer.wicket.ui.components.widgets.bootstrap.ModalDialog;
+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.bootstrap.dialog.Modal;
public class ActionPromptModalWindow
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionpromptsb/ActionPromptSidebar.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionpromptsb/ActionPromptSidebar.java
index f0bdaf86b5..3503f3f8e6 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionpromptsb/ActionPromptSidebar.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionpromptsb/ActionPromptSidebar.java
@@ -18,13 +18,14 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.actionpromptsb;
-import org.apache.causeway.viewer.wicket.model.models.ActionPromptWithExtraContent;
-import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.panel.GenericPanel;
+import org.apache.causeway.viewer.wicket.model.models.ActionPromptWithExtraContent;
+import org.apache.causeway.viewer.wicket.ui.util.Wkt;
+
public class ActionPromptSidebar
extends GenericPanel<Void>
implements ActionPromptWithExtraContent {
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 1bff4f2366..37afdd03e9 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
@@ -21,10 +21,20 @@ package org.apache.causeway.viewer.wicket.ui.components.actions;
import java.util.Optional;
import java.util.function.Consumer;
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.repeater.RepeatingView;
+
import org.apache.causeway.commons.functional.Either;
import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
+import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.commons.model.decorators.ConfirmDecorator.ConfirmDecorationModel;
+import org.apache.causeway.viewer.commons.model.layout.UiPlacementDirection;
+import org.apache.causeway.viewer.commons.model.scalar.UiParameter;
import org.apache.causeway.viewer.wicket.model.models.ActionModel;
import org.apache.causeway.viewer.wicket.model.models.ScalarParameterModel;
import org.apache.causeway.viewer.wicket.model.models.ScalarPropertyModel;
@@ -34,20 +44,9 @@ import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarPanelAbstra
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 org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.repeater.RepeatingView;
-
-import org.apache.causeway.viewer.commons.model.components.UiComponentType;
-import org.apache.causeway.viewer.commons.model.decorators.ConfirmDecorator.ConfirmDecorationModel;
-import org.apache.causeway.viewer.commons.model.layout.UiPlacementDirection;
-import org.apache.causeway.viewer.commons.model.scalar.UiParameter;
-
-import lombok.val;
import de.agilecoders.wicket.extensions.markup.html.bootstrap.confirmation.ConfirmationBehavior;
+import lombok.val;
class ActionParametersForm
extends PromptFormAbstract<ActionModel> {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actions/ActionParametersFormPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actions/ActionParametersFormPanelFactory.java
index de85a8b7b5..835fcc3353 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actions/ActionParametersFormPanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actions/ActionParametersFormPanelFactory.java
@@ -18,13 +18,14 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.actions;
-import org.apache.causeway.viewer.wicket.model.models.ActionModel;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.wicket.model.models.ActionModel;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory.ApplicationAdvice;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
/**
* {@link ComponentFactory} for {@link ActionParametersFormPanel}.
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actions/ActionParametersPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actions/ActionParametersPanel.java
index 5ab0380091..f76822b32e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actions/ActionParametersPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actions/ActionParametersPanel.java
@@ -21,13 +21,12 @@ package org.apache.causeway.viewer.wicket.ui.components.actions;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.causeway.core.metamodel.object.ManagedObject;
+import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.model.models.ActionModel;
import org.apache.causeway.viewer.wicket.ui.components.property.PropertyEditPanel;
import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
-import org.apache.causeway.viewer.commons.model.components.UiComponentType;
-
import lombok.Getter;
import lombok.Setter;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actions/ActionParametersPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actions/ActionParametersPanelFactory.java
index c13017f49b..5891e762a0 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actions/ActionParametersPanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actions/ActionParametersPanelFactory.java
@@ -18,13 +18,14 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.actions;
-import org.apache.causeway.viewer.wicket.model.models.ActionModel;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.wicket.model.models.ActionModel;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory.ApplicationAdvice;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
/**
* {@link ComponentFactory} for {@link ActionParametersPanel}.
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actions/_Xray.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actions/_Xray.java
index 13e04e0812..d4c680be9f 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actions/_Xray.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actions/_Xray.java
@@ -21,7 +21,6 @@ package org.apache.causeway.viewer.wicket.ui.components.actions;
import org.apache.causeway.commons.internal.debug._XrayEvent;
import org.apache.causeway.commons.internal.debug.xray.XrayUi;
-
import org.apache.causeway.core.metamodel.interactions.managed.ParameterNegotiationModel;
import org.apache.causeway.core.metamodel.object.MmDebugUtil;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanelFactory.java
index c128c2b524..eaa6273c8f 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanelFactory.java
@@ -18,12 +18,12 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.bookmarkedpages;
-import org.apache.causeway.viewer.wicket.model.models.BookmarkedPagesModel;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.wicket.model.models.BookmarkedPagesModel;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
public class BookmarkedPagesPanelFactory extends ComponentFactoryAbstract {
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 e4bd1dc56d..c675ef2c44 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
@@ -20,10 +20,11 @@ package org.apache.causeway.viewer.wicket.ui.components.collection;
import java.util.Optional;
-import org.apache.causeway.commons.collections.Can;
import org.apache.wicket.feedback.ComponentFeedbackMessageFilter;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.interactions.managed.nonscalar.DataTableModel;
+import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModelParented;
import org.apache.causeway.viewer.wicket.ui.components.actionmenu.entityactions.LinkAndLabelFactory;
import org.apache.causeway.viewer.wicket.ui.components.collection.bulk.MultiselectToggleProvider;
@@ -33,14 +34,11 @@ 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 org.apache.causeway.viewer.commons.model.components.UiComponentType;
-
+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 07392bcfb9..6af9a625cc 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,15 +23,16 @@ import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
-import org.apache.causeway.commons.collections.ImmutableEnumSet;
-import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.layout.component.CollectionLayoutData;
import org.apache.causeway.applib.services.bookmark.Bookmark;
+import org.apache.causeway.commons.collections.ImmutableEnumSet;
+import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.core.metamodel.util.Facets;
+import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.model.hints.UiHintContainer;
import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel;
import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModelParented;
@@ -42,8 +43,6 @@ import org.apache.causeway.viewer.wicket.ui.components.collectioncontents.ajaxta
import org.apache.causeway.viewer.wicket.ui.components.collectioncontents.multiple.CollectionContentsMultipleViewsPanelFactory;
import org.apache.causeway.viewer.wicket.ui.components.collectioncontents.unresolved.CollectionContentsHiddenPanelFactory;
-import org.apache.causeway.viewer.commons.model.components.UiComponentType;
-
import lombok.Getter;
public class CollectionPresentationSelectorHelper implements Serializable {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/selector/CollectionPresentationSelectorPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/selector/CollectionPresentationSelectorPanel.java
index 0ad3e8b4fd..d581fde610 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/selector/CollectionPresentationSelectorPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/selector/CollectionPresentationSelectorPanel.java
@@ -30,6 +30,8 @@ import org.apache.wicket.model.Model;
import org.apache.causeway.core.metamodel.commons.StringExtensions;
import org.apache.causeway.core.metamodel.interactions.managed.nonscalar.DataTableModel;
+import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.commons.model.layout.UiPlacementDirection;
import org.apache.causeway.viewer.wicket.model.hints.CausewaySelectorEvent;
import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel;
import org.apache.causeway.viewer.wicket.model.util.ComponentHintKey;
@@ -40,9 +42,6 @@ import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.causeway.viewer.wicket.ui.util.WktLinks;
import org.apache.causeway.viewer.wicket.ui.util.WktTooltips;
-import org.apache.causeway.viewer.commons.model.components.UiComponentType;
-import org.apache.causeway.viewer.commons.model.layout.UiPlacementDirection;
-
import lombok.val;
/**
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CausewayAjaxDataTable.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CausewayAjaxDataTable.java
index 182df20871..81ffce4dac 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CausewayAjaxDataTable.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CausewayAjaxDataTable.java
@@ -23,8 +23,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.UUID;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.extensions.markup.html.repeater.data.sort.SortOrder;
import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
@@ -35,6 +33,8 @@ import org.apache.wicket.markup.repeater.IItemReuseStrategy;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.model.IModel;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.core.metamodel.interactions.managed.nonscalar.DataRow;
import org.apache.causeway.core.metamodel.object.ManagedObjects;
import org.apache.causeway.viewer.wicket.model.hints.UiHintContainer;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CausewayAjaxFallbackOrderByBorder.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CausewayAjaxFallbackOrderByBorder.java
index 2ca57bf200..51446e4528 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CausewayAjaxFallbackOrderByBorder.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CausewayAjaxFallbackOrderByBorder.java
@@ -18,13 +18,14 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.collectioncontents.ajaxtable;
-import org.apache.causeway.viewer.wicket.model.hints.UiHintContainer;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.extensions.ajax.markup.html.repeater.data.sort.AjaxFallbackOrderByBorder;
import org.apache.wicket.extensions.markup.html.repeater.data.sort.ISortState;
import org.apache.wicket.extensions.markup.html.repeater.data.sort.ISortStateLocator;
import org.apache.wicket.extensions.markup.html.repeater.data.sort.SortOrder;
+import org.apache.causeway.viewer.wicket.model.hints.UiHintContainer;
+
public class CausewayAjaxFallbackOrderByBorder<T> extends AjaxFallbackOrderByBorder<T> {
private static final long serialVersionUID = 1L;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CausewayAjaxHeadersToolbar.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CausewayAjaxHeadersToolbar.java
index fc7ffccf72..6388d6ddc1 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CausewayAjaxHeadersToolbar.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CausewayAjaxHeadersToolbar.java
@@ -18,14 +18,15 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.collectioncontents.ajaxtable;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.viewer.wicket.model.hints.UiHintContainer;
-import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackHeadersToolbar;
import org.apache.wicket.extensions.markup.html.repeater.data.sort.ISortStateLocator;
import org.apache.wicket.extensions.markup.html.repeater.data.sort.SortOrder;
import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.viewer.wicket.model.hints.UiHintContainer;
+import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
+
/**
* Adapted from Wicket's own {@link AjaxFallbackHeadersToolbar}.
*/
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CausewayAjaxHeadersToolbarAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CausewayAjaxHeadersToolbarAbstract.java
index 2b7e3502d0..5f5d0ef1d1 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CausewayAjaxHeadersToolbarAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CausewayAjaxHeadersToolbarAbstract.java
@@ -22,8 +22,6 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
-import org.apache.causeway.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.GenericTitleColumn;
-import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.wicket.Component;
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.extensions.markup.html.repeater.data.sort.ISortState;
@@ -44,6 +42,9 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.string.Strings;
+import org.apache.causeway.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.GenericTitleColumn;
+import org.apache.causeway.viewer.wicket.ui.util.Wkt;
+
import de.agilecoders.wicket.core.util.Attributes;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CausewayAjaxPagingNavigationIncrementLink.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CausewayAjaxPagingNavigationIncrementLink.java
index 6c030a38ec..f36c6ecc45 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CausewayAjaxPagingNavigationIncrementLink.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CausewayAjaxPagingNavigationIncrementLink.java
@@ -18,13 +18,14 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.collectioncontents.ajaxtable;
-import org.apache.causeway.viewer.wicket.model.hints.UiHintContainer;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigationBehavior;
import org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigationIncrementLink;
import org.apache.wicket.markup.html.navigation.paging.IPageable;
+import org.apache.causeway.viewer.wicket.model.hints.UiHintContainer;
+
import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigationBehavior;
public class CausewayAjaxPagingNavigationIncrementLink extends AjaxPagingNavigationIncrementLink {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CausewayAjaxPagingNavigationLink.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CausewayAjaxPagingNavigationLink.java
index b6c899ed23..f7c266c411 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CausewayAjaxPagingNavigationLink.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CausewayAjaxPagingNavigationLink.java
@@ -18,7 +18,6 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.collectioncontents.ajaxtable;
-import org.apache.causeway.viewer.wicket.model.hints.UiHintContainer;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigationBehavior;
@@ -26,6 +25,8 @@ import org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigation
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.navigation.paging.IPageable;
+import org.apache.causeway.viewer.wicket.model.hints.UiHintContainer;
+
import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigationBehavior;
import de.agilecoders.wicket.core.util.Attributes;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
index a92b03b108..edb83e685d 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
@@ -20,11 +20,11 @@ package org.apache.causeway.viewer.wicket.ui.components.collectioncontents.ajaxt
import java.util.List;
-import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.wicket.Component;
import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackDefaultDataTable;
import org.apache.wicket.model.Model;
+import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.core.metamodel.interactions.managed.nonscalar.DataTableModel;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanelFactory.java
index ef9d1b9b71..812009156b 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanelFactory.java
@@ -18,16 +18,17 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.collectioncontents.ajaxtable;
-import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel;
-import org.apache.causeway.viewer.wicket.ui.CollectionContentsAsFactory;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.ResourceModel;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel;
+import org.apache.causeway.viewer.wicket.ui.CollectionContentsAsFactory;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory.ApplicationAdvice;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
/**
* {@link ComponentFactory} for {@link CollectionContentsAsAjaxTablePanel}.
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java
index 8dbf58f101..c2a951b7e0 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java
@@ -21,12 +21,12 @@ package org.apache.causeway.viewer.wicket.ui.components.collectioncontents.ajaxt
import java.util.Iterator;
import java.util.Optional;
-import org.apache.causeway.commons.collections.Can;
import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackDefaultDataTable;
import org.apache.wicket.extensions.markup.html.repeater.util.SortParam;
import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
import org.apache.wicket.model.IModel;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.interactions.managed.nonscalar.DataRow;
import org.apache.causeway.core.metamodel.interactions.managed.nonscalar.DataTableModel;
import org.apache.causeway.core.metamodel.object.ManagedObjects;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java
index fecfc08061..31589dae71 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java
@@ -22,7 +22,6 @@ import java.util.Locale;
import org.apache.causeway.commons.internal.base._Timing;
import org.apache.causeway.core.interaction.session.CausewayInteraction;
-
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.viewer.wicket.model.models.HasCommonContext;
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 508341b470..e712e7171e 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
@@ -20,10 +20,10 @@ package org.apache.causeway.viewer.wicket.ui.components.collectioncontents.ajaxt
import java.util.Optional;
-import org.apache.causeway.commons.internal.binding._BindableAbstract;
import org.apache.wicket.model.IModel;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.internal.binding._BindableAbstract;
import org.apache.causeway.core.metamodel.interactions.managed.nonscalar.DataTableModel;
import org.apache.causeway.viewer.wicket.model.models.binding.BooleanBinding;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/GenericColumnAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/GenericColumnAbstract.java
index e029b4d768..4329c2dfaa 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/GenericColumnAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/GenericColumnAbstract.java
@@ -26,14 +26,13 @@ import org.apache.wicket.model.Model;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.interactions.managed.nonscalar.DataRow;
+import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.model.util.WktContext;
import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
import org.apache.causeway.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import org.apache.causeway.viewer.wicket.ui.app.registry.HasComponentFactoryRegistry;
import org.apache.causeway.viewer.wicket.ui.components.collectioncontents.ajaxtable.CollectionContentsAsAjaxTablePanel;
-import org.apache.causeway.viewer.commons.model.components.UiComponentType;
-
import lombok.val;
/**
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/GenericPropertyColumn.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/GenericPropertyColumn.java
index 4134a384f0..0837a2f54c 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/GenericPropertyColumn.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/GenericPropertyColumn.java
@@ -20,17 +20,18 @@ package org.apache.causeway.viewer.wicket.ui.components.collectioncontents.ajaxt
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
import org.apache.wicket.Component;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.model.IModel;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.commons.ScalarRepresentation;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.interactions.managed.nonscalar.DataRow;
import org.apache.causeway.core.metamodel.object.ManagedObject;
+import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel;
import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
@@ -39,8 +40,6 @@ import org.apache.causeway.viewer.wicket.ui.components.collectioncontents.ajaxta
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.causeway.viewer.wicket.ui.util.WktTooltips;
-import org.apache.causeway.viewer.commons.model.components.UiComponentType;
-
import lombok.val;
/**
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/GenericTitleColumn.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/GenericTitleColumn.java
index 8631e788eb..257630851a 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/GenericTitleColumn.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/GenericTitleColumn.java
@@ -28,13 +28,12 @@ import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.interactions.managed.nonscalar.DataRow;
import org.apache.causeway.core.metamodel.object.ManagedObjects;
+import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel.Variant;
import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
import org.apache.causeway.viewer.wicket.model.models.ValueModel;
-import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel.Variant;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
-import org.apache.causeway.viewer.commons.model.components.UiComponentType;
-
import lombok.val;
public final class GenericTitleColumn
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/GenericToggleboxColumn.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/GenericToggleboxColumn.java
index 4c0e7dc0a9..e6cdf5d23f 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/GenericToggleboxColumn.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/GenericToggleboxColumn.java
@@ -20,7 +20,6 @@ package org.apache.causeway.viewer.wicket.ui.components.collectioncontents.ajaxt
import java.util.List;
-import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -28,6 +27,7 @@ import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulato
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.model.IModel;
+import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.interactions.managed.nonscalar.DataRow;
import org.apache.causeway.core.metamodel.interactions.managed.nonscalar.DataTableModel;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanelFactory.java
index a10354c859..cdf14f3aff 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanelFactory.java
@@ -22,12 +22,12 @@ import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.causeway.core.metamodel.util.Facets;
+import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel;
import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory.ApplicationAdvice;
import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
-import org.apache.causeway.viewer.commons.model.components.UiComponentType;
-
import lombok.val;
/**
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java
index 344a58e119..0edf1683ed 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java
@@ -25,6 +25,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.event.IEvent;
import org.apache.causeway.core.metamodel.interactions.managed.nonscalar.DataTableModel;
+import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.model.hints.CausewayEnvelopeEvent;
import org.apache.causeway.viewer.wicket.model.hints.CausewaySelectorEvent;
import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel;
@@ -39,8 +40,6 @@ import org.apache.causeway.viewer.wicket.ui.components.collection.selector.Colle
import org.apache.causeway.viewer.wicket.ui.components.collection.selector.CollectionPresentationSelectorProvider;
import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
-import org.apache.causeway.viewer.commons.model.components.UiComponentType;
-
/**
* Subscribes to events generated by
* {@link org.apache.causeway.viewer.wicket.ui.components.collection.selector.CollectionPresentationSelectorPanel},
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanelFactory.java
index efe8389d35..3969e7e0ee 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanelFactory.java
@@ -18,13 +18,14 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.collectioncontents.multiple;
-import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory.ApplicationAdvice;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
/**
* {@link ComponentFactory} for {@link CollectionContentsMultipleViewsPanel}.
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 a921b7a99b..4b8686e9b2 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
@@ -24,12 +24,12 @@ import java.util.Collections;
import java.util.List;
import java.util.stream.Stream;
-import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.list.AbstractItem;
import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.Model;
+import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.interactions.managed.nonscalar.DataRow;
import org.apache.causeway.core.metamodel.interactions.managed.nonscalar.DataTableModel;
@@ -44,9 +44,8 @@ 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 lombok.val;
-
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+import lombok.val;
/**
* {@link PanelAbstract Panel} that represents a {@link EntityCollectionModel
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java
index bda3c5837d..8ec27aaa29 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java
@@ -31,13 +31,13 @@ import org.apache.wicket.request.resource.CssResourceReference;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.spec.feature.MixedIn;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel;
import org.apache.causeway.viewer.wicket.ui.CollectionContentsAsFactory;
import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory.ApplicationAdvice;
import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
-import org.apache.causeway.viewer.commons.model.components.UiComponentType;
-
import lombok.val;
/**
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsHiddenPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsHiddenPanelFactory.java
index e15f3d0181..25bb1f6150 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsHiddenPanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsHiddenPanelFactory.java
@@ -18,16 +18,17 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.collectioncontents.unresolved;
-import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel;
-import org.apache.causeway.viewer.wicket.ui.CollectionContentsAsFactory;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.ResourceModel;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel;
+import org.apache.causeway.viewer.wicket.ui.CollectionContentsAsFactory;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory.ApplicationAdvice;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
/**
* {@link ComponentFactory} for {@link CollectionContentsHiddenPanel}.
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/empty/EmptyCollectionPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/empty/EmptyCollectionPanelFactory.java
index 30632d9e64..8d54bc89d4 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/empty/EmptyCollectionPanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/empty/EmptyCollectionPanelFactory.java
@@ -18,13 +18,14 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.empty;
-import org.apache.causeway.viewer.wicket.model.models.ActionModel;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.wicket.model.models.ActionModel;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory.ApplicationAdvice;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
public class EmptyCollectionPanelFactory extends ComponentFactoryAbstract implements ComponentFactory {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/EntityComponentFactoryAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/EntityComponentFactoryAbstract.java
index 62e16f4e97..f607ef0f82 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/EntityComponentFactoryAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/EntityComponentFactoryAbstract.java
@@ -18,12 +18,13 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.entity;
-import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory.ApplicationAdvice;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.java
index 29b1ee1802..cd096d8301 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.java
@@ -20,10 +20,10 @@ package org.apache.causeway.viewer.wicket.ui.components.entity.collection;
import java.util.List;
-import org.apache.causeway.commons.collections.Can;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.causeway.applib.annotation.Where;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.config.metamodel.facets.CollectionLayoutConfigOptions;
import org.apache.causeway.core.metamodel.consent.Consent;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/collection/EntityCollectionPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/collection/EntityCollectionPanelFactory.java
index b77d1bc7de..b5e2ecae8d 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/collection/EntityCollectionPanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/collection/EntityCollectionPanelFactory.java
@@ -18,13 +18,13 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.entity.collection;
-import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
-import org.apache.causeway.viewer.wicket.ui.components.entity.EntityComponentFactoryAbstract;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
+import org.apache.causeway.viewer.wicket.ui.components.entity.EntityComponentFactoryAbstract;
/**
* {@link ComponentFactory} for {@link EntityCollectionPanel}.
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java
index fc2d34f036..d883c404be 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java
@@ -21,10 +21,6 @@ package org.apache.causeway.viewer.wicket.ui.components.entity.fieldset;
import java.util.List;
import java.util.function.Consumer;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.repeater.RepeatingView;
@@ -32,11 +28,17 @@ import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.causeway.applib.annotation.ActionLayout;
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.layout.component.FieldSet;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.base._NullSafe;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.core.metamodel.commons.ScalarRepresentation;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.causeway.core.metamodel.util.Facets;
+import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.commons.model.hints.RenderingHint;
import org.apache.causeway.viewer.wicket.model.links.LinkAndLabel;
import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
@@ -48,9 +50,6 @@ import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.causeway.viewer.wicket.ui.util.WktComponents;
-import org.apache.causeway.viewer.commons.model.components.UiComponentType;
-import org.apache.causeway.viewer.commons.model.hints.RenderingHint;
-
import lombok.val;
public class PropertyGroup extends PanelAbstract<ManagedObject, UiObjectWkt> implements HasDynamicallyVisibleContent {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java
index 8be3e5b754..b57f859aba 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java
@@ -18,19 +18,18 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.entity.header;
-import org.apache.causeway.commons.collections.Can;
import org.apache.wicket.Component;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
+import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
import org.apache.causeway.viewer.wicket.ui.components.actionmenu.entityactions.AdditionalLinksPanel;
import org.apache.causeway.viewer.wicket.ui.components.actionmenu.entityactions.LinkAndLabelFactory;
import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
-import org.apache.causeway.viewer.commons.model.components.UiComponentType;
-
import lombok.val;
/**
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/header/EntityHeaderPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/header/EntityHeaderPanelFactory.java
index 00ee229ee0..0cb0df81a4 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/header/EntityHeaderPanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/header/EntityHeaderPanelFactory.java
@@ -18,13 +18,13 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.entity.header;
-import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
-import org.apache.causeway.viewer.wicket.ui.components.entity.EntityComponentFactoryAbstract;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
+import org.apache.causeway.viewer.wicket.ui.components.entity.EntityComponentFactoryAbstract;
/**
* {@link ComponentFactory} for {@link EntityHeaderPanel}.
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
index b078befc08..4147d224c2 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
@@ -20,12 +20,12 @@ package org.apache.causeway.viewer.wicket.ui.components.entity.icontitle;
import java.util.Optional;
-import org.apache.causeway.commons.internal.assertions._Assert;
-import org.apache.causeway.commons.internal.base._Strings;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.AbstractLink;
+import org.apache.causeway.commons.internal.assertions._Assert;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFactory;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.ManagedObjects;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanelFactory.java
index 5671c57027..10bc3e041d 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanelFactory.java
@@ -18,19 +18,19 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.entity.icontitle;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
+import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.model.models.ChainingObjectModel;
import org.apache.causeway.viewer.wicket.model.models.ObjectAdapterModel;
import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory.ApplicationAdvice;
import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
-import org.apache.causeway.viewer.commons.model.components.UiComponentType;
-
import lombok.val;
/**
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanel.java
index cbe69733ee..6380cf9a7f 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanel.java
@@ -18,9 +18,10 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.entity.icontitle;
+import org.apache.wicket.MarkupContainer;
+
import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
import org.apache.causeway.viewer.wicket.ui.components.widgets.zclip.ZeroClipboardPanel;
-import org.apache.wicket.MarkupContainer;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanelFactory.java
index 5fc1ecc459..312f54ca40 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanelFactory.java
@@ -18,12 +18,12 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.entity.icontitle;
-import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
-import org.apache.causeway.viewer.wicket.ui.components.entity.EntityComponentFactoryAbstract;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
+import org.apache.causeway.viewer.wicket.ui.components.entity.EntityComponentFactoryAbstract;
/**
* {@link org.apache.causeway.viewer.wicket.ui.ComponentFactory} for {@link org.apache.causeway.viewer.wicket.ui.components.entity.icontitle.EntityIconAndTitlePanel}.
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/footer/FooterPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/footer/FooterPanel.java
index 0b737d29f9..dbaba10be5 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/footer/FooterPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/footer/FooterPanel.java
@@ -18,8 +18,6 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.footer;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.base._Strings;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.ComponentTag;
@@ -33,6 +31,8 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.causeway.commons.internal.base._NullSafe;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.config.CausewayConfiguration.Viewer.Wicket.Credit;
import org.apache.causeway.viewer.wicket.model.util.PageParameterUtils;
import org.apache.causeway.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbPanel;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/footer/FooterPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/footer/FooterPanelFactory.java
index 64c75daf10..4f0b7c0a52 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/footer/FooterPanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/footer/FooterPanelFactory.java
@@ -18,11 +18,12 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.footer;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory.ApplicationAdvice;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
/**
* {@link org.apache.causeway.viewer.wicket.ui.ComponentFactory} to create container for the page footer.
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/header/HeaderPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/header/HeaderPanel.java
index f1d3ab44d6..43fcc8046c 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/header/HeaderPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/header/HeaderPanel.java
@@ -18,15 +18,6 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.header;
-import org.apache.causeway.viewer.wicket.model.models.ServiceActionsModel;
-import org.apache.causeway.viewer.wicket.model.util.PageParameterUtils;
-import org.apache.causeway.viewer.wicket.ui.components.widgets.navbar.AvatarImage;
-import org.apache.causeway.viewer.wicket.ui.components.widgets.navbar.BrandLogo;
-import org.apache.causeway.viewer.wicket.ui.components.widgets.navbar.BrandName;
-import org.apache.causeway.viewer.wicket.ui.pages.error.ErrorPage;
-import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
-import org.apache.causeway.viewer.wicket.ui.util.Wkt;
-import org.apache.causeway.viewer.wicket.ui.util.WktComponents;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.model.Model;
@@ -37,6 +28,15 @@ import org.apache.causeway.viewer.commons.applib.services.header.HeaderUiModel;
import org.apache.causeway.viewer.commons.applib.services.menu.MenuUiModel;
import org.apache.causeway.viewer.commons.applib.services.userprof.UserProfileUiModel;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.wicket.model.models.ServiceActionsModel;
+import org.apache.causeway.viewer.wicket.model.util.PageParameterUtils;
+import org.apache.causeway.viewer.wicket.ui.components.widgets.navbar.AvatarImage;
+import org.apache.causeway.viewer.wicket.ui.components.widgets.navbar.BrandLogo;
+import org.apache.causeway.viewer.wicket.ui.components.widgets.navbar.BrandName;
+import org.apache.causeway.viewer.wicket.ui.pages.error.ErrorPage;
+import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
+import org.apache.causeway.viewer.wicket.ui.util.Wkt;
+import org.apache.causeway.viewer.wicket.ui.util.WktComponents;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/header/HeaderPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/header/HeaderPanelFactory.java
index a62e770b45..1e13a972fe 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/header/HeaderPanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/header/HeaderPanelFactory.java
@@ -18,11 +18,11 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.header;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
/**
* {@link org.apache.causeway.viewer.wicket.ui.ComponentFactory} to create container for the page header.
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/BSGridPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/BSGridPanelFactory.java
index 50f1cef734..24b55fd055 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/BSGridPanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/BSGridPanelFactory.java
@@ -22,12 +22,12 @@ import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.causeway.core.metamodel.util.Facets;
+import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory.ApplicationAdvice;
import org.apache.causeway.viewer.wicket.ui.components.entity.EntityComponentFactoryAbstract;
-import org.apache.causeway.viewer.commons.model.components.UiComponentType;
-
import lombok.val;
/**
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/col/Col.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/col/Col.java
index 14685a6924..d160937a4f 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/col/Col.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/col/Col.java
@@ -22,9 +22,6 @@ import java.util.List;
import java.util.function.Predicate;
import java.util.stream.Collectors;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -36,7 +33,11 @@ import org.apache.causeway.applib.layout.grid.bootstrap.BSCol;
import org.apache.causeway.applib.layout.grid.bootstrap.BSRow;
import org.apache.causeway.applib.layout.grid.bootstrap.BSTab;
import org.apache.causeway.applib.layout.grid.bootstrap.BSTabGroup;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.base._NullSafe;
+import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.core.metamodel.object.ManagedObject;
+import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
import org.apache.causeway.viewer.wicket.ui.components.actionmenu.entityactions.AdditionalLinksPanel;
@@ -49,8 +50,6 @@ import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.causeway.viewer.wicket.ui.util.WktComponents;
-import org.apache.causeway.viewer.commons.model.components.UiComponentType;
-
import lombok.val;
public class Col
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/col/RepeatingViewWithDynamicallyVisibleContent.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/col/RepeatingViewWithDynamicallyVisibleContent.java
index 9051da2d10..149df9babf 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/col/RepeatingViewWithDynamicallyVisibleContent.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/col/RepeatingViewWithDynamicallyVisibleContent.java
@@ -18,11 +18,12 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.layout.bs.col;
-import org.apache.causeway.viewer.wicket.ui.panels.HasDynamicallyVisibleContent;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.repeater.RepeatingView;
+import org.apache.causeway.viewer.wicket.ui.panels.HasDynamicallyVisibleContent;
+
public class RepeatingViewWithDynamicallyVisibleContent
extends RepeatingView
implements HasDynamicallyVisibleContent {
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 78b1fc5ac1..c287a12676 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
@@ -22,10 +22,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
-import org.apache.causeway.commons.internal.base._NullSafe;
-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 org.apache.wicket.extensions.markup.html.tabs.AbstractTab;
import org.apache.wicket.extensions.markup.html.tabs.ITab;
import org.apache.wicket.extensions.markup.html.tabs.TabbedPanel;
@@ -34,10 +30,13 @@ import org.apache.wicket.model.Model;
import org.apache.causeway.applib.layout.grid.bootstrap.BSTab;
import org.apache.causeway.applib.layout.grid.bootstrap.BSTabGroup;
-
-import lombok.val;
+import org.apache.causeway.commons.internal.base._NullSafe;
+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;
// hmmm... not sure how to make this implement HasDynamicallyVisibleContent
public class TabGroupPanel
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/property/PropertyEditForm.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/property/PropertyEditForm.java
index 3d83e350c9..b5a806e8cf 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/property/PropertyEditForm.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/property/PropertyEditForm.java
@@ -18,17 +18,17 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.property;
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+
import org.apache.causeway.commons.functional.Either;
import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.model.models.ActionModel;
import org.apache.causeway.viewer.wicket.model.models.ScalarPropertyModel;
import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarPanelAbstract;
import org.apache.causeway.viewer.wicket.ui.panels.PromptFormAbstract;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-
-import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/property/PropertyEditFormPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/property/PropertyEditFormPanelFactory.java
index e666eac75d..403c255f2e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/property/PropertyEditFormPanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/property/PropertyEditFormPanelFactory.java
@@ -18,13 +18,13 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.property;
-import org.apache.causeway.viewer.wicket.model.models.ScalarPropertyModel;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.wicket.model.models.ScalarPropertyModel;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
/**
* {@link ComponentFactory} for {@link PropertyEditFormPanel}.
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/property/PropertyEditPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/property/PropertyEditPanel.java
index ec6b26c7f1..e8c83a68e5 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/property/PropertyEditPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/property/PropertyEditPanel.java
@@ -22,15 +22,14 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.causeway.core.metamodel.commons.ScalarRepresentation;
import org.apache.causeway.core.metamodel.object.ManagedObject;
+import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.commons.model.hints.RenderingHint;
import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
import org.apache.causeway.viewer.wicket.model.models.ScalarPropertyModel;
import org.apache.causeway.viewer.wicket.ui.components.actions.ActionParametersPanel;
import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
-import org.apache.causeway.viewer.commons.model.components.UiComponentType;
-import org.apache.causeway.viewer.commons.model.hints.RenderingHint;
-
/**
* Corresponding component to prompt for action (parameters) is {@link ActionParametersPanel}.
*/
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/property/PropertyEditPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/property/PropertyEditPanelFactory.java
index a00544da26..4bc1f1c491 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/property/PropertyEditPanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/property/PropertyEditPanelFactory.java
@@ -18,13 +18,13 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.property;
-import org.apache.causeway.viewer.wicket.model.models.ScalarPropertyModel;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.wicket.model.models.ScalarPropertyModel;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
/**
* {@link ComponentFactory} for {@link PropertyEditPanel}.
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/propertyheader/PropertyEditPromptHeaderPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/propertyheader/PropertyEditPromptHeaderPanel.java
index 307fa806d6..b91cf1c129 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/propertyheader/PropertyEditPromptHeaderPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/propertyheader/PropertyEditPromptHeaderPanel.java
@@ -19,13 +19,12 @@
package org.apache.causeway.viewer.wicket.ui.components.propertyheader;
import org.apache.causeway.core.metamodel.object.ManagedObject;
+import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.model.models.ScalarPropertyModel;
import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
-import org.apache.causeway.viewer.commons.model.components.UiComponentType;
-
import lombok.val;
public class PropertyEditPromptHeaderPanel
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ComponentFactoryScalarAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ComponentFactoryScalarAbstract.java
index 989b01617f..30a12ed6c6 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ComponentFactoryScalarAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ComponentFactoryScalarAbstract.java
@@ -18,13 +18,14 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.scalars;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory.ApplicationAdvice;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
import lombok.Getter;
import lombok.val;
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 7a7526f343..637a982842 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
@@ -22,10 +22,6 @@ import java.util.Optional;
import java.util.function.Consumer;
import java.util.function.Function;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
-import org.apache.causeway.viewer.wicket.ui.util.Wkt;
-import org.apache.causeway.viewer.wicket.ui.util.WktComponents;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.html.form.FormComponent;
@@ -34,6 +30,11 @@ 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;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
+import org.apache.causeway.viewer.wicket.ui.util.Wkt;
+import org.apache.causeway.viewer.wicket.ui.util.WktComponents;
+
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.val;
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 ffefd45c0b..477761f36d 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
@@ -26,12 +26,6 @@ import java.util.Objects;
import java.util.Optional;
import java.util.function.Supplier;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.collections.ImmutableEnumSet;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.commons.internal.debug._Probe;
-import org.apache.causeway.commons.internal.debug._Probe.EntryPoint;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -43,11 +37,20 @@ import org.apache.wicket.model.IModel;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.annotation.ActionLayout;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.collections.ImmutableEnumSet;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.collections._Lists;
+import org.apache.causeway.commons.internal.debug._Probe;
+import org.apache.causeway.commons.internal.debug._Probe.EntryPoint;
import org.apache.causeway.core.metamodel.commons.ScalarRepresentation;
import org.apache.causeway.core.metamodel.facets.objectvalue.labelat.LabelAtFacet;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.ManagedObjects;
import org.apache.causeway.core.metamodel.util.Facets;
+import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.commons.model.decorators.FormLabelDecorator.FormLabelDecorationModel;
+import org.apache.causeway.viewer.commons.model.scalar.UiParameter;
import org.apache.causeway.viewer.wicket.model.links.LinkAndLabel;
import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
import org.apache.causeway.viewer.wicket.ui.components.actionmenu.entityactions.AdditionalLinksPanel;
@@ -59,23 +62,18 @@ import org.apache.causeway.viewer.wicket.ui.components.scalars.choices.ObjectCho
import org.apache.causeway.viewer.wicket.ui.components.scalars.choices.ValueChoicesSelect2Panel;
import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
+import org.apache.causeway.viewer.wicket.ui.util.Wkt.EventTopic;
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 org.apache.causeway.viewer.wicket.ui.util.Wkt.EventTopic;
-
-import org.apache.causeway.viewer.commons.model.components.UiComponentType;
-import org.apache.causeway.viewer.commons.model.decorators.FormLabelDecorator.FormLabelDecorationModel;
-import org.apache.causeway.viewer.commons.model.scalar.UiParameter;
+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
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 aea0434d2a..b52b9a284f 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
@@ -31,6 +31,7 @@ import org.springframework.lang.Nullable;
import org.apache.causeway.applib.services.placeholder.PlaceholderRenderService.PlaceholderLiteral;
import org.apache.causeway.core.metamodel.commons.ScalarRepresentation;
+import org.apache.causeway.viewer.commons.model.components.UiString;
import org.apache.causeway.viewer.wicket.model.models.InlinePromptContext;
import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
import org.apache.causeway.viewer.wicket.model.value.OptionsBasedOnValueSemantics;
@@ -44,14 +45,11 @@ 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 org.apache.causeway.viewer.commons.model.components.UiString;
-
+import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.fileinput.BootstrapFileInputField;
import lombok.AccessLevel;
import lombok.Getter;
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 2cc2e48d44..4bae3e4593 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
@@ -20,6 +20,13 @@ package org.apache.causeway.viewer.wicket.ui.components.scalars;
import java.util.Optional;
+import org.apache.wicket.Component;
+import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+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;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.collections._Maps;
@@ -33,12 +40,6 @@ import org.apache.causeway.viewer.wicket.ui.components.widgets.bootstrap.FormGro
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.causeway.viewer.wicket.ui.util.WktTooltips;
import org.apache.causeway.viewer.wicket.ui.util.XrayWkt;
-import org.apache.wicket.Component;
-import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.html.form.FormComponent;
-import org.apache.wicket.model.Model;
-import org.springframework.lang.Nullable;
import lombok.val;
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 d70ebb415e..e6ca79487d 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
@@ -28,15 +28,14 @@ import org.springframework.lang.Nullable;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.util.Facets;
+import org.apache.causeway.viewer.commons.model.components.UiString;
+import org.apache.causeway.viewer.commons.model.scalar.UiParameter;
import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
import org.apache.causeway.viewer.wicket.ui.components.widgets.select2.Select2;
import org.apache.causeway.viewer.wicket.ui.components.widgets.select2.providers.ChoiceProviderAbstract;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.causeway.viewer.wicket.ui.util.Wkt.EventTopic;
-import org.apache.causeway.viewer.commons.model.components.UiString;
-import org.apache.causeway.viewer.commons.model.scalar.UiParameter;
-
import lombok.NonNull;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
index 700e4762ca..9f3f92cc2f 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
@@ -20,21 +20,21 @@ package org.apache.causeway.viewer.wicket.ui.components.scalars;
import java.util.Optional;
-import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.wicket.markup.html.form.AbstractTextComponent;
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.model.IModel;
import org.apache.wicket.util.convert.IConverter;
+import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.causeway.core.metamodel.commons.ScalarRepresentation;
import org.apache.causeway.core.metamodel.spec.feature.ObjectFeature;
+import org.apache.causeway.viewer.commons.model.components.UiString;
import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.InputFragment;
+import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarPanelAbstract.FormatModifier;
import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
-import org.apache.causeway.viewer.commons.model.components.UiString;
-
import lombok.NonNull;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldTextualAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldTextualAbstract.java
index 627dcc4f0a..d2d3fa7fbf 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldTextualAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldTextualAbstract.java
@@ -25,6 +25,7 @@ import org.apache.wicket.util.convert.IConverter;
import org.apache.causeway.core.metamodel.commons.ScalarRepresentation;
import org.apache.causeway.core.metamodel.spec.feature.ObjectFeature;
import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
+import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarPanelAbstract.FormatModifier;
import lombok.NonNull;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/TextFieldAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/TextFieldAbstract.java
index 342a0bc841..ad10741367 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/TextFieldAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/TextFieldAbstract.java
@@ -18,11 +18,12 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.scalars;
-import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.IModel;
import org.apache.wicket.util.convert.IConverter;
+import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
+
public abstract class TextFieldAbstract<T> extends TextField<T> {
private static final long serialVersionUID = 1L;
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 f6d7096c6c..a0f235c147 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
@@ -21,15 +21,15 @@ package org.apache.causeway.viewer.wicket.ui.components.scalars;
import java.util.Collection;
import java.util.Optional;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.assertions._Assert;
-import org.apache.causeway.commons.internal.base._Strings;
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;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.assertions._Assert;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.objectmanager.memento.ObjectMemento;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/_Xray.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/_Xray.java
index ee217e6339..cdca43feb4 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/_Xray.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/_Xray.java
@@ -22,7 +22,6 @@ import java.util.stream.Collectors;
import org.apache.causeway.commons.internal.debug._XrayEvent;
import org.apache.causeway.commons.internal.debug.xray.XrayUi;
-
import org.apache.causeway.core.metamodel.object.MmDebugUtil;
import org.apache.causeway.viewer.wicket.model.util.PageParameterUtils;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/blobclob/CausewayBlobOrClobPanelAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/blobclob/CausewayBlobOrClobPanelAbstract.java
index e09d466dec..d55563aa7f 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/blobclob/CausewayBlobOrClobPanelAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/blobclob/CausewayBlobOrClobPanelAbstract.java
@@ -32,15 +32,14 @@ import org.apache.causeway.applib.services.placeholder.PlaceholderRenderService.
import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.applib.value.Clob;
import org.apache.causeway.applib.value.NamedWithMimeType;
+import org.apache.causeway.viewer.commons.model.components.UiString;
import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
-import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarPanelFormFieldAbstract;
import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.CompactFragment;
import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.InputFragment;
+import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarPanelFormFieldAbstract;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.causeway.viewer.wicket.ui.util.WktTooltips;
-import org.apache.causeway.viewer.commons.model.components.UiString;
-
import lombok.val;
public abstract class CausewayBlobOrClobPanelAbstract<T extends NamedWithMimeType>
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/blobclob/CausewayBlobPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/blobclob/CausewayBlobPanelFactory.java
index fdac6e4ca4..c43ab18378 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/blobclob/CausewayBlobPanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/blobclob/CausewayBlobPanelFactory.java
@@ -18,10 +18,11 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.scalars.blobclob;
+import org.apache.wicket.Component;
+
import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
import org.apache.causeway.viewer.wicket.ui.components.scalars.ComponentFactoryScalarAbstract;
-import org.apache.wicket.Component;
/**
* {@link ComponentFactory} for {@link CausewayBlobPanel}.
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/blobclob/CausewayClobPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/blobclob/CausewayClobPanelFactory.java
index 03beab2616..51fa8e1844 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/blobclob/CausewayClobPanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/blobclob/CausewayClobPanelFactory.java
@@ -18,10 +18,11 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.scalars.blobclob;
+import org.apache.wicket.Component;
+
import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
import org.apache.causeway.viewer.wicket.ui.components.scalars.ComponentFactoryScalarAbstract;
-import org.apache.wicket.Component;
/**
* {@link ComponentFactory} for {@link CausewayBlobPanel}.
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/bool/BooleanPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/bool/BooleanPanel.java
index 7b29a3d5df..6f22af8e4b 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/bool/BooleanPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/bool/BooleanPanel.java
@@ -20,19 +20,19 @@ package org.apache.causeway.viewer.wicket.ui.components.scalars.bool;
import java.util.Optional;
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.form.FormComponent;
+
import org.apache.causeway.commons.internal.exceptions._Exceptions;
+import org.apache.causeway.viewer.commons.model.components.UiString;
import org.apache.causeway.viewer.wicket.model.models.BooleanModel;
import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
-import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarPanelFormFieldAbstract;
import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.CompactFragment;
import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.InputFragment;
import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.PromptFragment;
+import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarPanelFormFieldAbstract;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.html.form.FormComponent;
-
-import org.apache.causeway.viewer.commons.model.components.UiString;
import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.checkboxx.CheckBoxX;
import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.checkboxx.CheckBoxXConfig;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/bool/BooleanPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/bool/BooleanPanelFactory.java
index 14edbc0f2c..977dd6c887 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/bool/BooleanPanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/bool/BooleanPanelFactory.java
@@ -18,10 +18,11 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.scalars.bool;
+import org.apache.wicket.Component;
+
import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
import org.apache.causeway.viewer.wicket.ui.components.scalars.ComponentFactoryScalarAbstract;
-import org.apache.wicket.Component;
/**
* {@link ComponentFactory} for {@link BooleanPanel}.
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/ChoicesSelect2PanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/ChoicesSelect2PanelFactory.java
index dc41b5bf2a..d2738a129f 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/ChoicesSelect2PanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/ChoicesSelect2PanelFactory.java
@@ -18,15 +18,15 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.scalars.choices;
+import org.apache.wicket.Component;
+import org.apache.wicket.model.IModel;
+
import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
+import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
import org.apache.causeway.viewer.wicket.ui.components.scalars.string.ScalarTitleBadgePanel;
-import org.apache.wicket.Component;
-import org.apache.wicket.model.IModel;
-
-import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/ObjectChoicesSelect2Panel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/ObjectChoicesSelect2Panel.java
index 2bf6879c52..cc0c89213b 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/ObjectChoicesSelect2Panel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/ObjectChoicesSelect2Panel.java
@@ -20,7 +20,6 @@ package org.apache.causeway.viewer.wicket.ui.components.scalars.choices;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
@@ -31,20 +30,20 @@ import org.apache.wicket.util.convert.ConversionException;
import org.apache.wicket.util.convert.IConverter;
import org.apache.causeway.applib.services.placeholder.PlaceholderRenderService.PlaceholderLiteral;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.object.ManagedObject;
+import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
-import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarPanelSelectAbstract;
import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.CompactFragment;
import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.FieldFrame;
import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.InputFragment;
+import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarPanelSelectAbstract;
import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarPanelSelectAbstract.ChoiceTitleHandler;
import org.apache.causeway.viewer.wicket.ui.components.widgets.entitysimplelink.EntityLinkSimplePanel;
import org.apache.causeway.viewer.wicket.ui.components.widgets.select2.providers.ChoiceProviderForReferences;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.causeway.viewer.wicket.ui.util.WktComponents;
-import org.apache.causeway.viewer.commons.model.components.UiComponentType;
-
import lombok.val;
/**
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/ValueChoicesSelect2Panel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/ValueChoicesSelect2Panel.java
index 5742a03599..e1a90e6bd3 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/ValueChoicesSelect2Panel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/ValueChoicesSelect2Panel.java
@@ -20,15 +20,15 @@ package org.apache.causeway.viewer.wicket.ui.components.scalars.choices;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.form.FormComponent;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
-import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarPanelSelectAbstract;
import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.InputFragment;
+import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarPanelSelectAbstract;
import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarPanelSelectAbstract.ChoiceTitleHandler;
import org.apache.causeway.viewer.wicket.ui.components.widgets.select2.providers.ChoiceProviderForValues;
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/scalars/composite/CompositeValuePanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/composite/CompositeValuePanel.java
index 1d9f95a89e..acc86400f3 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/composite/CompositeValuePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/composite/CompositeValuePanel.java
@@ -20,15 +20,16 @@ package org.apache.causeway.viewer.wicket.ui.components.scalars.composite;
import java.util.Optional;
+import org.apache.wicket.Component;
+import org.apache.wicket.markup.html.form.AbstractTextComponent;
+import org.apache.wicket.markup.html.form.FormComponent;
+
import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
-import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarPanelFormFieldAbstract;
import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.FieldFrame;
import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.InputFragment;
+import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarPanelFormFieldAbstract;
import org.apache.causeway.viewer.wicket.ui.components.scalars.markup.MarkupComponent;
import org.apache.causeway.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
-import org.apache.wicket.Component;
-import org.apache.wicket.markup.html.form.AbstractTextComponent;
-import org.apache.wicket.markup.html.form.FormComponent;
public class CompositeValuePanel<T>
extends ScalarPanelFormFieldAbstract<T> {
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 23a62d318c..64b4b84374 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;
@@ -32,8 +34,6 @@ import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
import org.apache.causeway.viewer.wicket.model.value.ConverterBasedOnValueSemantics;
-import lombok.val;
-
import de.agilecoders.wicket.core.util.Attributes;
import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.datetime.DatetimePickerConfig;
import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.datetime.DatetimePickerIconConfig;
@@ -41,8 +41,7 @@ import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome6I
import de.agilecoders.wicket.extensions.markup.html.bootstrap.references.DatetimePickerCssReference;
import de.agilecoders.wicket.extensions.markup.html.bootstrap.references.DatetimePickerJsReference;
import de.agilecoders.wicket.jquery.Config;
-
-import static de.agilecoders.wicket.jquery.JQuery.$;
+import lombok.val;
/**
* A text input field that is used as a date or date/time picker.
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 88e5883136..849545c4fb 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
@@ -18,12 +18,13 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.scalars.image;
-import org.apache.causeway.commons.internal.base._Strings;
import org.apache.wicket.feedback.ComponentFeedbackMessageFilter;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.Model;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.object.ManagedObject;
+import org.apache.causeway.viewer.commons.model.decorators.FormLabelDecorator.FormLabelDecorationModel;
import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarPanelAbstract;
import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
@@ -31,11 +32,8 @@ import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.causeway.viewer.wicket.ui.util.WktDecorators;
import org.apache.causeway.viewer.wicket.ui.util.WktTooltips;
-import org.apache.causeway.viewer.commons.model.decorators.FormLabelDecorator.FormLabelDecorationModel;
-
-import lombok.val;
-
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+import lombok.val;
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/JavaAwtImagePanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanelFactory.java
index 4d3f9ef1f8..1a7a2b6dd7 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanelFactory.java
@@ -23,11 +23,11 @@ import org.apache.wicket.model.IModel;
import org.apache.causeway.core.metamodel.util.Facets;
import org.apache.causeway.core.metamodel.valuesemantics.ImageValueSemantics;
+import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory.ApplicationAdvice;
import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
-import org.apache.causeway.viewer.commons.model.components.UiComponentType;
-
import lombok.val;
public class JavaAwtImagePanelFactory extends ComponentFactoryAbstract {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/WicketImageUtil.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/WicketImageUtil.java
index dfcc992426..db6312da7c 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/WicketImageUtil.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/WicketImageUtil.java
@@ -21,7 +21,6 @@ package org.apache.causeway.viewer.wicket.ui.components.scalars.image;
import java.awt.image.BufferedImage;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.wicket.extensions.markup.html.image.resource.ThumbnailImageResource;
import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.markup.html.image.NonCachingImage;
@@ -29,6 +28,7 @@ import org.apache.wicket.markup.html.image.resource.BufferedDynamicImageResource
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.value.Blob;
+import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.ManagedObjects;
import org.apache.causeway.core.metamodel.util.Facets;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/MarkupComponent.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/MarkupComponent.java
index 04b129f310..0310fd7990 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/MarkupComponent.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/MarkupComponent.java
@@ -32,11 +32,10 @@ import org.apache.causeway.applib.value.semantics.Renderer.SyntaxHighlighter;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.MmRenderUtil;
import org.apache.causeway.core.metamodel.spec.feature.ObjectFeature;
+import org.apache.causeway.viewer.commons.model.scalar.UiParameter;
import org.apache.causeway.viewer.wicket.model.models.ScalarPropertyModel;
import org.apache.causeway.viewer.wicket.model.models.ValueModel;
-import org.apache.causeway.viewer.commons.model.scalar.UiParameter;
-
import lombok.Builder;
import lombok.Value;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/MarkupPanelFactories.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/MarkupPanelFactories.java
index d6f2dd8788..ade26c804e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/MarkupPanelFactories.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/MarkupPanelFactories.java
@@ -25,13 +25,12 @@ import org.apache.wicket.model.IModel;
import org.apache.causeway.applib.value.Markup;
import org.apache.causeway.core.metamodel.object.ManagedObjects;
+import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
import org.apache.causeway.viewer.wicket.model.models.ValueModel;
import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
-import org.apache.causeway.viewer.commons.model.components.UiComponentType;
-
import lombok.val;
/**
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/ScalarMarkupPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/ScalarMarkupPanel.java
index a167a84d32..d593413558 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/ScalarMarkupPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/ScalarMarkupPanel.java
@@ -20,9 +20,11 @@ package org.apache.causeway.viewer.wicket.ui.components.scalars.markup;
import java.util.EnumSet;
+import org.apache.wicket.Component;
+
import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
+import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarPanelAbstract.FormatModifier;
import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldWithValueSemantics;
-import org.apache.wicket.Component;
/**
* Panel for rendering scalars of type {@link org.apache.causeway.applib.value.Markup}.
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 720b1e0c27..087de66910 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
@@ -18,11 +18,11 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.scalars.markup;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.value.semantics.Renderer.SyntaxHighlighter;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.viewer.commons.prism.Prism;
interface _HighlightBehavior {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/_HighlightBehaviorPrism.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/_HighlightBehaviorPrism.java
index a4ce9e3d8c..b5c84d64f3 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/_HighlightBehaviorPrism.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/_HighlightBehaviorPrism.java
@@ -20,13 +20,13 @@ package org.apache.causeway.viewer.wicket.ui.components.scalars.markup;
import java.util.List;
-import org.apache.causeway.viewer.wicket.ui.util.PrismResourcesWkt;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.causeway.viewer.commons.prism.Prism;
+import org.apache.causeway.viewer.wicket.ui.util.PrismResourcesWkt;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/passwd/CausewayPasswordPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/passwd/CausewayPasswordPanelFactory.java
index cd10ac095b..bf348dca30 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/passwd/CausewayPasswordPanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/passwd/CausewayPasswordPanelFactory.java
@@ -18,10 +18,11 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.scalars.passwd;
+import org.apache.wicket.Component;
+
import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
import org.apache.causeway.viewer.wicket.ui.components.scalars.ComponentFactoryScalarAbstract;
-import org.apache.wicket.Component;
/**
* {@link ComponentFactory} for {@link CausewayPasswordPanel}.
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/string/ScalarTitleBadgePanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/string/ScalarTitleBadgePanel.java
index d35c7c6208..8dd53a1e9f 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/string/ScalarTitleBadgePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/string/ScalarTitleBadgePanel.java
@@ -20,11 +20,13 @@ package org.apache.causeway.viewer.wicket.ui.components.scalars.string;
import java.util.EnumSet;
+import org.apache.wicket.Component;
+
import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
-import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldWithValueSemantics;
import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.CompactFragment;
+import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarPanelAbstract.FormatModifier;
+import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldWithValueSemantics;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
-import org.apache.wicket.Component;
/**
* Panel for rendering titles for scalars of any type.
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/value/fallback/ValueFallbackPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/value/fallback/ValueFallbackPanelFactory.java
index 0069f02072..29011b3171 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/value/fallback/ValueFallbackPanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/value/fallback/ValueFallbackPanelFactory.java
@@ -19,11 +19,12 @@
package org.apache.causeway.viewer.wicket.ui.components.scalars.value.fallback;
+import org.apache.wicket.Component;
+import org.apache.wicket.model.IModel;
+
import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
import org.apache.causeway.viewer.wicket.ui.components.scalars.ComponentFactoryScalarAbstract;
-import org.apache.wicket.Component;
-import org.apache.wicket.model.IModel;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
index 94f095c917..730eb84701 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
@@ -27,6 +27,7 @@ import org.apache.wicket.model.Model;
import org.apache.causeway.core.config.metamodel.facets.CollectionLayoutConfigOptions;
import org.apache.causeway.core.metamodel.interactions.managed.nonscalar.DataTableModel;
import org.apache.causeway.core.metamodel.util.Facets;
+import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel;
import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModelStandalone;
import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
@@ -38,8 +39,6 @@ import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.causeway.viewer.wicket.ui.util.WktComponents;
-import org.apache.causeway.viewer.commons.model.components.UiComponentType;
-
import lombok.val;
public class StandaloneCollectionPanel
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanelFactory.java
index b5e000ebda..7caa319edc 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanelFactory.java
@@ -18,13 +18,13 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.standalonecollection;
-import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModelStandalone;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModelStandalone;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/tree/CausewayToWicketTreeAdapter.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/tree/CausewayToWicketTreeAdapter.java
index 20fc9bf235..6849700fe6 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/tree/CausewayToWicketTreeAdapter.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/tree/CausewayToWicketTreeAdapter.java
@@ -28,8 +28,6 @@ import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import org.apache.causeway.commons.functional.IndexedFunction;
-import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -47,6 +45,8 @@ import org.apache.causeway.applib.graph.tree.TreeNode;
import org.apache.causeway.applib.graph.tree.TreePath;
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.factory.FactoryService;
+import org.apache.causeway.commons.functional.IndexedFunction;
+import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.ManagedObjects;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/tree/ParentedTreePanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/tree/ParentedTreePanel.java
index 41981fcb67..3eb60ce48b 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/tree/ParentedTreePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/tree/ParentedTreePanel.java
@@ -18,12 +18,13 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.tree;
-import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
-import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarPanelAbstract2;
-import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.FrameFragment;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
+import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
+import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.FrameFragment;
+import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarPanelAbstract2;
+
import lombok.val;
/**
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/tree/TreePanelFactories.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/tree/TreePanelFactories.java
index b12154d998..14802fd640 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/tree/TreePanelFactories.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/tree/TreePanelFactories.java
@@ -18,14 +18,15 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.tree;
-import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
-import org.apache.causeway.viewer.wicket.model.models.ValueModel;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
+import org.apache.causeway.viewer.wicket.model.models.ValueModel;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory.ApplicationAdvice;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/tree/themes/TreeThemeProviderDefault.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/tree/themes/TreeThemeProviderDefault.java
index 2b6022ca30..75d2b33ef1 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/tree/themes/TreeThemeProviderDefault.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/tree/themes/TreeThemeProviderDefault.java
@@ -18,9 +18,10 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.tree.themes;
-import org.apache.causeway.viewer.wicket.ui.components.tree.themes.bootstrap.WktBootstrapTreeTheme;
import org.apache.wicket.behavior.Behavior;
+import org.apache.causeway.viewer.wicket.ui.components.tree.themes.bootstrap.WktBootstrapTreeTheme;
+
public class TreeThemeProviderDefault implements TreeThemeProvider {
// other options as provided by wicket-extensions: WindowsTheme, HumanTheme
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/unknown/UnknownModelPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/unknown/UnknownModelPanel.java
index b900ab3a4f..c10f4994de 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/unknown/UnknownModelPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/unknown/UnknownModelPanel.java
@@ -18,9 +18,9 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.unknown;
-import org.apache.causeway.commons.internal.base._Casts;
import org.apache.wicket.model.IModel;
+import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.core.metamodel.object.ManagedObjects;
import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/unknown/UnknownModelPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/unknown/UnknownModelPanelFactory.java
index 366f670292..7399ab6082 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/unknown/UnknownModelPanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/unknown/UnknownModelPanelFactory.java
@@ -18,13 +18,14 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.unknown;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
-import org.apache.causeway.viewer.wicket.ui.panels.PanelUtil;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.resource.CssResourceReference;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory.ApplicationAdvice;
+import org.apache.causeway.viewer.wicket.ui.panels.PanelUtil;
public class UnknownModelPanelFactory implements ComponentFactory {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/value/StandaloneValuePanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/value/StandaloneValuePanelFactory.java
index a5a28acb5b..28cf6e4cf7 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/value/StandaloneValuePanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/value/StandaloneValuePanelFactory.java
@@ -18,13 +18,14 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.value;
-import org.apache.causeway.viewer.wicket.model.models.ValueModel;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.wicket.model.models.ValueModel;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory.ApplicationAdvice;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
/**
* {@link ComponentFactory} for rendering standalone values..
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/voidreturn/VoidReturnPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/voidreturn/VoidReturnPanel.java
index 60db4ce90b..fa8ae30067 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/voidreturn/VoidReturnPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/voidreturn/VoidReturnPanel.java
@@ -18,9 +18,10 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.voidreturn;
-import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.wicket.model.IModel;
+import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
+
public class VoidReturnPanel
extends PanelAbstract<Void, IModel<Void>> {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/voidreturn/VoidReturnPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/voidreturn/VoidReturnPanelFactory.java
index ea0c4f8284..b0c9b9b62f 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/voidreturn/VoidReturnPanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/voidreturn/VoidReturnPanelFactory.java
@@ -18,12 +18,13 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.voidreturn;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory.ApplicationAdvice;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
/**
* {@link ComponentFactory} to represent an action that returns void.
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/welcome/WelcomePanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/welcome/WelcomePanelFactory.java
index 36c4d554f0..97c17738ab 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/welcome/WelcomePanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/welcome/WelcomePanelFactory.java
@@ -18,13 +18,13 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.welcome;
-import org.apache.causeway.viewer.wicket.model.models.WelcomeModel;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
-import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.wicket.model.models.WelcomeModel;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
/**
* {@link ComponentFactory} for {@link WelcomePanel}.
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 185f682e7f..89ff0f0780 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,8 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.util.lang.Args;
-import lombok.Getter;
-
import de.agilecoders.wicket.core.util.Attributes;
+import lombok.Getter;
/**
* A container around Bootstrap form component that sets
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/bootstrap/ModalDialog.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/bootstrap/ModalDialog.java
index 0374b24276..f099fc6230 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/bootstrap/ModalDialog.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/bootstrap/ModalDialog.java
@@ -18,14 +18,15 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.widgets.bootstrap;
-import org.apache.causeway.viewer.wicket.model.models.ActionPrompt;
-import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.model.IModel;
+import org.apache.causeway.viewer.wicket.model.models.ActionPrompt;
+import org.apache.causeway.viewer.wicket.ui.util.Wkt;
+
import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
import de.agilecoders.wicket.extensions.markup.html.bootstrap.behavior.Draggable;
import de.agilecoders.wicket.extensions.markup.html.bootstrap.behavior.DraggableConfig;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
index e7614d11f6..b545c7e80d 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
@@ -23,11 +23,11 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.causeway.applib.services.bookmark.Bookmark;
+import org.apache.causeway.commons.internal.collections._Lists;
+import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.viewer.wicket.model.mementos.PageParameterNames;
import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
index c46b3a8e68..f6eff1bc4c 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
@@ -22,8 +22,6 @@ import java.util.Collection;
import java.util.List;
import java.util.function.Predicate;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.model.IModel;
@@ -35,6 +33,8 @@ import org.wicketstuff.select2.Select2Choice;
import org.wicketstuff.select2.Settings;
import org.apache.causeway.applib.services.bookmark.Bookmark;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.viewer.wicket.model.mementos.PageParameterNames;
import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/buttons/ContainedButtonPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/buttons/ContainedButtonPanel.java
index 27c197a12e..a20118b4a1 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/buttons/ContainedButtonPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/buttons/ContainedButtonPanel.java
@@ -20,9 +20,6 @@ package org.apache.causeway.viewer.wicket.ui.components.widgets.buttons;
import java.util.List;
-import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
-import org.apache.causeway.viewer.wicket.ui.util.WktComponents;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
@@ -31,6 +28,10 @@ import org.apache.wicket.markup.html.form.Button;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.model.Model;
+import org.apache.causeway.commons.internal.collections._Lists;
+import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
+import org.apache.causeway.viewer.wicket.ui.util.WktComponents;
+
/**
* A button contained within its own form.
*/
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.java
index 7d7abc1035..b6376bb7ae 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.java
@@ -18,15 +18,16 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.widgets.checkbox;
-import org.apache.causeway.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.GenericToggleboxColumn.BulkToggle;
-import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
-import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.danekja.java.util.function.serializable.SerializableBiConsumer;
+import org.apache.causeway.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.GenericToggleboxColumn.BulkToggle;
+import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
+import org.apache.causeway.viewer.wicket.ui.util.Wkt;
+
import lombok.val;
/**
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.java
index 5e8410bd7d..0a3e0a94e0 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.java
@@ -18,7 +18,6 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.widgets.entitysimplelink;
-import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.markup.html.form.FormComponentPanel;
@@ -27,16 +26,16 @@ import org.apache.wicket.model.IModel;
import org.apache.causeway.applib.services.i18n.TranslationContext;
import org.apache.causeway.applib.services.placeholder.PlaceholderRenderService;
import org.apache.causeway.applib.services.placeholder.PlaceholderRenderService.PlaceholderLiteral;
+import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.ManagedObjects;
+import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.ui.components.widgets.formcomponent.CancelHintRequired;
import org.apache.causeway.viewer.wicket.ui.components.widgets.formcomponent.FormComponentPanelAbstract;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
-import org.apache.causeway.viewer.commons.model.components.UiComponentType;
-
import lombok.val;
/**
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanelFactory.java
index d96c7b230d..29ee1aa73e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanelFactory.java
@@ -22,12 +22,12 @@ import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.causeway.core.metamodel.object.ManagedObject;
+import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
+import org.apache.causeway.viewer.wicket.ui.ComponentFactory.ApplicationAdvice;
import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
-import org.apache.causeway.viewer.commons.model.components.UiComponentType;
-
public class EntityLinkSimplePanelFactory extends ComponentFactoryAbstract {
private static final long serialVersionUID = 1L;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
index 6999b117aa..126780d28b 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
@@ -18,10 +18,6 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.widgets.formcomponent;
-import org.apache.causeway.viewer.wicket.model.hints.UiHintContainer;
-import org.apache.causeway.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
-import org.apache.causeway.viewer.wicket.ui.app.registry.HasComponentFactoryRegistry;
-import org.apache.causeway.viewer.wicket.ui.util.WktComponents;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.html.form.FormComponent;
@@ -29,6 +25,10 @@ import org.apache.wicket.markup.html.form.FormComponentPanel;
import org.apache.wicket.model.IModel;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.wicket.model.hints.UiHintContainer;
+import org.apache.causeway.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
+import org.apache.causeway.viewer.wicket.ui.app.registry.HasComponentFactoryRegistry;
+import org.apache.causeway.viewer.wicket.ui.util.WktComponents;
/**
* Convenience adapter for {@link FormComponent}s that are implemented using the
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java
index e4a88337c0..d03e6a870f 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java
@@ -18,8 +18,6 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.widgets.linkandlabel;
-import org.apache.causeway.commons.internal.debug._Probe;
-import org.apache.causeway.commons.internal.debug._Probe.EntryPoint;
import org.apache.wicket.Application;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
@@ -28,12 +26,13 @@ import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.request.cycle.RequestCycle;
-import static org.apache.causeway.commons.internal.base._Casts.castTo;
-
+import org.apache.causeway.commons.internal.debug._Probe;
+import org.apache.causeway.commons.internal.debug._Probe.EntryPoint;
import org.apache.causeway.core.config.CausewayConfiguration.Viewer.Wicket;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
+import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.model.models.ActionModel;
import org.apache.causeway.viewer.wicket.model.models.ActionPromptProvider;
import org.apache.causeway.viewer.wicket.model.models.ActionPromptWithExtraContent;
@@ -49,7 +48,7 @@ import org.apache.causeway.viewer.wicket.ui.panels.FormExecutorDefault;
import org.apache.causeway.viewer.wicket.ui.panels.PanelUtil;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
-import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import static org.apache.causeway.commons.internal.base._Casts.castTo;
import lombok.NonNull;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/links/AjaxLinkNoPropagate.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/links/AjaxLinkNoPropagate.java
index d1fc50a87f..ee70fb16df 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/links/AjaxLinkNoPropagate.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/links/AjaxLinkNoPropagate.java
@@ -18,7 +18,6 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.widgets.links;
-import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -28,6 +27,8 @@ import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.markup.ComponentTag;
import org.danekja.java.util.function.serializable.SerializableConsumer;
+import org.apache.causeway.viewer.wicket.ui.util.Wkt;
+
import lombok.Getter;
import lombok.Setter;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/navbar/AvatarImage.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/navbar/AvatarImage.java
index f1935e0c51..7d0865d4d1 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/navbar/AvatarImage.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/navbar/AvatarImage.java
@@ -18,10 +18,10 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.widgets.navbar;
-import org.apache.causeway.viewer.wicket.ui.components.WebComponentBase;
import org.apache.wicket.markup.ComponentTag;
import org.apache.causeway.viewer.commons.applib.services.userprof.UserProfileUiModel;
+import org.apache.causeway.viewer.wicket.ui.components.WebComponentBase;
/**
* A component used as a brand logo in the top-left corner of the navigation bar
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java
index 1745eb25bb..a4135c2941 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java
@@ -18,10 +18,10 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.widgets.navbar;
-import org.apache.causeway.viewer.wicket.ui.components.WebComponentBase;
import org.apache.wicket.markup.ComponentTag;
import org.apache.causeway.viewer.commons.applib.services.branding.BrandingUiModel;
+import org.apache.causeway.viewer.wicket.ui.components.WebComponentBase;
/**
* A component used as a brand logo in the top-left corner of the navigation bar
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/navbar/BrandName.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/navbar/BrandName.java
index 535ae638e1..7b8458313e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/navbar/BrandName.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/navbar/BrandName.java
@@ -18,10 +18,10 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.widgets.navbar;
-import org.apache.causeway.viewer.wicket.ui.components.LabelBase;
import org.apache.wicket.model.Model;
import org.apache.causeway.viewer.commons.applib.services.branding.BrandingUiModel;
+import org.apache.causeway.viewer.wicket.ui.components.LabelBase;
/**
* A component used as a brand logo in the top-left corner of the navigation bar
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/Select2.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/Select2.java
index 7b63221452..7d8a4a4600 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/Select2.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/Select2.java
@@ -21,7 +21,6 @@ package org.apache.causeway.viewer.wicket.ui.components.widgets.select2;
import java.io.Serializable;
import java.util.List;
-import org.apache.causeway.commons.functional.Either;
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LambdaModel;
@@ -31,6 +30,7 @@ import org.wicketstuff.select2.AbstractSelect2Choice;
import org.wicketstuff.select2.Select2Choice;
import org.wicketstuff.select2.Select2MultiChoice;
+import org.apache.causeway.commons.functional.Either;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.objectmanager.memento.ObjectMemento;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/Select2MultiChoiceExt.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/Select2MultiChoiceExt.java
index 3de6c0af10..ac9e7b467d 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/Select2MultiChoiceExt.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/Select2MultiChoiceExt.java
@@ -21,12 +21,12 @@ package org.apache.causeway.viewer.wicket.ui.components.widgets.select2;
import java.util.ArrayList;
import java.util.Collection;
-import org.apache.causeway.commons.internal.base._Casts;
import org.apache.wicket.model.IModel;
import org.wicketstuff.select2.Select2MultiChoice;
import org.apache.causeway.applib.id.HasLogicalType;
import org.apache.causeway.applib.id.LogicalType;
+import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.core.metamodel.objectmanager.memento.ObjectMemento;
import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
import org.apache.causeway.viewer.wicket.ui.components.widgets.select2.providers.ChoiceProviderAbstract;
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 802d3a24c0..8e2d4da9ed 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
@@ -23,10 +23,6 @@ import java.util.Collection;
import java.util.List;
import java.util.Optional;
-import org.apache.causeway.commons.binding.Bindable;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.debug._XrayEvent;
-import org.apache.causeway.commons.internal.debug.xray.XrayUi;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.AbstractAjaxBehavior;
@@ -38,6 +34,10 @@ import org.apache.wicket.request.mapper.parameter.INamedParameters.NamedPair;
import org.springframework.lang.Nullable;
import org.wicketstuff.select2.JQuery;
+import org.apache.causeway.commons.binding.Bindable;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.debug._XrayEvent;
+import org.apache.causeway.commons.internal.debug.xray.XrayUi;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.PackedManagedObject;
import org.apache.causeway.core.metamodel.objectmanager.memento.ObjectMemento;
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 97edf2384f..ce610b0995 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
@@ -21,14 +21,14 @@ package org.apache.causeway.viewer.wicket.ui.components.widgets.select2.provider
import java.util.Collection;
import java.util.stream.Collectors;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.wicket.util.string.Strings;
import org.springframework.lang.Nullable;
import org.wicketstuff.select2.ChoiceProvider;
import org.apache.causeway.applib.services.i18n.TranslationContext;
import org.apache.causeway.applib.services.placeholder.PlaceholderRenderService.PlaceholderLiteral;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.objectmanager.memento.ObjectMemento;
import org.apache.causeway.core.metamodel.objectmanager.memento.ObjectMementoForEmpty;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/providers/ChoiceProviderForReferences.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/providers/ChoiceProviderForReferences.java
index c9006d40a1..685ecdffd0 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/providers/ChoiceProviderForReferences.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/providers/ChoiceProviderForReferences.java
@@ -20,13 +20,11 @@ package org.apache.causeway.viewer.wicket.ui.components.widgets.select2.provider
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._NullSafe;
-
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.objectmanager.memento.ObjectMemento;
import org.apache.causeway.core.metamodel.util.Facets;
-import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
-
import org.apache.causeway.viewer.commons.model.scalar.UiParameter;
+import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/providers/ChoiceProviderForValues.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/providers/ChoiceProviderForValues.java
index 75ee1f9e75..e967d20f81 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/providers/ChoiceProviderForValues.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/providers/ChoiceProviderForValues.java
@@ -19,7 +19,6 @@
package org.apache.causeway.viewer.wicket.ui.components.widgets.select2.providers;
import org.apache.causeway.commons.collections.Can;
-
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.objectmanager.memento.ObjectMemento;
import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
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 88af7cf698..dec6f47f09 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
@@ -26,22 +26,21 @@ import javax.annotation.Priority;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.base._Lazy;
-import org.apache.causeway.commons.internal.base._NullSafe;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.base._Lazy;
+import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.core.config.CausewayConfiguration;
-import lombok.val;
-import lombok.extern.log4j.Log4j2;
-
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 39c9375bca..4e20e0adcb 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
@@ -20,8 +20,6 @@ package org.apache.causeway.viewer.wicket.ui.components.widgets.themepicker;
import javax.inject.Inject;
-import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
-import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.model.IModel;
@@ -29,8 +27,8 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.util.cookies.CookieUtils;
import org.apache.wicket.util.string.Strings;
-import lombok.Getter;
-import lombok.val;
+import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
+import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import de.agilecoders.wicket.core.Bootstrap;
import de.agilecoders.wicket.core.settings.ActiveThemeProvider;
@@ -42,6 +40,8 @@ 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 ddfdff3417..344759eb42 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
@@ -23,18 +23,18 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+import org.apache.wicket.util.string.Strings;
+
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.commons.internal.collections._Maps;
-import org.apache.wicket.util.string.Strings;
+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/components/widgets/zclip/SimpleClipboardModalWindowPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowPanel.java
index 8492982405..ac6a5f5c1c 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowPanel.java
@@ -18,9 +18,10 @@
*/
package org.apache.causeway.viewer.wicket.ui.components.widgets.zclip;
-import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.wicket.model.Model;
+import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
+
public class SimpleClipboardModalWindowPanel
extends PanelAbstract<String, Model<String>> {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java
index ba68f6b3f4..93052e35c9 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java
@@ -26,12 +26,11 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.causeway.core.metamodel.commons.ScalarRepresentation;
import org.apache.causeway.core.metamodel.object.ManagedObject;
+import org.apache.causeway.viewer.commons.model.hints.RenderingHint;
import org.apache.causeway.viewer.wicket.model.models.ObjectAdapterModel;
import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
-import org.apache.causeway.viewer.commons.model.hints.RenderingHint;
-
import de.agilecoders.wicket.jquery.util.Strings2;
public class ZeroClipboardPanel
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/ExceptionModel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/ExceptionModel.java
index eae47911a9..247e5a3480 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/ExceptionModel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/ExceptionModel.java
@@ -21,14 +21,13 @@ package org.apache.causeway.viewer.wicket.ui.errors;
import java.util.List;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
-
import org.apache.causeway.applib.exceptions.UnrecoverableException;
import org.apache.causeway.applib.services.error.ErrorReportingService;
import org.apache.causeway.applib.services.error.Ticket;
import org.apache.causeway.applib.services.exceprecog.Recognition;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.commons.internal.collections._Lists;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.spec.feature.ObjectMember;
import org.apache.causeway.viewer.wicket.model.models.ModelAbstract;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/JGrowlBehaviour.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/JGrowlBehaviour.java
index 581f38f99c..40f0c6861c 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/JGrowlBehaviour.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/JGrowlBehaviour.java
@@ -18,7 +18,6 @@
*/
package org.apache.causeway.viewer.wicket.ui.errors;
-import org.apache.causeway.commons.internal.base._Strings;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -28,6 +27,7 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.causeway.applib.exceptions.RecoverableException;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.services.message.MessageBroker;
import org.apache.causeway.viewer.wicket.model.models.HasCommonContext;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/JGrowlUtil.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/JGrowlUtil.java
index 21e73abd55..7919d63ccc 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/JGrowlUtil.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/JGrowlUtil.java
@@ -18,9 +18,9 @@
*/
package org.apache.causeway.viewer.wicket.ui.errors;
-import org.apache.causeway.commons.internal.base._Text;
import org.apache.wicket.util.string.Strings;
+import org.apache.causeway.commons.internal.base._Text;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.services.message.MessageBroker;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/StackTraceListView.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/StackTraceListView.java
index 64d5330433..a2146a072c 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/StackTraceListView.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/StackTraceListView.java
@@ -20,11 +20,12 @@ package org.apache.causeway.viewer.wicket.ui.errors;
import java.util.List;
-import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
+import org.apache.causeway.viewer.wicket.ui.util.Wkt;
+
public final class StackTraceListView
extends ListView<StackTraceDetail> {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/EmailVerificationUrlService.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/EmailVerificationUrlService.java
index 3ad2873a39..84cc1a2430 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/EmailVerificationUrlService.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/EmailVerificationUrlService.java
@@ -20,9 +20,10 @@ package org.apache.causeway.viewer.wicket.ui.pages;
import java.io.Serializable;
-import org.apache.causeway.viewer.wicket.model.models.PageType;
import org.apache.wicket.Page;
+import org.apache.causeway.viewer.wicket.model.models.PageType;
+
/**
* A Wicket specific service that may be used to create a link to a
* page by {@link org.apache.causeway.viewer.wicket.model.models.PageType page type}
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 63b9bb1e94..c87f21d9a6 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
@@ -22,10 +22,35 @@ import java.util.Iterator;
import java.util.List;
import java.util.Optional;
+import org.apache.wicket.Component;
+import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.Page;
+import org.apache.wicket.RestartResponseAtInterceptPageException;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.behavior.Behavior;
+import org.apache.wicket.devutils.debugbar.DebugBar;
+import org.apache.wicket.devutils.debugbar.IDebugBarContributor;
+import org.apache.wicket.devutils.debugbar.InspectorDebugPanel;
+import org.apache.wicket.event.Broadcast;
+import org.apache.wicket.markup.head.CssReferenceHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.markup.head.JavaScriptReferenceHeaderItem;
+import org.apache.wicket.markup.head.PriorityHeaderItem;
+import org.apache.wicket.markup.head.filter.HeaderResponseContainer;
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.markup.html.panel.EmptyPanel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import org.apache.causeway.applib.annotation.PromptStyle;
+import org.apache.causeway.applib.services.exceprecog.ExceptionRecognizerService;
+import org.apache.causeway.applib.services.metamodel.BeanSort;
import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.commons.internal.base._Timing;
import org.apache.causeway.commons.internal.debug._Debug;
import org.apache.causeway.commons.internal.debug.xray.XrayUi;
+import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.model.hints.CausewayEnvelopeEvent;
import org.apache.causeway.viewer.wicket.model.hints.CausewayEventLetterAbstract;
import org.apache.causeway.viewer.wicket.model.hints.UiHintContainer;
@@ -57,37 +82,11 @@ import org.apache.causeway.viewer.wicket.ui.pages.common.sidebar.css.SidebarCssR
import org.apache.causeway.viewer.wicket.ui.pages.common.viewer.js.CausewayWicketViewerJsResourceReference;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.causeway.viewer.wicket.ui.util.Wkt.EventTopic;
-import org.apache.wicket.Component;
-import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.Page;
-import org.apache.wicket.RestartResponseAtInterceptPageException;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.behavior.Behavior;
-import org.apache.wicket.devutils.debugbar.DebugBar;
-import org.apache.wicket.devutils.debugbar.IDebugBarContributor;
-import org.apache.wicket.devutils.debugbar.InspectorDebugPanel;
-import org.apache.wicket.event.Broadcast;
-import org.apache.wicket.markup.head.CssReferenceHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.head.JavaScriptReferenceHeaderItem;
-import org.apache.wicket.markup.head.PriorityHeaderItem;
-import org.apache.wicket.markup.head.filter.HeaderResponseContainer;
-import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.markup.html.panel.EmptyPanel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import org.apache.causeway.applib.annotation.PromptStyle;
-import org.apache.causeway.applib.services.exceprecog.ExceptionRecognizerService;
-import org.apache.causeway.applib.services.metamodel.BeanSort;
-import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+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/PageClassRegistry.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/PageClassRegistry.java
index 63444a6ae3..209985da27 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/PageClassRegistry.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/PageClassRegistry.java
@@ -20,9 +20,10 @@ package org.apache.causeway.viewer.wicket.ui.pages;
import java.io.Serializable;
-import org.apache.causeway.viewer.wicket.model.models.PageType;
import org.apache.wicket.Page;
+import org.apache.causeway.viewer.wicket.model.models.PageType;
+
/**
* Registry of the {@link Page} class to use for each {@link PageType}.
*/
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/PageClassRegistrySpi.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/PageClassRegistrySpi.java
index b95955bdce..a697fe38a1 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/PageClassRegistrySpi.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/PageClassRegistrySpi.java
@@ -18,9 +18,10 @@
*/
package org.apache.causeway.viewer.wicket.ui.pages;
-import org.apache.causeway.viewer.wicket.model.models.PageType;
import org.apache.wicket.Page;
+import org.apache.causeway.viewer.wicket.model.models.PageType;
+
/**
* Used by {@link PageClassList} implementations to add pages into the registry.
*/
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/PageNavigationService.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/PageNavigationService.java
index d92b94e0f9..33d09e7b26 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/PageNavigationService.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/PageNavigationService.java
@@ -20,9 +20,10 @@ package org.apache.causeway.viewer.wicket.ui.pages;
import java.io.Serializable;
-import org.apache.causeway.viewer.wicket.model.models.PageType;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.causeway.viewer.wicket.model.models.PageType;
+
/**
* A service helping with the navigation to pages by type
*/
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/WebPageBase.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/WebPageBase.java
index da8ce96e41..1c73f1da0b 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/WebPageBase.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/WebPageBase.java
@@ -18,13 +18,13 @@
*/
package org.apache.causeway.viewer.wicket.ui.pages;
-import org.apache.causeway.commons.internal.base._Strings;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.MetaDataHeaderItem;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.viewer.wicket.model.models.HasCommonContext;
import org.apache.causeway.viewer.wicket.model.util.WktContext;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/about/AboutPage.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/about/AboutPage.java
index f26d9a051b..706ef33f2f 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/about/AboutPage.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/about/AboutPage.java
@@ -18,10 +18,10 @@
*/
package org.apache.causeway.viewer.wicket.ui.pages.about;
-import org.apache.causeway.viewer.wicket.ui.pages.PageAbstract;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.wicket.ui.pages.PageAbstract;
/**
* Web page representing the about page.
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 15735d07f7..0e79a2633d 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,14 +18,6 @@
*/
package org.apache.causeway.viewer.wicket.ui.pages.accmngt;
-import org.apache.causeway.viewer.wicket.model.models.PageType;
-import org.apache.causeway.viewer.wicket.ui.components.widgets.navbar.BrandLogo;
-import org.apache.causeway.viewer.wicket.ui.components.widgets.navbar.BrandName;
-import org.apache.causeway.viewer.wicket.ui.errors.ExceptionModel;
-import org.apache.causeway.viewer.wicket.ui.errors.ExceptionStackTracePanel;
-import org.apache.causeway.viewer.wicket.ui.pages.PageAbstract;
-import org.apache.causeway.viewer.wicket.ui.pages.WebPageBase;
-import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.wicket.Application;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Page;
@@ -40,11 +32,18 @@ import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.causeway.viewer.commons.applib.services.branding.BrandingUiService;
-
-import lombok.val;
+import org.apache.causeway.viewer.wicket.model.models.PageType;
+import org.apache.causeway.viewer.wicket.ui.components.widgets.navbar.BrandLogo;
+import org.apache.causeway.viewer.wicket.ui.components.widgets.navbar.BrandName;
+import org.apache.causeway.viewer.wicket.ui.errors.ExceptionModel;
+import org.apache.causeway.viewer.wicket.ui.errors.ExceptionStackTracePanel;
+import org.apache.causeway.viewer.wicket.ui.pages.PageAbstract;
+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;
/**
* Boilerplate, pick up our HTML and CSS.
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/EmailVerificationUrlServiceDefault.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/EmailVerificationUrlServiceDefault.java
index 6a8c5e15b1..19300e69c3 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/EmailVerificationUrlServiceDefault.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/EmailVerificationUrlServiceDefault.java
@@ -22,9 +22,6 @@ import java.util.UUID;
import javax.inject.Inject;
-import org.apache.causeway.viewer.wicket.model.models.PageType;
-import org.apache.causeway.viewer.wicket.ui.pages.EmailVerificationUrlService;
-import org.apache.causeway.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.wicket.Application;
import org.apache.wicket.Page;
import org.apache.wicket.request.Url;
@@ -32,6 +29,10 @@ import org.apache.wicket.request.UrlRenderer;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.causeway.viewer.wicket.model.models.PageType;
+import org.apache.causeway.viewer.wicket.ui.pages.EmailVerificationUrlService;
+import org.apache.causeway.viewer.wicket.ui.pages.PageClassRegistry;
+
/**
* An implementation of {@link org.apache.causeway.viewer.wicket.ui.pages.EmailVerificationUrlService}
* that uses Wicket's the current {@link org.apache.wicket.request.cycle.RequestCycle} to create the link and
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 97a1edc8d2..adeb51f234 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
@@ -20,11 +20,12 @@ package org.apache.causeway.viewer.wicket.ui.pages.accmngt;
import java.util.function.Consumer;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.functions._Functions;
import org.apache.wicket.util.cookies.CookieUtils;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.functions._Functions;
+
import lombok.NonNull;
import lombok.val;
import lombok.experimental.UtilityClass;
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 8c9bc16e9a..c6c15cb437 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,8 @@ 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 lombok.val;
-
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+import lombok.val;
/**
* 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 2ea20cae47..955dc50109 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,10 +35,9 @@ 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/accmngt/signup/RegistrationFormPage.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.java
index 9927a348f1..14e12dc338 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.java
@@ -20,11 +20,12 @@ package org.apache.causeway.viewer.wicket.ui.pages.accmngt.signup;
import javax.inject.Inject;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
import org.apache.causeway.viewer.wicket.model.models.PageType;
import org.apache.causeway.viewer.wicket.ui.errors.ExceptionModel;
import org.apache.causeway.viewer.wicket.ui.pages.PageNavigationService;
import org.apache.causeway.viewer.wicket.ui.pages.accmngt.AccountManagementPageAbstract;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
/**
* A page for self-registering a new user after confirmation of her email account.
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 4b9b4b3dd5..595c6997e0 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,12 +27,11 @@ 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 235ac1c517..9aaaa67543 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,11 +21,10 @@ 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 a05a45a5df..cc152525ef 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,11 +21,10 @@ 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 233e5f5e27..bb35fdbe6a 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,11 +22,10 @@ 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 ae99612cdc..44434409d9 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,11 +22,10 @@ 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 39f91dc340..1a7e75d409 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,11 +22,10 @@ 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/entity/EntityPage.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/entity/EntityPage.java
index 596f6a184c..7315353908 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/entity/EntityPage.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/entity/EntityPage.java
@@ -18,6 +18,17 @@
*/
package org.apache.causeway.viewer.wicket.ui.pages.entity;
+import org.apache.wicket.Application;
+import org.apache.wicket.RestartResponseException;
+import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.repeater.RepeatingView;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.request.resource.CssResourceReference;
+
import org.apache.causeway.applib.services.user.UserMemento;
import org.apache.causeway.commons.internal.debug._Debug;
import org.apache.causeway.commons.internal.debug.xray.XrayUi;
@@ -35,16 +46,6 @@ import org.apache.causeway.viewer.wicket.model.util.PageParameterUtils;
import org.apache.causeway.viewer.wicket.ui.components.entity.icontitle.EntityIconAndTitlePanel;
import org.apache.causeway.viewer.wicket.ui.pages.PageAbstract;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
-import org.apache.wicket.Application;
-import org.apache.wicket.RestartResponseException;
-import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.repeater.RepeatingView;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.request.resource.CssResourceReference;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/error/ErrorPage.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/error/ErrorPage.java
index 08359a861c..c105d1b4b4 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/error/ErrorPage.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/error/ErrorPage.java
@@ -20,18 +20,18 @@ package org.apache.causeway.viewer.wicket.ui.pages.error;
import java.util.List;
-import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.viewer.wicket.model.util.PageParameterUtils;
-import org.apache.causeway.viewer.wicket.ui.errors.ExceptionModel;
-import org.apache.causeway.viewer.wicket.ui.errors.ExceptionStackTracePanel;
-import org.apache.causeway.viewer.wicket.ui.errors.StackTraceDetail;
-import org.apache.causeway.viewer.wicket.ui.pages.PageAbstract;
import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
import org.apache.causeway.applib.services.error.ErrorDetails;
import org.apache.causeway.applib.services.error.ErrorReportingService;
import org.apache.causeway.applib.services.error.Ticket;
import org.apache.causeway.applib.services.user.UserMemento;
+import org.apache.causeway.commons.internal.collections._Lists;
+import org.apache.causeway.viewer.wicket.model.util.PageParameterUtils;
+import org.apache.causeway.viewer.wicket.ui.errors.ExceptionModel;
+import org.apache.causeway.viewer.wicket.ui.errors.ExceptionStackTracePanel;
+import org.apache.causeway.viewer.wicket.ui.errors.StackTraceDetail;
+import org.apache.causeway.viewer.wicket.ui.pages.PageAbstract;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/home/HomePage.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/home/HomePage.java
index 924d186056..d9b6690ae4 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/home/HomePage.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/home/HomePage.java
@@ -25,13 +25,12 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.causeway.applib.services.message.MessageService;
import org.apache.causeway.applib.services.user.UserMemento;
import org.apache.causeway.core.metamodel.object.ManagedObjects;
+import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbModelProvider;
import org.apache.causeway.viewer.wicket.ui.pages.PageAbstract;
import org.apache.causeway.viewer.wicket.ui.pages.entity.EntityPage;
import org.apache.causeway.viewer.wicket.ui.util.WktComponents;
-import org.apache.causeway.viewer.commons.model.components.UiComponentType;
-
import lombok.val;
/**
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 5049cebb2d..788ff6f4ad 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
@@ -23,11 +23,6 @@ import java.util.Optional;
import javax.inject.Inject;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.assertions._Assert;
-import org.apache.causeway.viewer.wicket.model.causeway.HasAmendableInteractionContext;
-import org.apache.causeway.viewer.wicket.model.models.PageType;
-import org.apache.causeway.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
@@ -39,12 +34,16 @@ import org.apache.causeway.applib.services.registry.ServiceRegistry;
import org.apache.causeway.applib.services.user.UserCurrentSessionTimeZoneHolder;
import org.apache.causeway.applib.services.userreg.EmailNotificationService;
import org.apache.causeway.applib.services.userreg.UserRegistrationService;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.assertions._Assert;
+import org.apache.causeway.viewer.wicket.model.causeway.HasAmendableInteractionContext;
+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/pages/login/SignInPanelAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/login/SignInPanelAbstract.java
index ebf04a4b95..bd83520988 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/login/SignInPanelAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/login/SignInPanelAbstract.java
@@ -23,7 +23,6 @@ import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
-import org.apache.causeway.commons.internal.base._Strings;
import org.apache.wicket.RestartResponseException;
import org.apache.wicket.authentication.IAuthenticationStrategy;
import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
@@ -42,6 +41,7 @@ import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.cookies.CookieUtils;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.viewer.wicket.model.util.WktContext;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/login/WicketLogoutPage.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/login/WicketLogoutPage.java
index a173ca4d2d..458f359133 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/login/WicketLogoutPage.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/login/WicketLogoutPage.java
@@ -20,11 +20,12 @@ package org.apache.causeway.viewer.wicket.ui.pages.login;
import javax.inject.Inject;
-import org.apache.causeway.viewer.wicket.model.models.PageType;
-import org.apache.causeway.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.wicket.Page;
import org.apache.wicket.markup.html.WebPage;
+import org.apache.causeway.viewer.wicket.model.models.PageType;
+import org.apache.causeway.viewer.wicket.ui.pages.PageClassRegistry;
+
public class WicketLogoutPage extends WebPage {
private static final long serialVersionUID = 1L;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/login/WicketSignInPage.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/login/WicketSignInPage.java
index 076d9a15a0..5eb7250910 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/login/WicketSignInPage.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/login/WicketSignInPage.java
@@ -20,15 +20,16 @@ package org.apache.causeway.viewer.wicket.ui.pages.login;
import javax.inject.Inject;
+import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
import org.apache.causeway.viewer.wicket.model.models.PageType;
import org.apache.causeway.viewer.wicket.ui.errors.ExceptionModel;
import org.apache.causeway.viewer.wicket.ui.pages.PageNavigationService;
import org.apache.causeway.viewer.wicket.ui.pages.accmngt.AccountManagementPageAbstract;
import org.apache.causeway.viewer.wicket.ui.pages.accmngt.SuccessFeedbackCookieManager;
-import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
index 2b0521186b..3c2c7a06a9 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
@@ -21,9 +21,6 @@ package org.apache.causeway.viewer.wicket.ui.pages.mmverror;
import java.util.Collection;
import java.util.List;
-import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.viewer.wicket.ui.pages.WebPageBase;
-import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.wicket.Application;
import org.apache.wicket.markup.head.CssReferenceHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
@@ -33,6 +30,10 @@ import org.apache.wicket.markup.head.PriorityHeaderItem;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import org.apache.causeway.commons.internal.collections._Lists;
+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.references.BootstrapJavaScriptReference;
/**
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.java
index ccf7f2ec42..d1efe3c3df 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.java
@@ -22,12 +22,11 @@ import org.apache.wicket.Component;
import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
import org.apache.causeway.applib.services.user.UserMemento;
+import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModelStandalone;
import org.apache.causeway.viewer.wicket.model.util.PageParameterUtils;
import org.apache.causeway.viewer.wicket.ui.pages.PageAbstract;
-import org.apache.causeway.viewer.commons.model.components.UiComponentType;
-
/**
* Web page representing an action invocation.
*/
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/value/ValuePage.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/value/ValuePage.java
index 9b4422d6e9..967c3dde7a 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/value/ValuePage.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/value/ValuePage.java
@@ -22,14 +22,13 @@ import org.apache.wicket.Component;
import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
import org.apache.causeway.applib.services.user.UserMemento;
+import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.model.models.ActionModel;
import org.apache.causeway.viewer.wicket.model.models.ValueModel;
import org.apache.causeway.viewer.wicket.model.util.PageParameterUtils;
import org.apache.causeway.viewer.wicket.ui.pages.PageAbstract;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
-import org.apache.causeway.viewer.commons.model.components.UiComponentType;
-
/**
* Web page representing an action invocation.
*/
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java
index 8c70a88c9c..a9fcdb16ce 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java
@@ -21,14 +21,13 @@ package org.apache.causeway.viewer.wicket.ui.pages.voidreturn;
import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
import org.apache.causeway.applib.services.user.UserMemento;
+import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.model.models.ActionModel;
import org.apache.causeway.viewer.wicket.model.models.VoidModel;
import org.apache.causeway.viewer.wicket.model.util.PageParameterUtils;
import org.apache.causeway.viewer.wicket.ui.pages.PageAbstract;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
-import org.apache.causeway.viewer.commons.model.components.UiComponentType;
-
/**
* Web page representing an action invocation.
*/
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 fd0808b614..1d5e86e4e3 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
@@ -20,9 +20,6 @@ package org.apache.causeway.viewer.wicket.ui.panels;
import java.util.Optional;
-import org.apache.causeway.commons.functional.Either;
-import org.apache.causeway.commons.internal.debug._Debug;
-import org.apache.causeway.commons.internal.debug.xray.XrayUi;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.form.Form;
import org.springframework.lang.Nullable;
@@ -30,6 +27,9 @@ import org.springframework.lang.Nullable;
import org.apache.causeway.applib.services.exceprecog.Category;
import org.apache.causeway.applib.services.exceprecog.ExceptionRecognizerService;
import org.apache.causeway.applib.services.exceprecog.Recognition;
+import org.apache.causeway.commons.functional.Either;
+import org.apache.causeway.commons.internal.debug._Debug;
+import org.apache.causeway.commons.internal.debug.xray.XrayUi;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.object.MmEntityUtil;
import org.apache.causeway.viewer.wicket.model.models.ActionModel;
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 bcca7aabdf..fb03ecfa64 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
@@ -18,14 +18,14 @@
*/
package org.apache.causeway.viewer.wicket.ui.panels;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.viewer.wicket.ui.util.WktComponents;
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.wicket.ui.util.WktComponents;
/**
* Convenience adapter for {@link Panel}s built up using {@link UiComponentType}s.
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 158420febe..8cca024d07 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
@@ -27,6 +27,8 @@ import org.springframework.lang.Nullable;
import org.apache.causeway.applib.services.i18n.LanguageProvider;
import org.apache.causeway.applib.services.userreg.EmailNotificationService;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
+import org.apache.causeway.viewer.commons.applib.services.header.HeaderUiModel;
+import org.apache.causeway.viewer.commons.applib.services.header.HeaderUiService;
import org.apache.causeway.viewer.wicket.model.hints.UiHintContainer;
import org.apache.causeway.viewer.wicket.model.models.HasCommonContext;
import org.apache.causeway.viewer.wicket.model.models.ImageResourceCache;
@@ -39,9 +41,6 @@ import org.apache.causeway.viewer.wicket.ui.pages.EmailVerificationUrlService;
import org.apache.causeway.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.causeway.viewer.wicket.ui.pages.PageNavigationService;
-import org.apache.causeway.viewer.commons.applib.services.header.HeaderUiModel;
-import org.apache.causeway.viewer.commons.applib.services.header.HeaderUiService;
-
/**
* Provides the <em>common context</em> for all implementing sub-classes.
* @since 2.0
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PanelUtil.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PanelUtil.java
index 763a6b5d9e..d513f6feb1 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PanelUtil.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PanelUtil.java
@@ -18,7 +18,6 @@
*/
package org.apache.causeway.viewer.wicket.ui.panels;
-import org.apache.causeway.commons.internal.base._Strings;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.attributes.AjaxCallListener;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
@@ -27,6 +26,8 @@ import org.apache.wicket.markup.head.CssReferenceHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.request.resource.CssResourceReference;
+import org.apache.causeway.commons.internal.base._Strings;
+
public final class PanelUtil {
private PanelUtil(){}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PromptFormAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PromptFormAbstract.java
index 92be987dd3..ef92ce66c4 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PromptFormAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PromptFormAbstract.java
@@ -21,10 +21,6 @@ package org.apache.causeway.viewer.wicket.ui.panels;
import java.util.List;
import java.util.Optional;
-import org.apache.causeway.commons.functional.Either;
-import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.causeway.commons.internal.debug._Probe;
-import org.apache.causeway.commons.internal.debug._Probe.EntryPoint;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Page;
@@ -34,6 +30,10 @@ import org.apache.wicket.event.Broadcast;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.model.IModel;
+import org.apache.causeway.commons.functional.Either;
+import org.apache.causeway.commons.internal.collections._Lists;
+import org.apache.causeway.commons.internal.debug._Probe;
+import org.apache.causeway.commons.internal.debug._Probe.EntryPoint;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.viewer.wicket.model.hints.CausewayActionCompletedEvent;
import org.apache.causeway.viewer.wicket.model.hints.CausewayPropertyEditCompletedEvent;
@@ -47,8 +47,8 @@ import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarPanelAbstra
import org.apache.causeway.viewer.wicket.ui.pages.PageAbstract;
import org.apache.causeway.viewer.wicket.ui.pages.entity.EntityPage;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
-import org.apache.causeway.viewer.wicket.ui.util.WktComponents;
import org.apache.causeway.viewer.wicket.ui.util.Wkt.EventTopic;
+import org.apache.causeway.viewer.wicket.ui.util.WktComponents;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PromptFormPanelAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PromptFormPanelAbstract.java
index 68626160c4..dee99db76e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PromptFormPanelAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PromptFormPanelAbstract.java
@@ -18,9 +18,10 @@
*/
package org.apache.causeway.viewer.wicket.ui.panels;
-import org.apache.causeway.viewer.wicket.model.models.FormExecutorContext;
import org.apache.wicket.model.IModel;
+import org.apache.causeway.viewer.wicket.model.models.FormExecutorContext;
+
/**
* {@link PanelAbstract Panel} to capture the arguments for an action
* invocation.
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 6a7942310a..cb1790fbe7 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,12 +22,11 @@ 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.NonNull;
import lombok.val;
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/LicensedTextTemplate.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/LicensedTextTemplate.java
index 88df3d2520..b1765d713e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/LicensedTextTemplate.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/LicensedTextTemplate.java
@@ -20,9 +20,10 @@ package org.apache.causeway.viewer.wicket.ui.util;
import java.util.stream.Collectors;
-import org.apache.causeway.commons.internal.base._Text;
import org.apache.wicket.util.template.PackageTextTemplate;
+import org.apache.causeway.commons.internal.base._Text;
+
import lombok.val;
/**
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 adaa85169c..a93f5faaa2 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,10 +28,9 @@ import org.apache.wicket.request.resource.ResourceReference;
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 a4c0417302..d34279803e 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
@@ -18,16 +18,12 @@
*/
package org.apache.causeway.viewer.wicket.ui.util;
+import static de.agilecoders.wicket.jquery.JQuery.$;
+
import java.util.List;
import java.util.OptionalInt;
import java.util.function.Supplier;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.debug._Probe;
-import org.apache.causeway.commons.internal.debug._Probe.EntryPoint;
-import org.apache.causeway.commons.internal.functions._Functions.SerializableFunction;
-import org.apache.causeway.commons.internal.functions._Functions.SerializableSupplier;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
@@ -85,20 +81,21 @@ import org.danekja.java.util.function.serializable.SerializableConsumer;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.Identifier;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.debug._Probe;
+import org.apache.causeway.commons.internal.debug._Probe.EntryPoint;
+import org.apache.causeway.commons.internal.functions._Functions.SerializableFunction;
+import org.apache.causeway.commons.internal.functions._Functions.SerializableSupplier;
import org.apache.causeway.core.config.CausewayConfiguration.Viewer.Wicket;
import org.apache.causeway.core.metamodel.interactions.managed.nonscalar.DataTableModel;
+import org.apache.causeway.viewer.commons.model.components.UiString;
import org.apache.causeway.viewer.wicket.model.hints.CausewayActionCompletedEvent;
import org.apache.causeway.viewer.wicket.model.hints.CausewayEnvelopeEvent;
import org.apache.causeway.viewer.wicket.ui.components.scalars.markup.MarkupComponent;
import org.apache.causeway.viewer.wicket.ui.components.widgets.links.AjaxLinkNoPropagate;
import org.apache.causeway.viewer.wicket.ui.panels.PanelUtil;
-import org.apache.causeway.viewer.commons.model.components.UiString;
-
-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;
@@ -108,8 +105,9 @@ 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.BootstrapFileInputField;
import de.agilecoders.wicket.jquery.Key;
-
-import static de.agilecoders.wicket.jquery.JQuery.$;
+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/WktComponents.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/WktComponents.java
index ed7ce4af05..bd3e92cd02 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/WktComponents.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/WktComponents.java
@@ -18,7 +18,6 @@
*/
package org.apache.causeway.viewer.wicket.ui.util;
-import org.apache.causeway.commons.internal.exceptions._Exceptions.FluentException;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Page;
@@ -27,6 +26,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.util.lang.Args;
+import org.apache.causeway.commons.internal.exceptions._Exceptions.FluentException;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import de.agilecoders.wicket.jquery.util.Strings2;
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 4f3e2a0bda..1c0d550447 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
@@ -20,17 +20,14 @@ package org.apache.causeway.viewer.wicket.ui.util;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.viewer.wicket.model.links.LinkAndLabel;
-import org.apache.causeway.viewer.wicket.ui.components.actionmenu.CssClassFaBehavior;
-import org.apache.causeway.viewer.wicket.ui.util.BootstrapConstants.ButtonSemantics;
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.form.Button;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.causeway.applib.services.i18n.TranslationService;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.viewer.commons.model.action.decorator.UiActionDecorator;
import org.apache.causeway.viewer.commons.model.decorators.ConfirmDecorator;
import org.apache.causeway.viewer.commons.model.decorators.ConfirmDecorator.ConfirmDecorationModel;
@@ -43,14 +40,16 @@ import org.apache.causeway.viewer.commons.model.decorators.PrototypingDecorator.
import org.apache.causeway.viewer.commons.model.decorators.TooltipDecorator;
import org.apache.causeway.viewer.commons.model.decorators.TooltipDecorator.TooltipDecorationModel;
import org.apache.causeway.viewer.commons.model.layout.UiPlacementDirection;
-
-import lombok.Getter;
-import lombok.val;
-import lombok.experimental.UtilityClass;
+import org.apache.causeway.viewer.wicket.model.links.LinkAndLabel;
+import org.apache.causeway.viewer.wicket.ui.components.actionmenu.CssClassFaBehavior;
+import org.apache.causeway.viewer.wicket.ui.util.BootstrapConstants.ButtonSemantics;
import de.agilecoders.wicket.core.markup.html.bootstrap.behavior.CssClassNameRemover;
import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig.Placement;
import de.agilecoders.wicket.extensions.markup.html.bootstrap.confirmation.ConfirmationConfig;
+import lombok.Getter;
+import lombok.val;
+import lombok.experimental.UtilityClass;
/**
*
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 268686f0ea..e12df37b69 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
@@ -22,7 +22,6 @@ import java.util.Optional;
import java.util.function.BiFunction;
import java.util.function.Function;
-import org.apache.causeway.commons.internal.base._Strings;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Page;
import org.apache.wicket.markup.html.basic.Label;
@@ -34,14 +33,14 @@ 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;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
+import org.apache.causeway.viewer.commons.model.decorators.ConfirmDecorator.ConfirmDecorationModel;
+import org.apache.causeway.viewer.commons.model.layout.UiPlacementDirection;
import org.apache.causeway.viewer.wicket.model.links.LinkAndLabel;
import org.apache.causeway.viewer.wicket.ui.components.widgets.linkandlabel.ActionLink;
import org.apache.causeway.viewer.wicket.ui.util.BootstrapConstants.ButtonSemantics;
-import org.apache.causeway.viewer.commons.model.decorators.ConfirmDecorator.ConfirmDecorationModel;
-import org.apache.causeway.viewer.commons.model.layout.UiPlacementDirection;
-
import lombok.NonNull;
import lombok.val;
import lombok.experimental.UtilityClass;
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 bc5de5b42f..2d21e1116e 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
@@ -18,21 +18,17 @@ package org.apache.causeway.viewer.wicket.ui.util;
import java.time.Duration;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
-import org.apache.causeway.viewer.wicket.ui.components.widgets.linkandlabel.ActionLink;
-import org.apache.causeway.viewer.wicket.ui.util.ExtendedPopoverConfig.PopoverBoundary;
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;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.viewer.commons.model.decorators.TooltipDecorator.TooltipDecorationModel;
import org.apache.causeway.viewer.commons.model.layout.UiPlacementDirection;
-
-import lombok.NonNull;
-import lombok.val;
-import lombok.experimental.UtilityClass;
+import org.apache.causeway.viewer.wicket.ui.components.widgets.linkandlabel.ActionLink;
+import org.apache.causeway.viewer.wicket.ui.util.ExtendedPopoverConfig.PopoverBoundary;
import de.agilecoders.wicket.core.markup.html.bootstrap.components.PopoverBehavior;
import de.agilecoders.wicket.core.markup.html.bootstrap.components.PopoverConfig;
@@ -40,6 +36,9 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipBehavi
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/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/entity/icontitle/EntityIconAndTitlePanelTest_abbreviated.java b/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/entity/icontitle/EntityIconAndTitlePanelTest_abbreviated.java
index b4fb52584e..40fb1e9cba 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/entity/icontitle/EntityIconAndTitlePanelTest_abbreviated.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/entity/icontitle/EntityIconAndTitlePanelTest_abbreviated.java
@@ -18,12 +18,13 @@
*/
package org.apache.causeway.viewer.wicket.ui.test.components.entity.icontitle;
-import org.apache.causeway.viewer.wicket.ui.components.entity.icontitle.EntityIconAndTitlePanel;
import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.apache.causeway.viewer.wicket.ui.components.entity.icontitle.EntityIconAndTitlePanel;
+
class EntityIconAndTitlePanelTest_abbreviated {
@Test
diff --git a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/ConverterTester.java b/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/ConverterTester.java
index 360e294971..645fab69a1 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/ConverterTester.java
+++ b/viewers/wicket/ui/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.commons.functional.ThrowingRunnable;
-import org.apache.causeway.commons.internal.base._Strings;
import org.apache.wicket.util.convert.ConversionException;
import org.assertj.core.util.Arrays;
@@ -43,6 +41,8 @@ import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.value.semantics.ValueSemanticsAbstract;
import org.apache.causeway.applib.value.semantics.ValueSemanticsResolver;
+import org.apache.causeway.commons.functional.ThrowingRunnable;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel._testing.MetaModelContext_forTesting;
import org.apache.causeway.core.metamodel.commons.ScalarRepresentation;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
diff --git a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jodatime/JodaDateTimeConverterTest.java b/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jodatime/JodaDateTimeConverterTest.java
index 3f079f4000..0cb7571270 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jodatime/JodaDateTimeConverterTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jodatime/JodaDateTimeConverterTest.java
@@ -20,16 +20,17 @@ package org.apache.causeway.viewer.wicket.ui.test.components.scalars.jodatime;
import java.util.Locale;
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.core.metamodel.commons.ScalarRepresentation;
import org.apache.causeway.core.metamodel.valuesemantics.temporal.ZonedDateTimeValueSemantics;
import org.apache.causeway.valuetypes.jodatime.integration.valuesemantics.JodaDateTimeValueSemantics;
import org.apache.causeway.viewer.wicket.ui.test.components.scalars.ConverterTester;
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
import lombok.Getter;
import lombok.Setter;
diff --git a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jodatime/JodaLocalDateConverterTest.java b/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jodatime/JodaLocalDateConverterTest.java
index 634621bb99..fd61cc3969 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jodatime/JodaLocalDateConverterTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jodatime/JodaLocalDateConverterTest.java
@@ -20,15 +20,16 @@ package org.apache.causeway.viewer.wicket.ui.test.components.scalars.jodatime;
import java.util.Locale;
+import org.joda.time.LocalDate;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.core.metamodel.commons.ScalarRepresentation;
import org.apache.causeway.core.metamodel.valuesemantics.temporal.LocalDateValueSemantics;
import org.apache.causeway.valuetypes.jodatime.integration.valuesemantics.JodaLocalDateValueSemantics;
import org.apache.causeway.viewer.wicket.ui.test.components.scalars.ConverterTester;
-import org.joda.time.LocalDate;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
import lombok.Getter;
import lombok.Setter;
diff --git a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jodatime/JodaLocalDateTimeConverterTest.java b/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jodatime/JodaLocalDateTimeConverterTest.java
index 6380228370..8cee1359f9 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jodatime/JodaLocalDateTimeConverterTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jodatime/JodaLocalDateTimeConverterTest.java
@@ -20,15 +20,16 @@ package org.apache.causeway.viewer.wicket.ui.test.components.scalars.jodatime;
import java.util.Locale;
+import org.joda.time.LocalDateTime;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.core.metamodel.commons.ScalarRepresentation;
import org.apache.causeway.core.metamodel.valuesemantics.temporal.LocalDateTimeValueSemantics;
import org.apache.causeway.valuetypes.jodatime.integration.valuesemantics.JodaLocalDateTimeValueSemantics;
import org.apache.causeway.viewer.wicket.ui.test.components.scalars.ConverterTester;
-import org.joda.time.LocalDateTime;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
import lombok.Getter;
import lombok.Setter;
diff --git a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/widgets/choices/ChoiceProviderForReferencesTest.java b/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/widgets/choices/ChoiceProviderForReferencesTest.java
index 0c3f0ceda6..d0b54eedc1 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/widgets/choices/ChoiceProviderForReferencesTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/widgets/choices/ChoiceProviderForReferencesTest.java
@@ -18,13 +18,13 @@
*/
package org.apache.causeway.viewer.wicket.ui.test.components.widgets.choices;
-import org.apache.causeway.commons.collections.Can;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.wicketstuff.select2.Response;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel._testing._TestDummies;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.objectmanager.memento.ObjectMemento;
diff --git a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/widgets/choices/ChoiceProviderForValuesTest.java b/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/widgets/choices/ChoiceProviderForValuesTest.java
index cc083839f4..466e7f9512 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/widgets/choices/ChoiceProviderForValuesTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/widgets/choices/ChoiceProviderForValuesTest.java
@@ -21,13 +21,13 @@ package org.apache.causeway.viewer.wicket.ui.test.components.widgets.choices;
import java.math.BigDecimal;
import java.util.UUID;
-import org.apache.causeway.commons.collections.Can;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.wicketstuff.select2.Response;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.objectmanager.memento.ObjectMemento;
import org.apache.causeway.viewer.wicket.ui.components.widgets.select2.providers.ChoiceProviderForValues;
diff --git a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/widgets/choices/ChoiceProviderTestAbstract.java b/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/widgets/choices/ChoiceProviderTestAbstract.java
index bebc3a9353..f4da678f7b 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/widgets/choices/ChoiceProviderTestAbstract.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/widgets/choices/ChoiceProviderTestAbstract.java
@@ -18,11 +18,10 @@
*/
package org.apache.causeway.viewer.wicket.ui.test.components.widgets.choices;
-import org.apache.causeway.commons.collections.Can;
-
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel._testing.MetaModelContext_forTesting;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.object.ManagedObject;
diff --git a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/errors/JGrowlUtilTest.java b/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/errors/JGrowlUtilTest.java
index f4e87edb13..ec830b0163 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/errors/JGrowlUtilTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/errors/JGrowlUtilTest.java
@@ -18,12 +18,13 @@
*/
package org.apache.causeway.viewer.wicket.ui.test.errors;
-import org.apache.causeway.viewer.wicket.ui.errors.JGrowlUtil;
import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.apache.causeway.viewer.wicket.ui.errors.JGrowlUtil;
+
class JGrowlUtilTest {
@Test
diff --git a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/pages/PageAbstractTest.java b/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/pages/PageAbstractTest.java
index bf99f11ea0..63bdf36664 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/pages/PageAbstractTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/pages/PageAbstractTest.java
@@ -18,12 +18,13 @@
*/
package org.apache.causeway.viewer.wicket.ui.test.pages;
-import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.apache.causeway.viewer.wicket.ui.util.Wkt;
+
public abstract class PageAbstractTest {
public static class AsCssStyle extends PageAbstractTest {
diff --git a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/pages/accmngt/SuccessFeedbackCookieUtilTest.java b/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/pages/accmngt/SuccessFeedbackCookieUtilTest.java
index 10aa85aa38..0305fbb190 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/pages/accmngt/SuccessFeedbackCookieUtilTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/pages/accmngt/SuccessFeedbackCookieUtilTest.java
@@ -23,7 +23,6 @@ import java.util.concurrent.atomic.AtomicReference;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
-import org.apache.causeway.viewer.wicket.ui.pages.accmngt.SuccessFeedbackCookieManager;
import org.apache.wicket.ThreadContext;
import org.apache.wicket.mock.MockWebResponse;
import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
@@ -39,6 +38,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import org.apache.causeway.viewer.wicket.ui.pages.accmngt.SuccessFeedbackCookieManager;
+
import lombok.val;
class SuccessFeedbackCookieUtilTest {
diff --git a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/pages/accmngt/password_reset/EmailAddressValidator_Test.java b/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/pages/accmngt/password_reset/EmailAddressValidator_Test.java
index 99f56eb015..2e52854637 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/pages/accmngt/password_reset/EmailAddressValidator_Test.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/pages/accmngt/password_reset/EmailAddressValidator_Test.java
@@ -19,11 +19,12 @@
package org.apache.causeway.viewer.wicket.ui.test.pages.accmngt.password_reset;
-import org.apache.causeway.viewer.wicket.ui.pages.accmngt.password_reset.EmailAddressValidator;
import org.apache.wicket.validation.Validatable;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
+import org.apache.causeway.viewer.wicket.ui.pages.accmngt.password_reset.EmailAddressValidator;
+
public class EmailAddressValidator_Test {
@Test
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/CausewayModuleViewerWicketViewer.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/CausewayModuleViewerWicketViewer.java
index df43839b6c..f42508fe99 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/CausewayModuleViewerWicketViewer.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/CausewayModuleViewerWicketViewer.java
@@ -18,10 +18,10 @@
*/
package org.apache.causeway.viewer.wicket.viewer;
-import org.apache.causeway.viewer.wicket.ui.CausewayModuleViewerWicketUi;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.viewer.wicket.ui.CausewayModuleViewerWicketUi;
import org.apache.causeway.viewer.wicket.viewer.registries.components.ComponentFactoryRegistrarDefault;
import org.apache.causeway.viewer.wicket.viewer.registries.components.ComponentFactoryRegistryDefault;
import org.apache.causeway.viewer.wicket.viewer.registries.pages.PageClassListDefault;
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 0ea88d0c5e..2282dee91c 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
@@ -22,7 +22,6 @@ import java.util.Optional;
import java.util.UUID;
import java.util.function.UnaryOperator;
-import org.apache.causeway.commons.collections.Can;
import org.apache.wicket.Session;
import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
import org.apache.wicket.authroles.authorization.strategies.role.Roles;
@@ -36,6 +35,7 @@ import org.apache.causeway.applib.services.session.SessionSubscriber;
import org.apache.causeway.applib.services.user.ImpersonatedUserHolder;
import org.apache.causeway.applib.services.user.UserMemento;
import org.apache.causeway.applib.services.user.UserMemento.AuthenticationSource;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.security.authentication.AuthenticationRequestPassword;
import org.apache.causeway.core.security.authentication.manager.AuthenticationManager;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/LocalizerForCauseway.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/LocalizerForCauseway.java
index 65aaa1afc1..f174d76fae 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/LocalizerForCauseway.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/LocalizerForCauseway.java
@@ -24,8 +24,6 @@ import java.util.Optional;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.commons.internal.base._Strings;
import org.apache.wicket.Component;
import org.apache.wicket.Localizer;
import org.apache.wicket.MarkupContainer;
@@ -36,8 +34,10 @@ import org.apache.wicket.model.IModel;
import org.apache.causeway.applib.services.i18n.TranslationContext;
import org.apache.causeway.applib.services.i18n.TranslationService;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker;
+import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.commons.internal.base._Casts;
+import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.viewer.wicket.viewer.wicketapp.CausewayWicketApplication;
import lombok.val;
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 0cb5378162..6287857915 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
@@ -25,9 +25,6 @@ import java.util.Optional;
import javax.servlet.http.HttpServletRequest;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.wicket.Application;
import org.apache.wicket.IPageFactory;
import org.apache.wicket.MetaDataKey;
@@ -55,6 +52,9 @@ import org.apache.causeway.applib.services.exceprecog.Recognition;
import org.apache.causeway.applib.services.i18n.TranslationContext;
import org.apache.causeway.applib.services.iactn.Interaction;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.spec.feature.ObjectMember;
import org.apache.causeway.core.metamodel.specloader.validator.MetaModelInvalidException;
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 593928bcbd..b7ce96b209 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
@@ -26,6 +26,14 @@ import javax.annotation.Priority;
import javax.inject.Inject;
import javax.inject.Named;
+import org.apache.wicket.Component;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ClassUtils;
+
+import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.applib.value.semantics.ValueSemanticsProvider;
+import org.apache.causeway.applib.value.semantics.ValueSemanticsResolver;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.internal.functions._Predicates;
@@ -75,14 +83,6 @@ import org.apache.causeway.viewer.wicket.ui.components.value.StandaloneValuePane
import org.apache.causeway.viewer.wicket.ui.components.voidreturn.VoidReturnPanelFactory;
import org.apache.causeway.viewer.wicket.ui.components.welcome.WelcomePanelFactory;
import org.apache.causeway.viewer.wicket.ui.components.widgets.entitysimplelink.EntityLinkSimplePanelFactory;
-import org.apache.wicket.Component;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Service;
-import org.springframework.util.ClassUtils;
-
-import org.apache.causeway.applib.annotation.PriorityPrecedence;
-import org.apache.causeway.applib.value.semantics.ValueSemanticsProvider;
-import org.apache.causeway.applib.value.semantics.ValueSemanticsResolver;
import lombok.NonNull;
import lombok.val;
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 323b7242cc..106b5cd937 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
@@ -27,12 +27,6 @@ import javax.annotation.Priority;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.causeway.commons.collections.ImmutableEnumSet;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.base._Refs;
-import org.apache.causeway.commons.internal.base._Text;
-import org.apache.causeway.commons.internal.collections._Multimaps;
-import org.apache.causeway.commons.internal.collections._Multimaps.ListMultimap;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.model.IModel;
@@ -41,14 +35,19 @@ import org.springframework.lang.Nullable;
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.commons.collections.ImmutableEnumSet;
+import org.apache.causeway.commons.internal.base._NullSafe;
+import org.apache.causeway.commons.internal.base._Refs;
+import org.apache.causeway.commons.internal.base._Text;
+import org.apache.causeway.commons.internal.collections._Multimaps;
+import org.apache.causeway.commons.internal.collections._Multimaps.ListMultimap;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
+import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
import org.apache.causeway.viewer.wicket.ui.app.registry.ComponentFactoryRegistrar;
-import org.apache.causeway.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import org.apache.causeway.viewer.wicket.ui.app.registry.ComponentFactoryRegistrar.ComponentFactoryList;
-
-import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import lombok.val;
import lombok.extern.log4j.Log4j2;
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 ba5a34e1e7..9a4d052bcf 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
@@ -18,6 +18,13 @@
*/
package org.apache.causeway.viewer.wicket.viewer.registries.pages;
+import javax.annotation.Priority;
+import javax.inject.Named;
... 582 lines suppressed ...