You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/01/04 14:41:11 UTC
[isis] branch master updated (e6dce4c -> 1f7ce8e)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from e6dce4c ISIS-2158: organize XSD imports for 'core' (from IntelliJ)
new 75e70e9 ISIS-2247: @TestPropertySource reformatting, is all.
new 6b518b2 ISIS-2158: organize imports for 'extensions'
new 0cabd9a ISIS-2158: organize imports for 'incubator'
new 6343fd9 ISIS-2158: re-run 'optimize imports' for 'extensions'
new 38e448c ISIS-2158: re-run 'optimize imports' for 'core'
new 38eb63f ISIS-2158: (re) run 'optimize imports' for examples/demo, examples/smoketests, incubator, legacy
new c9b244d ISIS-2158: updates IntelliJ config for lombok import order.
new 1f7ce8e ISIS-2158: sh sync_adoc.sh
The 8 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../applib-ant/examples/annotation/HomePage.java | 2 ++
.../internal/concurrent/_ConcurrentTaskList.java | 2 +-
.../environment/IsisSystemEnvironment.java | 2 +-
.../commons/internal/ioc/cdi/_CDI_Lifecycle.java | 2 +-
.../isis/commons/internal/ioc/spring/_Spring.java | 2 +-
.../IsisBeanFactoryPostProcessorForSpring.java | 2 +-
.../isis/config/beans/IsisBeanTypeRegistry.java | 2 +-
.../standard/AuthorizationFacetAbstract.java | 2 +-
.../isis/metamodel/facets/DependentArgUtils.java | 2 +-
.../annotation/TitleFacetViaTitleAnnotation.java | 2 +-
.../title/methods/TitleFacetViaTitleMethod.java | 2 +-
.../create/ObjectCreator_builtinHandlers.java | 2 +-
.../ProgrammingModelInitFilterDefault.java | 2 +-
.../metamodel/services/ServiceInjectorLegacy.java | 2 +-
.../ApplicationFeatureRepositoryDefault.java | 2 +-
.../services/layout/LayoutServiceDefault.java | 2 +-
.../services/title/TitleServiceDefault.java | 2 +-
.../specloader/ProgrammingModelServiceDefault.java | 2 +-
.../specloader/SpecificationLoaderDefault.java | 2 +-
.../specloader/specimpl/FacetedMethodsBuilder.java | 2 +-
.../specimpl/ObjectSpecificationAbstract.java | 2 +-
.../specimpl/dflt/ObjectSpecificationDefault.java | 2 +-
.../isis/metamodel/util/snapshot/XmlSnapshot.java | 2 +-
.../interactions/InteractionUtils_isA_Test.java | 3 +-
.../datanucleus/DataNucleusContextUtil.java | 2 +-
.../commands/DataNucleusCreateObjectCommand.java | 2 +-
.../PersistenceQueryFindAllInstancesProcessor.java | 2 +-
...sistenceQueryFindUsingApplibQueryProcessor.java | 2 +-
.../service/JdoPersistenceLifecycleService.java | 2 +-
.../objectadapter/ObjectAdapterContext.java | 2 +-
.../DataNucleusApplicationComponents5.java | 2 +-
.../persistence/IsisPersistenceSessionJdoBase.java | 2 +-
.../IsisPlatformTransactionManagerForJdo.java | 2 +-
.../persistence/IsisTransactionJdo.java | 2 +-
.../persistence/IsisTransactionManagerJdo.java | 2 +-
.../persistence/PersistenceSession5.java | 2 +-
.../persistence/PersistenceSessionFactory5.java | 2 +-
.../background/BackgroundCommandExecution.java | 2 +-
.../bookmarks/BookmarkServiceInternalDefault.java | 2 +-
.../command/CommandExecutorServiceDefault.java | 2 +-
.../confmenu/ConfigurationViewServiceDefault.java | 2 +-
.../services/factory/FactoryServiceDefault.java | 2 +-
.../homepage/HomePageResolverServiceDefault.java | 2 +-
.../menubars/MenuBarsLoaderServiceDefault.java | 2 +-
.../menubars/bootstrap3/MenuBarsServiceBS3.java | 2 +-
.../repository/RepositoryServiceDefault.java | 2 +-
.../services/routing/RoutingServiceDefault.java | 2 +-
.../sessmgmt/SessionManagementServiceDefault.java | 2 +-
.../services/wrapper/WrapperFactoryDefault.java | 2 +-
.../services/xactn/TransactionServiceSpring.java | 2 +-
.../session/events/TimestampService.java | 2 +-
.../transaction/AuditerDispatchService.java | 2 +-
.../transaction/ChangedObjectsService.java | 2 +-
.../runtime/session/IsisSessionFactoryDefault.java | 2 +-
.../security/shiro/webmodule/WebModuleShiro.java | 2 +-
.../config/internal/_Config_LifecycleResource.java | 2 +-
.../config/internal/_Config_Parsers.java | 2 +-
.../rendering/domainobjects/JsonValueEncoder.java | 2 +-
.../service/swagger/internal/Generation.java | 3 +-
.../swagger/internal/SwaggerSpecGenerator.java | 3 +-
.../internal/ValuePropertyFactoryDefault.java | 3 +-
.../model/models/ScalarModelWithMultiPending.java | 2 +-
.../serviceactions/ServiceActionUtil.java | 5 ++--
.../components/actions/ActionParametersForm.java | 3 +-
.../ui/components/collection/CollectionPanel.java | 3 +-
.../summary/CollectionContentsAsSummary.java | 3 +-
.../selector/links/EntityLinksSelectorPanel.java | 3 +-
.../components/layout/bs3/tabs/TabGroupPanel.java | 3 +-
.../components/scalars/ScalarPanelAbstract2.java | 3 +-
.../isisapplib/IsisBlobOrClobPanelAbstract.java | 3 +-
.../components/scalars/primitive/BooleanPanel.java | 3 +-
.../widgets/linkandlabel/ActionLink.java | 3 +-
.../themepicker/IsisWicketThemeSupport.java | 3 +-
.../themepicker/IsisWicketThemeSupportDefault.java | 5 ++--
.../widgets/themepicker/ThemeChooser.java | 3 +-
.../themepicker/ThemeProviderComposite.java | 7 +++--
.../isis/viewer/wicket/ui/pages/PageAbstract.java | 3 +-
.../accmngt/password_reset/PasswordResetPage.java | 3 +-
.../accmngt/password_reset/PasswordResetPanel.java | 3 +-
.../wicket/ui/panels/FormExecutorDefault.java | 2 +-
.../viewer/integration/WebRequestCycleForIsis.java | 2 +-
.../ComponentFactoryRegistryDefault.java | 2 +-
.../services/ImageResourceCacheClassPath.java | 3 +-
.../services/TranslationsResolverWicket.java | 2 +-
.../viewer/services/mementos/ObjectMarshaller.java | 2 +-
.../services/mementos/ObjectUnmarshaller.java | 2 +-
.../viewer/wicketapp/IsisWicketApplication.java | 7 +++--
.../isis/webapp/modules/WebModuleContext.java | 2 +-
.../templresources/TemplateResourceServlet.java | 2 +-
.../webappctx/IsisWebAppContextListener.java | 2 +-
.../dom/actions/assoc/AssociatedActionDemo.java | 3 +-
.../actions/assoc/AssociatedActionDemo.layout.xml | 9 +++---
.../demoapp/dom/actions/async/AsyncActionDemo.java | 3 +-
.../dom/actions/async/AsyncActionDemo.layout.xml | 9 +++---
.../actions/depargs/DependentArgsActionDemo.java | 3 +-
.../depargs/DependentArgsActionDemo.layout.xml | 9 +++---
.../java/demoapp/dom/error/ErrorDemo.layout.xml | 9 +++---
.../demoapp/dom/events/DemoEventSubscriber.java | 7 +++--
.../java/demoapp/dom/events/EventLogEntry.java | 3 +-
.../java/demoapp/dom/events/EventsDemo.layout.xml | 4 ++-
.../java/demoapp/dom/homepage/DemoHomePage.java | 3 +-
.../demoapp/dom/homepage/DemoHomePage.layout.xml | 8 ++---
.../main/java/demoapp/dom/jee/JeeDemo.layout.xml | 4 ++-
.../src/main/java/demoapp/dom/tabs/TabDemo.java | 3 +-
.../main/java/demoapp/dom/tabs/TabDemo.layout.xml | 4 ++-
.../main/java/demoapp/dom/tooltip/TooltipDemo.java | 5 ++--
.../demoapp/dom/tooltip/TooltipDemo.layout.xml | 8 ++---
.../main/java/demoapp/dom/tree/FileNode-File.svg | 4 +--
.../demoapp/dom/tree/FileNode-FileSystemRoot.svg | 4 +--
.../main/java/demoapp/dom/tree/FileNode-Folder.svg | 4 +--
.../src/main/java/demoapp/dom/tree/TreeDemo.java | 3 +-
.../main/java/demoapp/dom/tree/TreeDemo.layout.xml | 6 +++-
.../main/java/demoapp/dom/tree/TreeDemoMenu.java | 3 +-
.../java/demoapp/dom/types/FeaturedTypesMenu.java | 3 +-
.../main/java/demoapp/dom/types/blob/BlobDemo.java | 3 +-
.../demoapp/dom/types/blob/BlobDemo.layout.xml | 6 +++-
.../dom/types/primitive/PrimitivesDemo.java | 3 +-
.../dom/types/primitive/PrimitivesDemo.layout.xml | 9 +++---
.../main/java/demoapp/dom/types/text/TextDemo.java | 3 +-
.../demoapp/dom/types/text/TextDemo.layout.xml | 6 +++-
.../java/demoapp/dom/types/time/TemporalDemo.java | 3 +-
.../demoapp/dom/types/time/TemporalDemo.layout.xml | 6 +++-
.../demo/src/main/java/demoapp/utils/DemoStub.svg | 4 +--
.../main/java/demoapp/webapp/menubars.layout.xml | 6 +++-
.../testdomain/auditing/AuditerServiceTest.java | 6 ++--
.../bootstrapping/AutoConfigurationTest.java | 11 +++----
.../bootstrapping/JdoBootstrappingTest.java | 6 ++--
.../JdoBootstrappingTest_usingFixtures.java | 6 ++--
.../SpringServiceInjectOrderTest.java | 15 +++++-----
.../SpringServiceProvisioningTest.java | 8 +++--
.../testdomain/commandexecution/WrapperTest.java | 8 ++---
.../org/apache/isis/testdomain/config/FooTest.java | 6 ++--
.../isis/testdomain/config/IsisConfigBeanTest.java | 6 ++--
.../config/IsisConfigBeanTest_usingHeadless.java | 6 ++--
.../domainmodel/AnnotationSyntesizerTest.java | 6 ++--
.../DomainModelTest_usingBadDomain.java | 6 ++--
...nModelTest_usingBadDomain_noActionEnforced.java | 8 ++---
.../DomainModelTest_usingGoodDomain.java | 10 +++----
.../domainmodel/SpecloaderPerformanceTest.java | 4 +--
.../eventhandling/GenericEventPublishingTest.java | 4 +--
.../eventhandling/SpringEventPublishingTest.java | 4 +--
.../testdomain/ldap/LdapEmbeddedServerTest.java | 6 ++--
.../isis/testdomain/logging/LoggerSetupTest.java | 8 ++---
.../publishing/PublisherServiceTest.java | 6 ++--
.../isis/testdomain/rest/RestServiceTest.java | 10 +++----
.../isis/testdomain/shiro/ShiroLdapTest.java | 10 +++----
.../isis/testdomain/shiro/ShiroSecmanLdapTest.java | 12 ++++----
.../shiro/ShiroSecmanLdap_restfulStressTest.java | 13 ++++----
.../isis/testdomain/shiro/ShiroSecmanTest.java | 10 +++----
.../isis/testdomain/shiro/ShiroSimpleTest.java | 6 ++--
.../testdomain/timestamping/TimestampingTest.java | 4 +--
.../transactions/TransactionRollbackTest.java | 6 ++--
...TransactionRollbackTest_usingTransactional.java | 4 +--
.../extensions/spring/IsisModuleExtSpring.java | 3 +-
.../extensions/spring/service/BeanDescriptor.java | 6 ++--
.../extensions/spring/service/ContextBeans.java | 4 +--
.../spring/service/SpringBeansService.java | 12 ++++----
.../apache/isis/extensions/base/dom/Chained.java | 2 --
.../dom/services/calendar/CalendarService.java | 9 +++---
.../isis/extensions/base/dom/valuetypes/VT.java | 3 +-
.../extensions/base/dom/with/WithInterval.java | 5 +++-
.../base/dom/with/WithIntervalContiguous.java | 6 +++-
.../base/dom/with/WithIntervalMutable.java | 1 -
.../extensions/base/dom/with/WithStartDate.java | 3 +-
.../dom/TitledEnumContractTestAbstract_title.java | 2 --
.../base/dom/TitledEnumContractTester.java | 2 --
.../extensions/base/dom/matchers/IsisMatchers.java | 3 +-
.../CalendarServiceTest_beginningOfMonth.java | 6 ++--
.../CalendarServiceTest_beginningOfQuarter.java | 6 ++--
.../base/dom/titled/TitledEnumContractTester.java | 5 ++--
.../extensions/base/dom/utils/ClassUtilsTest.java | 4 ++-
.../base/dom/utils/MessageUtils_Test.java | 2 --
.../extensions/base/dom/utils/StringUtilsTest.java | 3 +-
.../base/dom/utils/TitleBuilderTest.java | 5 ++--
.../base/dom/valuetypes/LocalDateIntervalTest.java | 9 ++++--
.../dom/with/ComparableByCodeContractTester.java | 5 ++--
.../ComparableByDescriptionContractTester.java | 5 ++--
.../dom/with/ComparableByNameContractTester.java | 6 ++--
.../with/ComparableByReferenceContractTester.java | 6 ++--
.../dom/with/ComparableByTitleContractTester.java | 5 ++--
.../dom/with/InstantiatorForComparableByCode.java | 1 -
.../InstantiatorForComparableByDescription.java | 1 -
.../dom/with/InstantiatorForComparableByName.java | 1 -
.../with/InstantiatorForComparableByReference.java | 1 -
.../dom/with/InstantiatorForWithStartDate.java | 1 -
...lperClassesContractTest_privateConstructor.java | 1 -
.../WithFieldUniqueContractTestAllAbstract.java | 1 -
...valMutableContractTestAbstract_changeDates.java | 4 +--
.../extensions/docx/dom/IsisModuleExtDocx.java | 2 --
.../excel/fixtures/ExcelFixturesModule.java | 11 +++----
.../contributions/ExcelDemoToDoItem_export.java | 1 -
.../BulkUpdateLineItemForDemoToDoItem.java | 10 +++----
.../BulkUpdateManagerForDemoToDoItem.java | 6 ++--
.../bulkupdate/BulkUpdateMenuForDemoToDoItem.java | 1 -
.../pivot/ExcelPivotByCategoryAndSubcategory.java | 1 -
.../ExcelPivotByCategoryAndSubcategoryMenu.java | 1 -
.../demotodoitem/DemoToDoItemRowHandler.java | 8 ++---
.../demotodoitem/DemoToDoItemRowHandler2.java | 2 +-
.../ExcelUploadRowHandler4ToDoItem.java | 4 +--
.../ExcelUploadServiceForDemoToDoItem.java | 5 ++--
.../DemoFixture_extending_ExcelFixture2.java | 1 -
.../DemoToDoItem_create_usingExcelFixture.java | 6 ++--
.../DemoToDoItem_recreate_usingExcelFixture.java | 2 +-
.../ExcelDemoToDoItem_recreate5_for.java | 6 ++--
.../fixturescripts/ExcelDemoToDoItem_tearDown.java | 2 +-
.../isis/extensions/excel/dom/ExcelFixture.java | 9 +++---
.../isis/extensions/excel/dom/ExcelService.java | 16 +++++-----
.../isis/extensions/excel/dom/WorksheetSpec.java | 4 +--
.../extensions/excel/dom/util/ExcelConverter.java | 35 ++++++++++++++--------
.../excel/dom/util/ExcelFileBlobConverter.java | 1 -
.../extensions/excel/dom/util/SheetPivoter.java | 9 +++++-
.../excel/dom/util/AnnotationListTest.java | 2 --
.../excel/dom/util/AnnotationTripletTest.java | 1 -
.../extensions/excel/dom/util/PivotUtilsTest.java | 1 -
.../excel/dom/util/SheetPivoterTest.java | 1 -
.../integtests/ExcelModuleIntegTestAbstract.java | 15 +++++-----
.../ExcelModuleDemoMetaDataEnabled_IntegTest.java | 4 +--
...uleDemoToDoItemBulkUpdateManager_IntegTest.java | 11 +++----
.../freemarker/dom/IsisModuleExtFreemarker.java | 1 -
.../jaxrsclient/dom/IsisModuleExtJaxRsClient.java | 1 -
.../extensions/ognl/dom/IsisModuleExtOgnl.java | 1 -
.../extensions/pdfbox/dom/IsisModuleExtPdfBox.java | 1 -
.../extensions/slack/dom/IsisModuleExtSlack.java | 1 -
.../xdocreport/dom/IsisModuleExtXDocReport.java | 1 -
.../xdocreport/dom/impl/XDocReportService.java | 19 ++++++------
.../example/models/ProjectDevelopersModel.java | 6 ++--
.../dom/impl/service/XDocReportServiceTest.java | 13 ++++----
.../isis/extensions/zip/dom/IsisModuleExtZip.java | 1 -
.../isis/extensions/zip/dom/impl/ZipService.java | 12 ++++----
.../flywayjdo/dom/IsisModuleExtFlywayJdo.java | 2 --
.../model/app/feature/ApplicationClass.layout.xml | 6 +++-
.../app/feature/ApplicationClassAction.layout.xml | 6 +++-
.../feature/ApplicationClassCollection.layout.xml | 6 +++-
.../feature/ApplicationClassProperty.layout.xml | 6 +++-
.../app/feature/ApplicationPackage.layout.xml | 6 +++-
.../app/user/UserPermissionViewModel.layout.xml | 6 +++-
.../permission/ApplicationPermission.layout.xml | 6 +++-
.../secman/jdo/dom/role/ApplicationRole.layout.xml | 6 +++-
.../jdo/dom/tenancy/ApplicationTenancy.layout.xml | 6 +++-
.../secman/jdo/dom/user/ApplicationUser.layout.xml | 6 +++-
.../fakedata/dom/services/FakeDataServiceTest.java | 4 +--
.../FakeDataModuleIntegTestAbstract.java | 16 +++++-----
.../integtests/tests/Bootstrap_IntegTest.java | 3 +-
.../legacy/FixtureClockInstantiationTest.java | 4 +--
.../integration/ObjectFactoryForIntegration.java | 3 +-
.../jaxrsclient/dom/IsisModuleExtJaxRsClient.java | 1 -
ide-settings/intellij/Apache-Isis.xml | 5 ++++
.../examples/facets/jsr303/CustomPattern.java | 8 ++---
.../examples/facets/jsr303/CustomPatterns.java | 6 ++--
.../facets/jsr303/Jsr303FacetFacetHolder.java | 7 +++--
.../jsr303/Jsr303FacetFactoryFeatureTypes.java | 7 +++--
.../jsr303/Jsr303FacetFactoryInstantiation.java | 1 +
.../jsr303/Jsr303FacetFactoryProcessObject.java | 5 ++--
.../jsr303/Jsr303FacetFactoryProcessProperty.java | 5 ++--
.../facets/jsr303/Jsr303FacetInstantiation.java | 1 +
.../jsr303/Jsr303FacetValidatingInteraction.java | 11 +++----
.../internal/threadpool/ThreadPoolSupport.java | 7 +++--
.../value/ColorValueSemanticsProviderTest.java | 6 ++--
.../value/MoneyValueSemanticsProviderTest.java | 6 ++--
.../PercentageValueSemanticsProviderTest.java | 4 +--
.../PolishMoneyValueSemanticsProviderTest.java | 6 ++--
.../isis/legacy/restclient/RestEasyLegacy.java | 1 -
262 files changed, 622 insertions(+), 531 deletions(-)
[isis] 02/08: ISIS-2158: organize imports for 'extensions'
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 6b518b2b766890e30c2ed472e8e1a4712c4a3bd5
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jan 4 14:10:58 2020 +0000
ISIS-2158: organize imports for 'extensions'
---
.../extensions/spring/IsisModuleExtSpring.java | 3 +-
.../extensions/spring/service/BeanDescriptor.java | 6 ++--
.../extensions/spring/service/ContextBeans.java | 4 +--
.../spring/service/SpringBeansService.java | 12 ++++----
.../apache/isis/extensions/base/dom/Chained.java | 2 --
.../dom/services/calendar/CalendarService.java | 9 +++---
.../isis/extensions/base/dom/valuetypes/VT.java | 3 +-
.../extensions/base/dom/with/WithInterval.java | 5 +++-
.../base/dom/with/WithIntervalContiguous.java | 6 +++-
.../base/dom/with/WithIntervalMutable.java | 1 -
.../extensions/base/dom/with/WithStartDate.java | 3 +-
.../dom/TitledEnumContractTestAbstract_title.java | 2 --
.../base/dom/TitledEnumContractTester.java | 2 --
.../extensions/base/dom/matchers/IsisMatchers.java | 3 +-
.../CalendarServiceTest_beginningOfMonth.java | 6 ++--
.../CalendarServiceTest_beginningOfQuarter.java | 6 ++--
.../base/dom/titled/TitledEnumContractTester.java | 5 ++--
.../extensions/base/dom/utils/ClassUtilsTest.java | 4 ++-
.../base/dom/utils/MessageUtils_Test.java | 2 --
.../extensions/base/dom/utils/StringUtilsTest.java | 3 +-
.../base/dom/utils/TitleBuilderTest.java | 5 ++--
.../base/dom/valuetypes/LocalDateIntervalTest.java | 9 ++++--
.../dom/with/ComparableByCodeContractTester.java | 5 ++--
.../ComparableByDescriptionContractTester.java | 5 ++--
.../dom/with/ComparableByNameContractTester.java | 6 ++--
.../with/ComparableByReferenceContractTester.java | 6 ++--
.../dom/with/ComparableByTitleContractTester.java | 5 ++--
.../dom/with/InstantiatorForComparableByCode.java | 1 -
.../InstantiatorForComparableByDescription.java | 1 -
.../dom/with/InstantiatorForComparableByName.java | 1 -
.../with/InstantiatorForComparableByReference.java | 1 -
.../dom/with/InstantiatorForWithStartDate.java | 1 -
...lperClassesContractTest_privateConstructor.java | 1 -
.../WithFieldUniqueContractTestAllAbstract.java | 1 -
...valMutableContractTestAbstract_changeDates.java | 4 +--
.../extensions/docx/dom/IsisModuleExtDocx.java | 2 --
.../excel/fixtures/ExcelFixturesModule.java | 11 +++----
.../contributions/ExcelDemoToDoItem_export.java | 1 -
.../BulkUpdateLineItemForDemoToDoItem.java | 10 +++----
.../BulkUpdateManagerForDemoToDoItem.java | 6 ++--
.../bulkupdate/BulkUpdateMenuForDemoToDoItem.java | 1 -
.../pivot/ExcelPivotByCategoryAndSubcategory.java | 1 -
.../ExcelPivotByCategoryAndSubcategoryMenu.java | 1 -
.../demotodoitem/DemoToDoItemRowHandler.java | 8 ++---
.../demotodoitem/DemoToDoItemRowHandler2.java | 2 +-
.../ExcelUploadRowHandler4ToDoItem.java | 4 +--
.../ExcelUploadServiceForDemoToDoItem.java | 5 ++--
.../DemoFixture_extending_ExcelFixture2.java | 1 -
.../DemoToDoItem_create_usingExcelFixture.java | 6 ++--
.../DemoToDoItem_recreate_usingExcelFixture.java | 2 +-
.../ExcelDemoToDoItem_recreate5_for.java | 6 ++--
.../fixturescripts/ExcelDemoToDoItem_tearDown.java | 2 +-
.../isis/extensions/excel/dom/ExcelFixture.java | 9 +++---
.../isis/extensions/excel/dom/ExcelService.java | 16 +++++-----
.../isis/extensions/excel/dom/WorksheetSpec.java | 4 +--
.../extensions/excel/dom/util/ExcelConverter.java | 35 ++++++++++++++--------
.../excel/dom/util/ExcelFileBlobConverter.java | 1 -
.../extensions/excel/dom/util/SheetPivoter.java | 9 +++++-
.../excel/dom/util/AnnotationListTest.java | 2 --
.../excel/dom/util/AnnotationTripletTest.java | 1 -
.../extensions/excel/dom/util/PivotUtilsTest.java | 1 -
.../excel/dom/util/SheetPivoterTest.java | 1 -
.../integtests/ExcelModuleIntegTestAbstract.java | 15 +++++-----
.../ExcelModuleDemoMetaDataEnabled_IntegTest.java | 4 +--
...uleDemoToDoItemBulkUpdateManager_IntegTest.java | 11 +++----
.../freemarker/dom/IsisModuleExtFreemarker.java | 1 -
.../jaxrsclient/dom/IsisModuleExtJaxRsClient.java | 1 -
.../extensions/ognl/dom/IsisModuleExtOgnl.java | 1 -
.../extensions/pdfbox/dom/IsisModuleExtPdfBox.java | 1 -
.../extensions/slack/dom/IsisModuleExtSlack.java | 1 -
.../xdocreport/dom/IsisModuleExtXDocReport.java | 1 -
.../xdocreport/dom/impl/XDocReportService.java | 19 ++++++------
.../example/models/ProjectDevelopersModel.java | 6 ++--
.../dom/impl/service/XDocReportServiceTest.java | 13 ++++----
.../isis/extensions/zip/dom/IsisModuleExtZip.java | 1 -
.../isis/extensions/zip/dom/impl/ZipService.java | 12 ++++----
.../flywayjdo/dom/IsisModuleExtFlywayJdo.java | 2 --
.../dom/webmodule/WebModuleH2Console.java | 2 +-
.../model/app/feature/ApplicationClass.layout.xml | 6 +++-
.../app/feature/ApplicationClassAction.layout.xml | 6 +++-
.../feature/ApplicationClassCollection.layout.xml | 6 +++-
.../feature/ApplicationClassProperty.layout.xml | 6 +++-
.../app/feature/ApplicationPackage.layout.xml | 6 +++-
.../app/user/UserPermissionViewModel.layout.xml | 6 +++-
.../permission/ApplicationPermission.layout.xml | 6 +++-
.../ApplicationPermissionRepository.java | 2 +-
.../secman/jdo/dom/role/ApplicationRole.layout.xml | 6 +++-
.../jdo/dom/tenancy/ApplicationTenancy.layout.xml | 6 +++-
.../secman/jdo/dom/user/ApplicationUser.layout.xml | 6 +++-
.../secman/jdo/seed/SeedSecurityModuleService.java | 2 +-
.../services/SecurityRealmServiceUsingShiro.java | 2 +-
.../fakedata/dom/services/FakeDataServiceTest.java | 4 +--
.../FakeDataModuleIntegTestAbstract.java | 16 +++++-----
.../integtests/tests/Bootstrap_IntegTest.java | 3 +-
.../modules/ModuleWithFixturesService.java | 2 +-
.../legacy/FixtureClockInstantiationTest.java | 4 +--
.../jaxrsclient/dom/IsisModuleExtJaxRsClient.java | 1 -
.../extensions/sse/services/SseServiceDefault.java | 2 +-
98 files changed, 247 insertions(+), 229 deletions(-)
diff --git a/extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/IsisModuleExtSpring.java b/extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/IsisModuleExtSpring.java
index a978552..38eca4d 100644
--- a/extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/IsisModuleExtSpring.java
+++ b/extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/IsisModuleExtSpring.java
@@ -18,10 +18,11 @@
*/
package org.apache.isis.extensions.spring;
-import org.apache.isis.extensions.spring.service.SpringBeansService;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.isis.extensions.spring.service.SpringBeansService;
+
@Configuration
@Import({
SpringBeansService.class
diff --git a/extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/service/BeanDescriptor.java b/extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/service/BeanDescriptor.java
index e991802..7e41829 100644
--- a/extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/service/BeanDescriptor.java
+++ b/extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/service/BeanDescriptor.java
@@ -1,8 +1,5 @@
package org.apache.isis.extensions.spring.service;
-import lombok.Getter;
-import lombok.ToString;
-
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -16,6 +13,9 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.util.StringUtils;
+import lombok.Getter;
+import lombok.ToString;
+
@Getter
@ToString
public final class BeanDescriptor {
diff --git a/extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/service/ContextBeans.java b/extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/service/ContextBeans.java
index 428b603..1f71509 100644
--- a/extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/service/ContextBeans.java
+++ b/extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/service/ContextBeans.java
@@ -1,7 +1,5 @@
package org.apache.isis.extensions.spring.service;
-import lombok.Data;
-
import java.util.Arrays;
import java.util.Collections;
import java.util.Map;
@@ -12,6 +10,8 @@ import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.context.ConfigurableApplicationContext;
+import lombok.Data;
+
@Data
public final class ContextBeans {
diff --git a/extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/service/SpringBeansService.java b/extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/service/SpringBeansService.java
index a04f60f..226fe5a 100644
--- a/extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/service/SpringBeansService.java
+++ b/extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/service/SpringBeansService.java
@@ -18,20 +18,22 @@
*/
package org.apache.isis.extensions.spring.service;
-import lombok.experimental.UtilityClass;
-import lombok.extern.log4j.Log4j2;
-
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
import javax.inject.Named;
-import org.apache.isis.applib.annotation.OrderPrecedence;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
+import org.apache.isis.applib.annotation.OrderPrecedence;
+
+import lombok.experimental.UtilityClass;
+import lombok.extern.log4j.Log4j2;
+
/**
* Borrowed from BeansEndpoint.
*/
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/Chained.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/Chained.java
index 9946473..24ba5b3 100644
--- a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/Chained.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/Chained.java
@@ -1,11 +1,9 @@
package org.apache.isis.extensions.base.dom;
import org.apache.isis.applib.annotation.Editing;
-
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.Where;
-
import org.apache.isis.extensions.base.dom.with.WithInterval;
import org.apache.isis.extensions.base.dom.with.WithIntervalContiguous;
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarService.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarService.java
index 74c1a0e..e2c4a2a 100644
--- a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarService.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarService.java
@@ -1,19 +1,20 @@
package org.apache.isis.extensions.base.dom.services.calendar;
-import lombok.extern.log4j.Log4j2;
-
import java.time.LocalDate;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.applib.annotation.Programmatic;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Primary;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
+import org.apache.isis.applib.annotation.OrderPrecedence;
+import org.apache.isis.applib.annotation.Programmatic;
+
+import lombok.extern.log4j.Log4j2;
+
@Service
@Named("isisExtBase.calendarService")
@Order(OrderPrecedence.MIDPOINT)
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/VT.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/VT.java
index 251905e..e21a1c2 100644
--- a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/VT.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/VT.java
@@ -3,8 +3,7 @@ package org.apache.isis.extensions.base.dom.valuetypes;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.math.RoundingMode;
-import org.apache.isis.extensions.base.dom.valuetypes.AbstractInterval;
-import org.apache.isis.extensions.base.dom.valuetypes.LocalDateInterval;
+
import org.joda.time.LocalDate;
/**
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithInterval.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithInterval.java
index 2a2c58d..69ba04d 100644
--- a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithInterval.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithInterval.java
@@ -6,9 +6,12 @@ import java.util.SortedSet;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
-import org.apache.isis.applib.annotation.*;
import org.joda.time.LocalDate;
+import org.apache.isis.applib.annotation.Editing;
+import org.apache.isis.applib.annotation.Optionality;
+import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.annotation.Property;
import org.apache.isis.extensions.base.dom.valuetypes.LocalDateInterval;
public interface WithInterval<T extends WithInterval<T>> extends WithStartDate {
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithIntervalContiguous.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithIntervalContiguous.java
index 83aedd1..f62f779 100644
--- a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithIntervalContiguous.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithIntervalContiguous.java
@@ -6,9 +6,13 @@ import com.google.common.base.Objects;
import com.google.common.base.Predicate;
import com.google.common.collect.Sets;
-import org.apache.isis.applib.annotation.*;
import org.joda.time.LocalDate;
+import org.apache.isis.applib.annotation.Editing;
+import org.apache.isis.applib.annotation.Optionality;
+import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.extensions.base.dom.Chained;
public interface WithIntervalContiguous<T extends WithIntervalContiguous<T>>
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithIntervalMutable.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithIntervalMutable.java
index edd661a..ceea67a 100644
--- a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithIntervalMutable.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithIntervalMutable.java
@@ -6,7 +6,6 @@ import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.applib.annotation.SemanticsOf;
-
import org.apache.isis.extensions.base.dom.valuetypes.LocalDateInterval;
public interface WithIntervalMutable<T extends WithIntervalMutable<T>> extends WithInterval<T> {
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithStartDate.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithStartDate.java
index cd106ab..13d088e 100644
--- a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithStartDate.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithStartDate.java
@@ -1,8 +1,9 @@
package org.apache.isis.extensions.base.dom.with;
+import org.joda.time.LocalDate;
+
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Property;
-import org.joda.time.LocalDate;
public interface WithStartDate {
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/TitledEnumContractTestAbstract_title.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/TitledEnumContractTestAbstract_title.java
index 505de97..13ea9d8 100644
--- a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/TitledEnumContractTestAbstract_title.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/TitledEnumContractTestAbstract_title.java
@@ -1,7 +1,5 @@
package org.apache.isis.extensions.base.dom;
-import org.apache.isis.extensions.base.dom.TitledEnum;
-
/**
* Automatically tests all enums implementing {@link TitledEnum}.
*
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/TitledEnumContractTester.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/TitledEnumContractTester.java
index ab935ef..3a820e2 100644
--- a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/TitledEnumContractTester.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/TitledEnumContractTester.java
@@ -1,7 +1,5 @@
package org.apache.isis.extensions.base.dom;
-import org.apache.isis.extensions.base.dom.TitledEnum;
-
/**
* @deprecated - use superclass
* @param <T>
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/matchers/IsisMatchers.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/matchers/IsisMatchers.java
index 8ccacdf..65f02dc 100644
--- a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/matchers/IsisMatchers.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/matchers/IsisMatchers.java
@@ -5,7 +5,6 @@ import java.io.IOException;
import java.util.Arrays;
import java.util.List;
-import org.apache.isis.metamodel.commons.StringExtensions;
import org.hamcrest.CoreMatchers;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
@@ -18,6 +17,8 @@ import org.hamcrest.core.StringStartsWith;
import static org.hamcrest.CoreMatchers.nullValue;
+import org.apache.isis.metamodel.commons.StringExtensions;
+
/**
* Hamcrest {@link org.hamcrest.Matcher} implementations.
*
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfMonth.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfMonth.java
index 1393c30..42735c3 100644
--- a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfMonth.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfMonth.java
@@ -10,13 +10,11 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-import org.apache.isis.applib.services.clock.ClockService;
-
-import org.apache.isis.extensions.base.dom.services.calendar.CalendarService;
-
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.applib.services.clock.ClockService;
+
@RunWith(Parameterized.class)
public class CalendarServiceTest_beginningOfMonth {
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfQuarter.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfQuarter.java
index f4117ee..03ed505 100644
--- a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfQuarter.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfQuarter.java
@@ -10,13 +10,11 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-import org.apache.isis.applib.services.clock.ClockService;
-
-import org.apache.isis.extensions.base.dom.services.calendar.CalendarService;
-
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.applib.services.clock.ClockService;
+
@RunWith(Parameterized.class)
public class CalendarServiceTest_beginningOfQuarter {
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/titled/TitledEnumContractTester.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/titled/TitledEnumContractTester.java
index 11a2dbb..d40b15d 100644
--- a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/titled/TitledEnumContractTester.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/titled/TitledEnumContractTester.java
@@ -2,12 +2,11 @@ package org.apache.isis.extensions.base.dom.titled;
import org.hamcrest.CoreMatchers;
-import org.apache.isis.applib.util.Enums;
+import static org.junit.Assert.assertThat;
+import org.apache.isis.applib.util.Enums;
import org.apache.isis.extensions.base.dom.TitledEnum;
-import static org.junit.Assert.assertThat;
-
public class TitledEnumContractTester {
protected Enum<?>[] enumValues;
protected Class<? extends Enum<?>> cls;
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/ClassUtilsTest.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/ClassUtilsTest.java
index d1a185c..2f43d48 100644
--- a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/ClassUtilsTest.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/ClassUtilsTest.java
@@ -4,7 +4,9 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
public class ClassUtilsTest {
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/MessageUtils_Test.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/MessageUtils_Test.java
index 28fe8c1..afc145c 100644
--- a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/MessageUtils_Test.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/MessageUtils_Test.java
@@ -3,8 +3,6 @@ package org.apache.isis.extensions.base.dom.utils;
import org.assertj.core.api.Assertions;
import org.junit.Test;
-import org.apache.isis.extensions.base.dom.utils.MessageUtils;
-
public class MessageUtils_Test {
@Test
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/StringUtilsTest.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/StringUtilsTest.java
index 6afe9e8..d3624d6 100644
--- a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/StringUtilsTest.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/StringUtilsTest.java
@@ -6,10 +6,11 @@ import java.util.Collection;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
-import org.apache.isis.extensions.base.dom.testing.PrivateConstructorTester;
import static org.junit.Assert.assertEquals;
+import org.apache.isis.extensions.base.dom.testing.PrivateConstructorTester;
+
public class StringUtilsTest {
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/TitleBuilderTest.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/TitleBuilderTest.java
index 1ba6356..53972a3 100644
--- a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/TitleBuilderTest.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/TitleBuilderTest.java
@@ -2,11 +2,10 @@ package org.apache.isis.extensions.base.dom.utils;
import org.junit.Test;
-import org.apache.isis.extensions.base.dom.utils.TitleBuilder;
-import org.apache.isis.extensions.base.dom.valuetypes.LocalDateInterval;
-
import static org.assertj.core.api.Assertions.assertThat;
+import org.apache.isis.extensions.base.dom.valuetypes.LocalDateInterval;
+
public class TitleBuilderTest {
public class TestObject {
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/valuetypes/LocalDateIntervalTest.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/valuetypes/LocalDateIntervalTest.java
index b657207..5c41bda 100644
--- a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/valuetypes/LocalDateIntervalTest.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/valuetypes/LocalDateIntervalTest.java
@@ -3,10 +3,15 @@ package org.apache.isis.extensions.base.dom.valuetypes;
import org.joda.time.Interval;
import org.joda.time.LocalDate;
import org.junit.Test;
-import org.apache.isis.extensions.base.dom.valuetypes.AbstractInterval.IntervalEnding;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+import org.apache.isis.extensions.base.dom.valuetypes.AbstractInterval.IntervalEnding;
public class LocalDateIntervalTest {
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByCodeContractTester.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByCodeContractTester.java
index 3476021..eca8690 100644
--- a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByCodeContractTester.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByCodeContractTester.java
@@ -2,15 +2,14 @@ package org.apache.isis.extensions.base.dom.with;
import java.util.List;
-import org.apache.isis.extensions.base.dom.with.WithCodeComparable;
-import org.apache.isis.unittestsupport.comparable.ComparableContractTester;
-
import com.google.common.base.MoreObjects;
import com.google.common.collect.Lists;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.apache.isis.unittestsupport.comparable.ComparableContractTester;
+
public class ComparableByCodeContractTester<T extends WithCodeComparable<T>> {
protected final Class<T> cls;
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByDescriptionContractTester.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByDescriptionContractTester.java
index d09c9a9..9f78682 100644
--- a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByDescriptionContractTester.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByDescriptionContractTester.java
@@ -2,15 +2,14 @@ package org.apache.isis.extensions.base.dom.with;
import java.util.List;
-import org.apache.isis.extensions.base.dom.with.WithDescriptionComparable;
-import org.apache.isis.unittestsupport.comparable.ComparableContractTester;
-
import com.google.common.base.MoreObjects;
import com.google.common.collect.Lists;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.unittestsupport.comparable.ComparableContractTester;
+
public class ComparableByDescriptionContractTester<T extends WithDescriptionComparable<T>> {
protected final Class<T> cls;
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByNameContractTester.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByNameContractTester.java
index b730513..521d6a1 100644
--- a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByNameContractTester.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByNameContractTester.java
@@ -2,16 +2,14 @@ package org.apache.isis.extensions.base.dom.with;
import java.util.List;
-import org.apache.isis.extensions.base.dom.with.WithNameComparable;
-import org.apache.isis.unittestsupport.comparable.ComparableContractTester;
-
import com.google.common.base.MoreObjects;
import com.google.common.collect.Lists;
-
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.unittestsupport.comparable.ComparableContractTester;
+
public class ComparableByNameContractTester<T extends WithNameComparable<T>> {
protected final Class<T> cls;
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByReferenceContractTester.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByReferenceContractTester.java
index 6d2439a..84fc89e 100644
--- a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByReferenceContractTester.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByReferenceContractTester.java
@@ -2,16 +2,14 @@ package org.apache.isis.extensions.base.dom.with;
import java.util.List;
-import org.apache.isis.extensions.base.dom.with.WithReferenceComparable;
-import org.apache.isis.unittestsupport.comparable.ComparableContractTester;
-
import com.google.common.base.MoreObjects;
import com.google.common.collect.Lists;
-
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.unittestsupport.comparable.ComparableContractTester;
+
public class ComparableByReferenceContractTester<T extends WithReferenceComparable<T>> {
protected final Class<T> cls;
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByTitleContractTester.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByTitleContractTester.java
index 554416d..3540544 100644
--- a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByTitleContractTester.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByTitleContractTester.java
@@ -2,15 +2,14 @@ package org.apache.isis.extensions.base.dom.with;
import java.util.List;
-import org.apache.isis.extensions.base.dom.with.WithTitleComparable;
-import org.apache.isis.unittestsupport.comparable.ComparableContractTester;
-
import com.google.common.base.MoreObjects;
import com.google.common.collect.Lists;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.unittestsupport.comparable.ComparableContractTester;
+
public class ComparableByTitleContractTester<T extends WithTitleComparable<T>> {
protected final Class<T> cls;
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByCode.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByCode.java
index da09bbd..b50d7be 100644
--- a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByCode.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByCode.java
@@ -1,6 +1,5 @@
package org.apache.isis.extensions.base.dom.with;
-import org.apache.isis.extensions.base.dom.with.WithCodeComparable;
import org.apache.isis.unittestsupport.bidir.Instantiator;
public class InstantiatorForComparableByCode implements Instantiator {
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByDescription.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByDescription.java
index 8d5d788..b83c719 100644
--- a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByDescription.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByDescription.java
@@ -1,7 +1,6 @@
package org.apache.isis.extensions.base.dom.with;
-import org.apache.isis.extensions.base.dom.with.WithDescriptionComparable;
import org.apache.isis.unittestsupport.bidir.Instantiator;
public class InstantiatorForComparableByDescription implements Instantiator {
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByName.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByName.java
index 1f257b8..9d37bf6 100644
--- a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByName.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByName.java
@@ -1,7 +1,6 @@
package org.apache.isis.extensions.base.dom.with;
-import org.apache.isis.extensions.base.dom.with.WithNameComparable;
import org.apache.isis.unittestsupport.bidir.Instantiator;
public class InstantiatorForComparableByName implements Instantiator {
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByReference.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByReference.java
index 148da65..04de1f6 100644
--- a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByReference.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByReference.java
@@ -1,7 +1,6 @@
package org.apache.isis.extensions.base.dom.with;
-import org.apache.isis.extensions.base.dom.with.WithReferenceComparable;
import org.apache.isis.unittestsupport.bidir.Instantiator;
public class InstantiatorForComparableByReference implements Instantiator {
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForWithStartDate.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForWithStartDate.java
index 5a15895..2c3ea59 100644
--- a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForWithStartDate.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForWithStartDate.java
@@ -1,6 +1,5 @@
package org.apache.isis.extensions.base.dom.with;
-import org.apache.isis.extensions.base.dom.with.WithStartDate;
import org.joda.time.LocalDate;
import org.apache.isis.unittestsupport.bidir.Instantiator;
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/StaticHelperClassesContractTest_privateConstructor.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/StaticHelperClassesContractTest_privateConstructor.java
index 78936dd..0f9d49c 100644
--- a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/StaticHelperClassesContractTest_privateConstructor.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/StaticHelperClassesContractTest_privateConstructor.java
@@ -1,6 +1,5 @@
package org.apache.isis.extensions.base.dom.with;
-import org.apache.isis.extensions.base.dom.with.*;
import org.junit.Test;
import org.apache.isis.extensions.base.dom.testing.PrivateConstructorTester;
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/WithFieldUniqueContractTestAllAbstract.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/WithFieldUniqueContractTestAllAbstract.java
index 6b65165..c00a0cc 100644
--- a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/WithFieldUniqueContractTestAllAbstract.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/WithFieldUniqueContractTestAllAbstract.java
@@ -3,7 +3,6 @@ package org.apache.isis.extensions.base.dom.with;
import java.lang.annotation.Annotation;
import java.util.Set;
-
import javax.jdo.annotations.Unique;
import javax.jdo.annotations.Uniques;
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java
index 54ecc4d..05c460d 100644
--- a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java
@@ -1,7 +1,5 @@
package org.apache.isis.extensions.base.dom.with;
-import org.apache.isis.extensions.base.dom.with.WithIntervalMutable;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.joda.time.LocalDate;
@@ -12,6 +10,8 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+
public abstract class WithIntervalMutableContractTestAbstract_changeDates<T extends WithIntervalMutable<T>> {
@Rule
public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
diff --git a/extensions/lib/docx/impl/src/main/java/org/apache/isis/extensions/docx/dom/IsisModuleExtDocx.java b/extensions/lib/docx/impl/src/main/java/org/apache/isis/extensions/docx/dom/IsisModuleExtDocx.java
index a654ca4..1bbf415 100644
--- a/extensions/lib/docx/impl/src/main/java/org/apache/isis/extensions/docx/dom/IsisModuleExtDocx.java
+++ b/extensions/lib/docx/impl/src/main/java/org/apache/isis/extensions/docx/dom/IsisModuleExtDocx.java
@@ -18,10 +18,8 @@
*/
package org.apache.isis.extensions.docx.dom;
-import org.apache.isis.webapp.IsisModuleWebapp;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
@Configuration
@ComponentScan
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/ExcelFixturesModule.java b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/ExcelFixturesModule.java
index bb340dc..94171dc 100644
--- a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/ExcelFixturesModule.java
+++ b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/ExcelFixturesModule.java
@@ -1,14 +1,15 @@
package org.apache.isis.extensions.excel.fixtures;
-import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
-import org.apache.isis.extensions.fixtures.modules.Module;
-import org.apache.isis.extensions.excel.ExcelModule;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.fixturescripts.ExcelDemoToDoItem_tearDown;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.isis.extensions.excel.ExcelModule;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.fixturescripts.ExcelDemoToDoItem_tearDown;
+import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
+import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.extensions.fixtures.modules.Module;
+
@Configuration
@Import({
ExcelModule.class,
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export.java b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export.java
index 45bd15b..d49b876 100644
--- a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export.java
+++ b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export.java
@@ -7,7 +7,6 @@ import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.Contributed;
import org.apache.isis.applib.annotation.Mixin;
import org.apache.isis.applib.value.Blob;
-
import org.apache.isis.extensions.excel.dom.ExcelService;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java
index b86bf7f..7379edc 100644
--- a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java
+++ b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java
@@ -1,17 +1,11 @@
package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
import java.math.BigDecimal;
import java.time.LocalDate;
import javax.inject.Inject;
import javax.jdo.annotations.Column;
-import javax.xml.bind.annotation.*;
-import org.apache.isis.applib.annotation.*;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.applib.services.title.TitleService;
import org.apache.isis.applib.services.user.UserService;
@@ -20,6 +14,10 @@ import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDem
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Subcategory;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
@DomainObject(
nature = Nature.VIEW_MODEL,
objectType = "libExcelFixture.BulkUpdateLineItemForDemoToDoItem"
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
index a45cfa4..0fb191c 100644
--- a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
+++ b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
@@ -5,7 +5,6 @@ import java.util.stream.Collectors;
import javax.annotation.Nullable;
import javax.inject.Inject;
-import javax.xml.bind.annotation.*;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
@@ -23,7 +22,6 @@ import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.applib.value.Blob;
-
import org.apache.isis.extensions.excel.dom.ExcelService;
import org.apache.isis.extensions.excel.dom.WorksheetContent;
import org.apache.isis.extensions.excel.dom.WorksheetSpec;
@@ -31,12 +29,12 @@ import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Category
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Subcategory;
+import static org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem.Predicates.*;
+
import lombok.Getter;
import lombok.Setter;
import lombok.val;
-import static org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem.Predicates.*;
-
@DomainObject(
nature = Nature.VIEW_MODEL,
objectType = "libExcelFixture.BulkUpdateManagerForDemoToDoItem"
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java
index 419ad6d..06b81cd 100644
--- a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java
+++ b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java
@@ -2,7 +2,6 @@ package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupd
import javax.inject.Inject;
-import org.apache.isis.applib.annotation.*;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.services.repository.RepositoryService;
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java
index bfc7dd1..ebb8b24 100644
--- a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java
+++ b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java
@@ -4,7 +4,6 @@ import java.math.BigDecimal;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
-
import org.apache.isis.extensions.excel.dom.AggregationType;
import org.apache.isis.extensions.excel.dom.PivotColumn;
import org.apache.isis.extensions.excel.dom.PivotRow;
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java
index f1f429d..50d7844 100644
--- a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java
+++ b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java
@@ -5,7 +5,6 @@ import java.util.List;
import javax.inject.Inject;
-import org.apache.isis.applib.annotation.*;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.extensions.excel.dom.ExcelService;
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java
index 6471b9b..7f99ac7 100644
--- a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java
+++ b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java
@@ -1,8 +1,5 @@
package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem;
-import lombok.Getter;
-import lombok.Setter;
-
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.Collections;
@@ -12,13 +9,16 @@ import javax.inject.Inject;
import org.apache.isis.applib.clock.Clock;
import org.apache.isis.applib.services.user.UserService;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
import org.apache.isis.extensions.excel.dom.ExcelFixture;
import org.apache.isis.extensions.excel.dom.ExcelFixtureRowHandler;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Category;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Subcategory;
+import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+
+import lombok.Getter;
+import lombok.Setter;
public class DemoToDoItemRowHandler implements ExcelFixtureRowHandler {
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java
index 86ca4f7..88bf050 100644
--- a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java
+++ b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java
@@ -2,12 +2,12 @@ package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturehand
import java.math.BigDecimal;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
import org.apache.isis.extensions.excel.dom.ExcelFixture2;
import org.apache.isis.extensions.excel.dom.ExcelMetaDataEnabled;
import org.apache.isis.extensions.excel.dom.FixtureAwareRowHandler;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Category;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Subcategory;
+import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
import lombok.Getter;
import lombok.Setter;
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java
index d5b0228..200a2af 100644
--- a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java
+++ b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java
@@ -11,18 +11,16 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
-
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
-
import org.apache.isis.extensions.excel.dom.ExcelFixture;
import org.apache.isis.extensions.excel.dom.ExcelFixtureRowHandler;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Category;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Subcategory;
+import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
import lombok.Getter;
import lombok.Setter;
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java
index 1ef80fd..71613b5 100644
--- a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java
+++ b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java
@@ -4,13 +4,12 @@ import java.util.List;
import javax.inject.Inject;
-import org.apache.isis.applib.annotation.*;
import org.apache.isis.applib.value.Blob;
+import org.apache.isis.extensions.excel.dom.ExcelFixture;
+import org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem.DemoToDoItemRowHandler;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureResult;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
-import org.apache.isis.extensions.excel.dom.ExcelFixture;
-import org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem.DemoToDoItemRowHandler;
@DomainService(
nature = NatureOfService.VIEW,
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java
index 485f498..f1a67e7 100644
--- a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java
+++ b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java
@@ -3,7 +3,6 @@ package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturescri
import com.google.common.io.Resources;
import org.apache.isis.applib.annotation.DomainObject;
-
import org.apache.isis.extensions.excel.dom.ExcelFixture2;
import org.apache.isis.extensions.excel.dom.WorksheetSpec;
import org.apache.isis.extensions.excel.dom.util.Mode;
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java
index f5b2fc7..dc22446 100644
--- a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java
+++ b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java
@@ -3,20 +3,20 @@ package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturescri
import java.net.URL;
import java.util.List;
+import javax.inject.Inject;
+
import com.google.common.collect.Lists;
import com.google.common.io.Resources;
import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.applib.services.xactn.TransactionService;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
import org.apache.isis.extensions.excel.dom.ExcelFixture;
import org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem.DemoToDoItemRowHandler;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
+import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
import lombok.Getter;
-import javax.inject.Inject;
-
public class DemoToDoItem_create_usingExcelFixture extends FixtureScript {
private final String user;
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_recreate_usingExcelFixture.java b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_recreate_usingExcelFixture.java
index 9c7f3e4..fba1b7b 100644
--- a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_recreate_usingExcelFixture.java
+++ b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_recreate_usingExcelFixture.java
@@ -5,8 +5,8 @@ import javax.inject.Inject;
import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.applib.services.xactn.TransactionService;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.fixturescripts.ExcelDemoToDoItem_tearDown2;
+import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
public class DemoToDoItem_recreate_usingExcelFixture extends FixtureScript {
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java
index ec677c8..07dd513 100644
--- a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java
+++ b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java
@@ -3,15 +3,13 @@ package org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.fixturescri
import java.math.BigDecimal;
import java.time.LocalDate;
-import org.apache.isis.applib.services.jdosupport.IsisJdoSupport;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
-
import org.apache.isis.applib.clock.Clock;
-
+import org.apache.isis.applib.services.jdosupport.IsisJdoSupport;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Category;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Subcategory;
+import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
public class ExcelDemoToDoItem_recreate5_for extends FixtureScript {
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java
index d207dc3..055dc9e 100644
--- a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java
+++ b/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java
@@ -1,7 +1,7 @@
package org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.fixturescripts;
-import org.apache.isis.extensions.fixtures.legacy.teardown.TeardownFixtureAbstract2;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
+import org.apache.isis.extensions.fixtures.legacy.teardown.TeardownFixtureAbstract2;
public class ExcelDemoToDoItem_tearDown extends TeardownFixtureAbstract2 {
diff --git a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelFixture.java b/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelFixture.java
index 198c79d..ca9fed7 100644
--- a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelFixture.java
+++ b/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelFixture.java
@@ -11,20 +11,19 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.io.Resources;
-import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureResultList;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
import org.datanucleus.enhancement.Persistable;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.bookmark.BookmarkService;
+import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.value.Blob;
-
import org.apache.isis.extensions.excel.dom.util.ExcelServiceImpl;
+import org.apache.isis.extensions.fixtures.fixturescripts.FixtureResultList;
+import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
import lombok.Getter;
import lombok.Setter;
diff --git a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelService.java b/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelService.java
index e94fc53..774486f 100644
--- a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelService.java
+++ b/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelService.java
@@ -1,7 +1,5 @@
package org.apache.isis.extensions.excel.dom;
-import lombok.extern.log4j.Log4j2;
-
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -11,23 +9,23 @@ import javax.annotation.PostConstruct;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Primary;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Service;
import org.apache.isis.applib.RecoverableException;
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
+import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.extensions.excel.dom.util.ExcelServiceImpl;
import org.apache.isis.extensions.excel.dom.util.Mode;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Primary;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Service;
+
+import lombok.extern.log4j.Log4j2;
@Service
@Named("isisExtExcel.ExcelService")
diff --git a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/WorksheetSpec.java b/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/WorksheetSpec.java
index 104b1be..d8a02d7 100644
--- a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/WorksheetSpec.java
+++ b/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/WorksheetSpec.java
@@ -1,7 +1,5 @@
package org.apache.isis.extensions.excel.dom;
-import lombok.Setter;
-
import java.util.List;
import javax.inject.Inject;
@@ -9,6 +7,8 @@ import javax.inject.Inject;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.extensions.excel.dom.util.Mode;
+import lombok.Setter;
+
public class WorksheetSpec {
/**
diff --git a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/ExcelConverter.java b/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/ExcelConverter.java
index e2c2b8a..d0228e4 100644
--- a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/ExcelConverter.java
+++ b/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/ExcelConverter.java
@@ -6,7 +6,12 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.UUID;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -19,23 +24,21 @@ import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
-import org.apache.isis.metamodel.objectmanager.ObjectManager;
-import org.apache.isis.metamodel.spec.ManagedObject;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.feature.Contributed;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.CellType;
+import org.apache.poi.ss.usermodel.CreationHelper;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.VerticalAlignment;
+import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.bookmark.BookmarkService;
+import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.util.ObjectContracts;
-
import org.apache.isis.extensions.excel.dom.AggregationType;
import org.apache.isis.extensions.excel.dom.ExcelMetaDataEnabled;
import org.apache.isis.extensions.excel.dom.ExcelService;
@@ -47,6 +50,14 @@ import org.apache.isis.extensions.excel.dom.PivotValue;
import org.apache.isis.extensions.excel.dom.RowHandler;
import org.apache.isis.extensions.excel.dom.WorksheetContent;
import org.apache.isis.extensions.excel.dom.WorksheetSpec;
+import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
+import org.apache.isis.metamodel.objectmanager.ObjectManager;
+import org.apache.isis.metamodel.spec.ManagedObject;
+import org.apache.isis.metamodel.spec.ObjectSpecification;
+import org.apache.isis.metamodel.spec.feature.Contributed;
+import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.isis.metamodel.specloader.SpecificationLoader;
class ExcelConverter {
diff --git a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/ExcelFileBlobConverter.java b/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/ExcelFileBlobConverter.java
index 4ddb3dc..ef3de72 100644
--- a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/ExcelFileBlobConverter.java
+++ b/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/ExcelFileBlobConverter.java
@@ -11,7 +11,6 @@ import com.google.common.io.Resources;
import org.apache.poi.util.IOUtils;
import org.apache.isis.applib.value.Blob;
-
import org.apache.isis.extensions.excel.dom.ExcelService;
public class ExcelFileBlobConverter {
diff --git a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/SheetPivoter.java b/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/SheetPivoter.java
index 3036059..75afc60 100644
--- a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/SheetPivoter.java
+++ b/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/SheetPivoter.java
@@ -6,7 +6,14 @@ import java.util.Iterator;
import java.util.List;
import org.apache.poi.hssf.util.HSSFColor;
-import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.usermodel.BorderStyle;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.CellType;
+import org.apache.poi.ss.usermodel.FillPatternType;
+import org.apache.poi.ss.usermodel.Font;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.util.CellReference;
import org.apache.isis.extensions.excel.dom.AggregationType;
diff --git a/extensions/lib/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/AnnotationListTest.java b/extensions/lib/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/AnnotationListTest.java
index eaedd60..674f5ca 100644
--- a/extensions/lib/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/AnnotationListTest.java
+++ b/extensions/lib/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/AnnotationListTest.java
@@ -3,8 +3,6 @@ package org.apache.isis.extensions.excel.dom.util;
import java.util.Arrays;
import java.util.List;
-import org.apache.isis.extensions.excel.dom.util.AnnotationList;
-import org.apache.isis.extensions.excel.dom.util.AnnotationTriplet;
import org.assertj.core.api.Assertions;
import org.junit.Test;
diff --git a/extensions/lib/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/AnnotationTripletTest.java b/extensions/lib/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/AnnotationTripletTest.java
index d14a860..432492f 100644
--- a/extensions/lib/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/AnnotationTripletTest.java
+++ b/extensions/lib/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/AnnotationTripletTest.java
@@ -4,7 +4,6 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import org.apache.isis.extensions.excel.dom.util.AnnotationTriplet;
import org.assertj.core.api.Assertions;
import org.junit.Test;
diff --git a/extensions/lib/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/PivotUtilsTest.java b/extensions/lib/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/PivotUtilsTest.java
index aba846d..0857532 100644
--- a/extensions/lib/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/PivotUtilsTest.java
+++ b/extensions/lib/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/PivotUtilsTest.java
@@ -3,7 +3,6 @@ package org.apache.isis.extensions.excel.dom.util;
import java.util.Arrays;
import java.util.List;
-import org.apache.isis.extensions.excel.dom.util.PivotUtils;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellStyle;
import org.apache.poi.ss.usermodel.CellType;
diff --git a/extensions/lib/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/SheetPivoterTest.java b/extensions/lib/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/SheetPivoterTest.java
index 251b670..e8db5c3 100644
--- a/extensions/lib/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/SheetPivoterTest.java
+++ b/extensions/lib/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/SheetPivoterTest.java
@@ -3,7 +3,6 @@ package org.apache.isis.extensions.excel.dom.util;
import java.util.Arrays;
import java.util.List;
-import org.apache.isis.extensions.excel.dom.util.SheetPivoter;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.Row;
diff --git a/extensions/lib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java b/extensions/lib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java
index 3345d2c..2789e10 100644
--- a/extensions/lib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java
+++ b/extensions/lib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java
@@ -1,12 +1,5 @@
package org.apache.isis.extensions.excel.integtests;
-import org.apache.isis.config.IsisPresets;
-import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
-import org.apache.isis.extensions.fixtures.IsisIntegrationTestAbstractWithFixtures;
-import org.apache.isis.jdo.IsisBootDataNucleus;
-import org.apache.isis.runtime.spring.IsisBoot;
-import org.apache.isis.security.bypass.IsisBootSecurityBypass;
-import org.apache.isis.extensions.excel.fixtures.ExcelFixturesModule;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
@@ -15,6 +8,14 @@ import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.transaction.annotation.Transactional;
+import org.apache.isis.config.IsisPresets;
+import org.apache.isis.extensions.excel.fixtures.ExcelFixturesModule;
+import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
+import org.apache.isis.extensions.fixtures.IsisIntegrationTestAbstractWithFixtures;
+import org.apache.isis.jdo.IsisBootDataNucleus;
+import org.apache.isis.runtime.spring.IsisBoot;
+import org.apache.isis.security.bypass.IsisBootSecurityBypass;
+
@SpringBootTest(
classes = ExcelModuleIntegTestAbstract.AppManifest.class
)
diff --git a/extensions/lib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java b/extensions/lib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java
index 219c8ba..a4b1cce 100644
--- a/extensions/lib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java
+++ b/extensions/lib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java
@@ -8,6 +8,8 @@ import javax.inject.Inject;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem.DemoToDoItemRowHandler2;
import org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturescripts.DemoFixture_extending_ExcelFixture2;
import org.apache.isis.extensions.excel.integtests.ExcelModuleIntegTestAbstract;
@@ -15,8 +17,6 @@ import org.apache.isis.extensions.fixtures.fixturescripts.FixtureResult;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
-import static org.assertj.core.api.Assertions.assertThat;
-
import lombok.val;
public class ExcelModuleDemoMetaDataEnabled_IntegTest extends ExcelModuleIntegTestAbstract {
diff --git a/extensions/lib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java b/extensions/lib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java
index b693c68..122f0a4 100644
--- a/extensions/lib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java
+++ b/extensions/lib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java
@@ -13,21 +13,18 @@ import org.assertj.core.api.Assertions;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.apache.isis.applib.value.Blob;
-
import org.apache.isis.extensions.excel.dom.ExcelService;
-import org.apache.isis.extensions.excel.integtests.ExcelModuleIntegTestAbstract;
import org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateLineItemForDemoToDoItem;
import org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateManagerForDemoToDoItem;
import org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateMenuForDemoToDoItem;
import org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturescripts.DemoToDoItem_recreate_usingExcelFixture;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-import static org.hamcrest.CoreMatchers.is;
+import org.apache.isis.extensions.excel.integtests.ExcelModuleIntegTestAbstract;
public class ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest extends ExcelModuleIntegTestAbstract {
diff --git a/extensions/lib/freemarker/impl/src/main/java/org/apache/isis/extensions/freemarker/dom/IsisModuleExtFreemarker.java b/extensions/lib/freemarker/impl/src/main/java/org/apache/isis/extensions/freemarker/dom/IsisModuleExtFreemarker.java
index 4a2bd8a..5454736 100644
--- a/extensions/lib/freemarker/impl/src/main/java/org/apache/isis/extensions/freemarker/dom/IsisModuleExtFreemarker.java
+++ b/extensions/lib/freemarker/impl/src/main/java/org/apache/isis/extensions/freemarker/dom/IsisModuleExtFreemarker.java
@@ -20,7 +20,6 @@ package org.apache.isis.extensions.freemarker.dom;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
@Configuration
@ComponentScan
diff --git a/extensions/lib/jaxrsclient/impl/src/main/java/org/apache/isis/extensions/jaxrsclient/dom/IsisModuleExtJaxRsClient.java b/extensions/lib/jaxrsclient/impl/src/main/java/org/apache/isis/extensions/jaxrsclient/dom/IsisModuleExtJaxRsClient.java
index 727f66b..ab16d86 100644
--- a/extensions/lib/jaxrsclient/impl/src/main/java/org/apache/isis/extensions/jaxrsclient/dom/IsisModuleExtJaxRsClient.java
+++ b/extensions/lib/jaxrsclient/impl/src/main/java/org/apache/isis/extensions/jaxrsclient/dom/IsisModuleExtJaxRsClient.java
@@ -20,7 +20,6 @@ package org.apache.isis.extensions.jaxrsclient.dom;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
@Configuration
@ComponentScan
diff --git a/extensions/lib/ognl/impl/src/main/java/org/apache/isis/extensions/ognl/dom/IsisModuleExtOgnl.java b/extensions/lib/ognl/impl/src/main/java/org/apache/isis/extensions/ognl/dom/IsisModuleExtOgnl.java
index 74e4fe0..aa1c2fb 100644
--- a/extensions/lib/ognl/impl/src/main/java/org/apache/isis/extensions/ognl/dom/IsisModuleExtOgnl.java
+++ b/extensions/lib/ognl/impl/src/main/java/org/apache/isis/extensions/ognl/dom/IsisModuleExtOgnl.java
@@ -20,7 +20,6 @@ package org.apache.isis.extensions.ognl.dom;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
@Configuration
@ComponentScan
diff --git a/extensions/lib/pdfbox/impl/src/main/java/org/apache/isis/extensions/pdfbox/dom/IsisModuleExtPdfBox.java b/extensions/lib/pdfbox/impl/src/main/java/org/apache/isis/extensions/pdfbox/dom/IsisModuleExtPdfBox.java
index 1bb85ea..6555bb8 100644
--- a/extensions/lib/pdfbox/impl/src/main/java/org/apache/isis/extensions/pdfbox/dom/IsisModuleExtPdfBox.java
+++ b/extensions/lib/pdfbox/impl/src/main/java/org/apache/isis/extensions/pdfbox/dom/IsisModuleExtPdfBox.java
@@ -20,7 +20,6 @@ package org.apache.isis.extensions.pdfbox.dom;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
@Configuration
@ComponentScan
diff --git a/extensions/lib/slack/impl/src/main/java/org/apache/isis/extensions/slack/dom/IsisModuleExtSlack.java b/extensions/lib/slack/impl/src/main/java/org/apache/isis/extensions/slack/dom/IsisModuleExtSlack.java
index 771f7dd..5f5defa 100644
--- a/extensions/lib/slack/impl/src/main/java/org/apache/isis/extensions/slack/dom/IsisModuleExtSlack.java
+++ b/extensions/lib/slack/impl/src/main/java/org/apache/isis/extensions/slack/dom/IsisModuleExtSlack.java
@@ -20,7 +20,6 @@ package org.apache.isis.extensions.slack.dom;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
@Configuration
@ComponentScan
diff --git a/extensions/lib/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/IsisModuleExtXDocReport.java b/extensions/lib/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/IsisModuleExtXDocReport.java
index c18f300..38352eb 100644
--- a/extensions/lib/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/IsisModuleExtXDocReport.java
+++ b/extensions/lib/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/IsisModuleExtXDocReport.java
@@ -20,7 +20,6 @@ package org.apache.isis.extensions.xdocreport.dom;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
@Configuration
@ComponentScan
diff --git a/extensions/lib/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/impl/XDocReportService.java b/extensions/lib/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/impl/XDocReportService.java
index d9ad6ff..94703b4 100644
--- a/extensions/lib/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/impl/XDocReportService.java
+++ b/extensions/lib/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/impl/XDocReportService.java
@@ -1,26 +1,27 @@
package org.apache.isis.extensions.xdocreport.dom.impl;
-import fr.opensagres.xdocreport.core.XDocReportException;
-import fr.opensagres.xdocreport.core.io.internal.ByteArrayOutputStream;
-import fr.opensagres.xdocreport.document.IXDocReport;
-import fr.opensagres.xdocreport.document.registry.XDocReportRegistry;
-import fr.opensagres.xdocreport.template.IContext;
-import fr.opensagres.xdocreport.template.TemplateEngineKind;
-import fr.opensagres.xdocreport.template.formatter.FieldsMetadata;
-
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.util.Map;
import javax.annotation.PostConstruct;
-import org.apache.isis.applib.annotation.Programmatic;
import org.apache.poi.xwpf.converter.core.IXWPFConverter;
import org.apache.poi.xwpf.converter.pdf.PdfConverter;
import org.apache.poi.xwpf.converter.pdf.PdfOptions;
import org.apache.poi.xwpf.usermodel.XWPFDocument;
import org.springframework.stereotype.Service;
+import org.apache.isis.applib.annotation.Programmatic;
+
+import fr.opensagres.xdocreport.core.XDocReportException;
+import fr.opensagres.xdocreport.core.io.internal.ByteArrayOutputStream;
+import fr.opensagres.xdocreport.document.IXDocReport;
+import fr.opensagres.xdocreport.document.registry.XDocReportRegistry;
+import fr.opensagres.xdocreport.template.IContext;
+import fr.opensagres.xdocreport.template.TemplateEngineKind;
+import fr.opensagres.xdocreport.template.formatter.FieldsMetadata;
+
@Service
public class XDocReportService {
diff --git a/extensions/lib/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/models/ProjectDevelopersModel.java b/extensions/lib/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/models/ProjectDevelopersModel.java
index bbaad82..634856a 100644
--- a/extensions/lib/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/models/ProjectDevelopersModel.java
+++ b/extensions/lib/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/models/ProjectDevelopersModel.java
@@ -1,13 +1,13 @@
package org.apache.isis.extensions.xdocreport.dom.impl.example.models;
-import lombok.Data;
-
import java.util.List;
import java.util.Map;
+import com.google.common.collect.ImmutableMap;
+
import org.apache.isis.extensions.xdocreport.dom.impl.XDocReportModel;
-import com.google.common.collect.ImmutableMap;
+import lombok.Data;
@Data
public class ProjectDevelopersModel implements XDocReportModel {
diff --git a/extensions/lib/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/service/XDocReportServiceTest.java b/extensions/lib/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/service/XDocReportServiceTest.java
index ca9f9fa..6431ffe 100644
--- a/extensions/lib/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/service/XDocReportServiceTest.java
+++ b/extensions/lib/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/service/XDocReportServiceTest.java
@@ -1,7 +1,5 @@
package org.apache.isis.extensions.xdocreport.dom.impl.service;
-import fr.opensagres.xdocreport.core.io.IOUtils;
-
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -9,16 +7,19 @@ import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
import org.apache.isis.extensions.xdocreport.dom.impl.OutputType;
import org.apache.isis.extensions.xdocreport.dom.impl.XDocReportService;
import org.apache.isis.extensions.xdocreport.dom.impl.example.models.Developer;
import org.apache.isis.extensions.xdocreport.dom.impl.example.models.Project;
import org.apache.isis.extensions.xdocreport.dom.impl.example.models.ProjectDevelopersModel;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+
+import fr.opensagres.xdocreport.core.io.IOUtils;
public class XDocReportServiceTest {
diff --git a/extensions/lib/zip/impl/src/main/java/org/apache/isis/extensions/zip/dom/IsisModuleExtZip.java b/extensions/lib/zip/impl/src/main/java/org/apache/isis/extensions/zip/dom/IsisModuleExtZip.java
index 626d364..0b9a492 100644
--- a/extensions/lib/zip/impl/src/main/java/org/apache/isis/extensions/zip/dom/IsisModuleExtZip.java
+++ b/extensions/lib/zip/impl/src/main/java/org/apache/isis/extensions/zip/dom/IsisModuleExtZip.java
@@ -20,7 +20,6 @@ package org.apache.isis.extensions.zip.dom;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
@Configuration
@ComponentScan
diff --git a/extensions/lib/zip/impl/src/main/java/org/apache/isis/extensions/zip/dom/impl/ZipService.java b/extensions/lib/zip/impl/src/main/java/org/apache/isis/extensions/zip/dom/impl/ZipService.java
index e702dfa..00bbcc1 100644
--- a/extensions/lib/zip/impl/src/main/java/org/apache/isis/extensions/zip/dom/impl/ZipService.java
+++ b/extensions/lib/zip/impl/src/main/java/org/apache/isis/extensions/zip/dom/impl/ZipService.java
@@ -1,8 +1,5 @@
package org.apache.isis.extensions.zip.dom.impl;
-import lombok.Data;
-import lombok.var;
-
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
@@ -11,12 +8,15 @@ import java.util.stream.Collectors;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
-import org.apache.isis.applib.FatalException;
-import org.springframework.stereotype.Service;
-
import com.google.common.io.ByteSource;
import com.google.common.io.Files;
+import org.springframework.stereotype.Service;
+
+import org.apache.isis.applib.FatalException;
+
+import lombok.Data;
+
@Service
public class ZipService {
diff --git a/extensions/persistence/flywayjdo/impl/src/main/java/org/apache/isis/extensions/flywayjdo/dom/IsisModuleExtFlywayJdo.java b/extensions/persistence/flywayjdo/impl/src/main/java/org/apache/isis/extensions/flywayjdo/dom/IsisModuleExtFlywayJdo.java
index 09412b7..82920f6 100644
--- a/extensions/persistence/flywayjdo/impl/src/main/java/org/apache/isis/extensions/flywayjdo/dom/IsisModuleExtFlywayJdo.java
+++ b/extensions/persistence/flywayjdo/impl/src/main/java/org/apache/isis/extensions/flywayjdo/dom/IsisModuleExtFlywayJdo.java
@@ -18,10 +18,8 @@
*/
package org.apache.isis.extensions.flywayjdo.dom;
-import org.apache.isis.webapp.IsisModuleWebapp;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
@Configuration
@ComponentScan
diff --git a/extensions/persistence/h2console/impl/src/main/java/org/apache/isis/extensions/h2console/dom/webmodule/WebModuleH2Console.java b/extensions/persistence/h2console/impl/src/main/java/org/apache/isis/extensions/h2console/dom/webmodule/WebModuleH2Console.java
index e7fb567..d634b62 100644
--- a/extensions/persistence/h2console/impl/src/main/java/org/apache/isis/extensions/h2console/dom/webmodule/WebModuleH2Console.java
+++ b/extensions/persistence/h2console/impl/src/main/java/org/apache/isis/extensions/h2console/dom/webmodule/WebModuleH2Console.java
@@ -41,8 +41,8 @@ import org.apache.isis.webapp.modules.WebModuleAbstract;
import org.apache.isis.webapp.modules.WebModuleContext;
import lombok.Getter;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Service
@Named("isisExtH2Console.WebModuleH2Console")
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClass.layout.xml b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClass.layout.xml
index c11ff86..ccb73e7 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClass.layout.xml
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClass.layout.xml
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/links http://isis.apache.org/applib/layout/links/links.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:lnk="h [...]
+<bs3:grid
+ xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject/>
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassAction.layout.xml b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassAction.layout.xml
index 54a0502..d9468dc 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassAction.layout.xml
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassAction.layout.xml
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/links http://isis.apache.org/applib/layout/links/links.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:lnk="h [...]
+<bs3:grid
+ xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject/>
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassCollection.layout.xml b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassCollection.layout.xml
index a3c6d2d..c792296 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassCollection.layout.xml
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassCollection.layout.xml
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/links http://isis.apache.org/applib/layout/links/links.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:lnk="h [...]
+<bs3:grid
+ xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject/>
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassProperty.layout.xml b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassProperty.layout.xml
index 5a02bc7..2f81cc7 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassProperty.layout.xml
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassProperty.layout.xml
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/links http://isis.apache.org/applib/layout/links/links.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:lnk="h [...]
+<bs3:grid
+ xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject/>
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationPackage.layout.xml b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationPackage.layout.xml
index 9037b07..3a1fd24 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationPackage.layout.xml
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationPackage.layout.xml
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/links http://isis.apache.org/applib/layout/links/links.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:lnk="h [...]
+<bs3:grid
+ xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject/>
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/UserPermissionViewModel.layout.xml b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/UserPermissionViewModel.layout.xml
index cb235be..a75d572 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/UserPermissionViewModel.layout.xml
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/UserPermissionViewModel.layout.xml
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/links http://isis.apache.org/applib/layout/links/links.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:lnk="h [...]
+<bs3:grid
+ xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject/>
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermission.layout.xml b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermission.layout.xml
index 18262cb..cc62413 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermission.layout.xml
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermission.layout.xml
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/links http://isis.apache.org/applib/layout/links/links.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:lnk="h [...]
+<bs3:grid
+ xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject/>
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermissionRepository.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermissionRepository.java
index 39e3f97..14c7968 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermissionRepository.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermissionRepository.java
@@ -51,8 +51,8 @@ import org.apache.isis.metamodel.services.appfeat.ApplicationFeatureId;
import org.apache.isis.metamodel.services.appfeat.ApplicationFeatureRepositoryDefault;
import org.apache.isis.metamodel.services.appfeat.ApplicationFeatureType;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Repository
@Named("isisExtSecman.applicationPermissionRepository")
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRole.layout.xml b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRole.layout.xml
index 8a14621..0dfdae6 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRole.layout.xml
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRole.layout.xml
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/links http://isis.apache.org/applib/layout/links/links.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:lnk="h [...]
+<bs3:grid
+ xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject/>
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancy.layout.xml b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancy.layout.xml
index d74f66b..ef4d7a7 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancy.layout.xml
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancy.layout.xml
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/links http://isis.apache.org/applib/layout/links/links.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:lnk="h [...]
+<bs3:grid
+ xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject/>
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.layout.xml b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.layout.xml
index c704ed6..85e4a2d 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.layout.xml
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.layout.xml
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/links http://isis.apache.org/applib/layout/links/links.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:lnk="h [...]
+<bs3:grid
+ xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject/>
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java
index 42af90a..b5d34c0 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java
@@ -31,8 +31,8 @@ import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
import org.apache.isis.runtime.context.session.AppLifecycleEvent;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Service
@Named("isisExtSecman.SeedSecurityModuleService")
diff --git a/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/services/SecurityRealmServiceUsingShiro.java b/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/services/SecurityRealmServiceUsingShiro.java
index 79cf142..bf72e95 100644
--- a/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/services/SecurityRealmServiceUsingShiro.java
+++ b/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/services/SecurityRealmServiceUsingShiro.java
@@ -31,8 +31,8 @@ import org.apache.isis.extensions.secman.api.SecurityRealm;
import org.apache.isis.extensions.secman.api.SecurityRealmService;
import org.apache.isis.extensions.secman.shiro.util.ShiroUtils;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Service
@Named("isisExtSecman.SecurityRealmServiceUsingShiro")
diff --git a/extensions/testing/fakedata/impl/src/test/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataServiceTest.java b/extensions/testing/fakedata/impl/src/test/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataServiceTest.java
index 84a7486..a5a8159 100644
--- a/extensions/testing/fakedata/impl/src/test/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataServiceTest.java
+++ b/extensions/testing/fakedata/impl/src/test/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataServiceTest.java
@@ -19,6 +19,8 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.isis.applib.services.clock.ClockService;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.value.Blob;
@@ -28,8 +30,6 @@ import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Sets;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import static org.assertj.core.api.Assertions.assertThat;
-
public class FakeDataServiceTest {
@Rule
diff --git a/extensions/testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/FakeDataModuleIntegTestAbstract.java b/extensions/testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
index 51da384..ddd9399 100644
--- a/extensions/testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
+++ b/extensions/testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
@@ -1,13 +1,6 @@
package org.apache.isis.extensions.fakedata.integtests;
-import org.apache.isis.config.IsisPresets;
-import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
-import org.apache.isis.extensions.fixtures.IsisIntegrationTestAbstractWithFixtures;
-import org.apache.isis.jdo.IsisBootDataNucleus;
-import org.apache.isis.runtime.spring.IsisBoot;
-import org.apache.isis.security.bypass.IsisBootSecurityBypass;
-import org.isisaddons.module.fakedata.fixture.FakeDataFixturesModule;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
@@ -16,6 +9,15 @@ import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.transaction.annotation.Transactional;
+import org.apache.isis.config.IsisPresets;
+import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
+import org.apache.isis.extensions.fixtures.IsisIntegrationTestAbstractWithFixtures;
+import org.apache.isis.jdo.IsisBootDataNucleus;
+import org.apache.isis.runtime.spring.IsisBoot;
+import org.apache.isis.security.bypass.IsisBootSecurityBypass;
+
+import org.isisaddons.module.fakedata.fixture.FakeDataFixturesModule;
+
@SpringBootTest(
classes = FakeDataModuleIntegTestAbstract.AppManifest.class
)
diff --git a/extensions/testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Bootstrap_IntegTest.java b/extensions/testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Bootstrap_IntegTest.java
index 996ee53..1969a7e 100644
--- a/extensions/testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Bootstrap_IntegTest.java
+++ b/extensions/testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Bootstrap_IntegTest.java
@@ -18,10 +18,11 @@
*/
package org.apache.isis.extensions.fakedata.integtests.tests;
-import org.apache.isis.extensions.fakedata.integtests.FakeDataModuleIntegTestAbstract;
import org.junit.jupiter.api.Test;
import org.springframework.transaction.annotation.Transactional;
+import org.apache.isis.extensions.fakedata.integtests.FakeDataModuleIntegTestAbstract;
+
@Transactional
public class Bootstrap_IntegTest extends FakeDataModuleIntegTestAbstract {
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/modules/ModuleWithFixturesService.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/modules/ModuleWithFixturesService.java
index 51ab0f6..7a45160 100644
--- a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/modules/ModuleWithFixturesService.java
+++ b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/modules/ModuleWithFixturesService.java
@@ -46,8 +46,8 @@ import org.apache.isis.extensions.spring.service.SpringBeansService;
import org.apache.isis.metamodel.facets.Annotations;
import lombok.Data;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Service
@Named("isisExtFixtures.ModuleService")
diff --git a/extensions/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/legacy/FixtureClockInstantiationTest.java b/extensions/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/legacy/FixtureClockInstantiationTest.java
index 52e7244..0d30744 100644
--- a/extensions/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/legacy/FixtureClockInstantiationTest.java
+++ b/extensions/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/legacy/FixtureClockInstantiationTest.java
@@ -22,12 +22,12 @@ package org.apache.isis.extensions.fixtures.legacy;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.applib.clock.Clock;
-
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.applib.clock.Clock;
+
public class FixtureClockInstantiationTest {
@Before
diff --git a/extensions/vw/servletapi/impl/src/main/java/org/apache/isis/extensions/jaxrsclient/dom/IsisModuleExtJaxRsClient.java b/extensions/vw/servletapi/impl/src/main/java/org/apache/isis/extensions/jaxrsclient/dom/IsisModuleExtJaxRsClient.java
index 727f66b..ab16d86 100644
--- a/extensions/vw/servletapi/impl/src/main/java/org/apache/isis/extensions/jaxrsclient/dom/IsisModuleExtJaxRsClient.java
+++ b/extensions/vw/servletapi/impl/src/main/java/org/apache/isis/extensions/jaxrsclient/dom/IsisModuleExtJaxRsClient.java
@@ -20,7 +20,6 @@ package org.apache.isis.extensions.jaxrsclient.dom;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
@Configuration
@ComponentScan
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java b/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java
index eac8a9a..9be96c2 100644
--- a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java
+++ b/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java
@@ -51,8 +51,8 @@ import org.apache.isis.runtime.session.IsisSessionFactory;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.Value;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
/**
* Server-sent events.
[isis] 03/08: ISIS-2158: organize imports for 'incubator'
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 0cabd9a685496109607cf4379b023bbcad33cd42
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jan 4 14:11:36 2020 +0000
ISIS-2158: organize imports for 'incubator'
---
.../isis/metamodel/examples/facets/jsr303/CustomPattern.java | 8 ++++----
.../isis/metamodel/examples/facets/jsr303/CustomPatterns.java | 6 +++---
.../examples/facets/jsr303/Jsr303FacetFacetHolder.java | 7 ++++---
.../facets/jsr303/Jsr303FacetFactoryFeatureTypes.java | 7 ++++---
.../facets/jsr303/Jsr303FacetFactoryInstantiation.java | 1 +
.../facets/jsr303/Jsr303FacetFactoryProcessObject.java | 5 +++--
.../facets/jsr303/Jsr303FacetFactoryProcessProperty.java | 5 +++--
.../examples/facets/jsr303/Jsr303FacetInstantiation.java | 1 +
.../facets/jsr303/Jsr303FacetValidatingInteraction.java | 11 ++++++-----
.../isis/runtime/jee_support/IsisCDIBeanScanInterceptor.java | 2 +-
10 files changed, 30 insertions(+), 23 deletions(-)
diff --git a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java
index fd04d8e..05ed767 100644
--- a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java
+++ b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java
@@ -20,14 +20,14 @@
package org.apache.isis.metamodel.examples.facets.jsr303;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import javax.validation.ConstraintValidator;
diff --git a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java
index fc2828a..17eefcb 100644
--- a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java
+++ b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java
@@ -20,14 +20,14 @@
package org.apache.isis.metamodel.examples.facets.jsr303;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
@Documented
@Target( { ElementType.METHOD, FIELD })
diff --git a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java
index b8376b6..421c9e2 100644
--- a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java
+++ b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java
@@ -20,9 +20,6 @@
package org.apache.isis.metamodel.examples.facets.jsr303;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
@@ -31,6 +28,10 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.metamodel.examples.facets.jsr303.Jsr303PropertyValidationFacet;
import org.apache.isis.metamodel.facets.FacetHolder;
diff --git a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java
index 45dd6d5..59083a5 100644
--- a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java
+++ b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java
@@ -20,13 +20,14 @@
package org.apache.isis.metamodel.examples.facets.jsr303;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.collection.IsArrayContaining.hasItemInArray;
import static org.junit.Assert.assertThat;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
import org.apache.isis.metamodel.examples.facets.jsr303.Jsr303FacetFactory;
import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
diff --git a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java
index c3ed4ab..731c7ff 100644
--- a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java
+++ b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java
@@ -21,6 +21,7 @@
package org.apache.isis.metamodel.examples.facets.jsr303;
import org.junit.Test;
+
import org.apache.isis.metamodel.examples.facets.jsr303.Jsr303FacetFactory;
diff --git a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java
index fa0f288..f8f846e 100644
--- a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java
+++ b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java
@@ -20,8 +20,6 @@
package org.apache.isis.metamodel.examples.facets.jsr303;
-import static org.junit.Assert.fail;
-
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
@@ -31,6 +29,9 @@ import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
+
+import static org.junit.Assert.fail;
+
import org.apache.isis.metamodel.examples.facets.jsr303.Jsr303FacetFactory;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.facets.MethodRemover;
diff --git a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java
index 76fe303..821a92a 100644
--- a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java
+++ b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java
@@ -20,8 +20,6 @@
package org.apache.isis.metamodel.examples.facets.jsr303;
-import static org.apache.isis.metamodel.commons.matchers.NofMatchers.anInstanceOf;
-
import java.lang.reflect.Method;
import org.jmock.Expectations;
@@ -33,11 +31,14 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+
import org.apache.isis.metamodel.examples.facets.jsr303.Jsr303FacetFactory;
import org.apache.isis.metamodel.examples.facets.jsr303.Jsr303PropertyValidationFacet;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.facets.MethodRemover;
+import static org.apache.isis.metamodel.commons.matchers.NofMatchers.anInstanceOf;
+
@RunWith(JMock.class)
public class Jsr303FacetFactoryProcessProperty {
diff --git a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java
index e1619fd..27c1849 100644
--- a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java
+++ b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java
@@ -23,6 +23,7 @@ package org.apache.isis.metamodel.examples.facets.jsr303;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+
import org.apache.isis.metamodel.examples.facets.jsr303.Jsr303PropertyValidationFacet;
import org.apache.isis.metamodel.facets.FacetHolderImpl;
diff --git a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetValidatingInteraction.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetValidatingInteraction.java
index cc86f66..04b61ff 100644
--- a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetValidatingInteraction.java
+++ b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetValidatingInteraction.java
@@ -20,11 +20,6 @@
package org.apache.isis.metamodel.examples.facets.jsr303;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
@@ -34,6 +29,12 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.applib.Identifier;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.examples.facets.jsr303.Jsr303PropertyValidationFacet;
diff --git a/incubator/core/microprofile/src/main/java/org/apache/isis/runtime/jee_support/IsisCDIBeanScanInterceptor.java b/incubator/core/microprofile/src/main/java/org/apache/isis/runtime/jee_support/IsisCDIBeanScanInterceptor.java
index 4e3d607..cebb542 100644
--- a/incubator/core/microprofile/src/main/java/org/apache/isis/runtime/jee_support/IsisCDIBeanScanInterceptor.java
+++ b/incubator/core/microprofile/src/main/java/org/apache/isis/runtime/jee_support/IsisCDIBeanScanInterceptor.java
@@ -32,8 +32,8 @@ import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
import org.apache.isis.applib.services.metrics.MetricsService;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
/**
*
[isis] 05/08: ISIS-2158: re-run 'optimize imports' for 'core'
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 38e448caaf2de6effba1c267945d6f2f5d6c3c0f
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jan 4 14:29:41 2020 +0000
ISIS-2158: re-run 'optimize imports' for 'core'
---
.../isis/commons/internal/concurrent/_ConcurrentTaskList.java | 2 +-
.../isis/commons/internal/environment/IsisSystemEnvironment.java | 2 +-
.../org/apache/isis/commons/internal/ioc/cdi/_CDI_Lifecycle.java | 2 +-
.../java/org/apache/isis/commons/internal/ioc/spring/_Spring.java | 2 +-
.../isis/config/beans/IsisBeanFactoryPostProcessorForSpring.java | 2 +-
.../java/org/apache/isis/config/beans/IsisBeanTypeRegistry.java | 2 +-
.../authorization/standard/AuthorizationFacetAbstract.java | 2 +-
.../java/org/apache/isis/metamodel/facets/DependentArgUtils.java | 2 +-
.../object/title/annotation/TitleFacetViaTitleAnnotation.java | 2 +-
.../facets/object/title/methods/TitleFacetViaTitleMethod.java | 2 +-
.../objectmanager/create/ObjectCreator_builtinHandlers.java | 2 +-
.../metamodel/progmodel/ProgrammingModelInitFilterDefault.java | 2 +-
.../org/apache/isis/metamodel/services/ServiceInjectorLegacy.java | 2 +-
.../services/appfeat/ApplicationFeatureRepositoryDefault.java | 2 +-
.../isis/metamodel/services/layout/LayoutServiceDefault.java | 2 +-
.../apache/isis/metamodel/services/title/TitleServiceDefault.java | 2 +-
.../isis/metamodel/specloader/ProgrammingModelServiceDefault.java | 2 +-
.../isis/metamodel/specloader/SpecificationLoaderDefault.java | 2 +-
.../isis/metamodel/specloader/specimpl/FacetedMethodsBuilder.java | 2 +-
.../metamodel/specloader/specimpl/ObjectSpecificationAbstract.java | 2 +-
.../specloader/specimpl/dflt/ObjectSpecificationDefault.java | 2 +-
.../java/org/apache/isis/metamodel/util/snapshot/XmlSnapshot.java | 2 +-
.../isis/metamodel/interactions/InteractionUtils_isA_Test.java | 3 ++-
.../jdo/datanucleus5/datanucleus/DataNucleusContextUtil.java | 2 +-
.../persistence/commands/DataNucleusCreateObjectCommand.java | 2 +-
.../queries/PersistenceQueryFindAllInstancesProcessor.java | 2 +-
.../queries/PersistenceQueryFindUsingApplibQueryProcessor.java | 2 +-
.../datanucleus/service/JdoPersistenceLifecycleService.java | 2 +-
.../jdo/datanucleus5/objectadapter/ObjectAdapterContext.java | 2 +-
.../persistence/DataNucleusApplicationComponents5.java | 2 +-
.../datanucleus5/persistence/IsisPersistenceSessionJdoBase.java | 2 +-
.../persistence/IsisPlatformTransactionManagerForJdo.java | 2 +-
.../jdo/datanucleus5/persistence/IsisTransactionJdo.java | 2 +-
.../jdo/datanucleus5/persistence/IsisTransactionManagerJdo.java | 2 +-
.../jdo/datanucleus5/persistence/PersistenceSession5.java | 2 +-
.../jdo/datanucleus5/persistence/PersistenceSessionFactory5.java | 2 +-
.../runtime/services/background/BackgroundCommandExecution.java | 2 +-
.../runtime/services/bookmarks/BookmarkServiceInternalDefault.java | 2 +-
.../runtime/services/command/CommandExecutorServiceDefault.java | 2 +-
.../runtime/services/confmenu/ConfigurationViewServiceDefault.java | 2 +-
.../isis/runtime/services/factory/FactoryServiceDefault.java | 2 +-
.../runtime/services/homepage/HomePageResolverServiceDefault.java | 2 +-
.../runtime/services/menubars/MenuBarsLoaderServiceDefault.java | 2 +-
.../runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java | 2 +-
.../isis/runtime/services/repository/RepositoryServiceDefault.java | 2 +-
.../isis/runtime/services/routing/RoutingServiceDefault.java | 2 +-
.../runtime/services/sessmgmt/SessionManagementServiceDefault.java | 2 +-
.../isis/runtime/services/wrapper/WrapperFactoryDefault.java | 2 +-
.../isis/runtime/services/xactn/TransactionServiceSpring.java | 2 +-
.../isis/runtime/persistence/session/events/TimestampService.java | 2 +-
.../runtime/persistence/transaction/AuditerDispatchService.java | 2 +-
.../runtime/persistence/transaction/ChangedObjectsService.java | 2 +-
.../org/apache/isis/runtime/session/IsisSessionFactoryDefault.java | 2 +-
.../org/apache/isis/security/shiro/webmodule/WebModuleShiro.java | 2 +-
.../unittestsupport/config/internal/_Config_LifecycleResource.java | 2 +-
.../isis/unittestsupport/config/internal/_Config_Parsers.java | 2 +-
.../restfulobjects/rendering/domainobjects/JsonValueEncoder.java | 2 +-
.../rendering/service/swagger/internal/Generation.java | 3 ++-
.../rendering/service/swagger/internal/SwaggerSpecGenerator.java | 3 ++-
.../service/swagger/internal/ValuePropertyFactoryDefault.java | 3 ++-
.../viewer/wicket/model/models/ScalarModelWithMultiPending.java | 2 +-
.../ui/components/actionmenu/serviceactions/ServiceActionUtil.java | 5 +++--
.../viewer/wicket/ui/components/actions/ActionParametersForm.java | 3 ++-
.../viewer/wicket/ui/components/collection/CollectionPanel.java | 3 ++-
.../collectioncontents/summary/CollectionContentsAsSummary.java | 3 ++-
.../components/entity/selector/links/EntityLinksSelectorPanel.java | 3 ++-
.../viewer/wicket/ui/components/layout/bs3/tabs/TabGroupPanel.java | 3 ++-
.../viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java | 3 ++-
.../components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java | 3 ++-
.../wicket/ui/components/scalars/primitive/BooleanPanel.java | 3 ++-
.../wicket/ui/components/widgets/linkandlabel/ActionLink.java | 3 ++-
.../ui/components/widgets/themepicker/IsisWicketThemeSupport.java | 3 ++-
.../widgets/themepicker/IsisWicketThemeSupportDefault.java | 5 +++--
.../wicket/ui/components/widgets/themepicker/ThemeChooser.java | 3 ++-
.../ui/components/widgets/themepicker/ThemeProviderComposite.java | 7 ++++---
.../java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java | 3 ++-
.../wicket/ui/pages/accmngt/password_reset/PasswordResetPage.java | 3 ++-
.../wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.java | 3 ++-
.../apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java | 2 +-
.../viewer/wicket/viewer/integration/WebRequestCycleForIsis.java | 2 +-
.../registries/components/ComponentFactoryRegistryDefault.java | 2 +-
.../viewer/wicket/viewer/services/ImageResourceCacheClassPath.java | 3 ++-
.../viewer/wicket/viewer/services/TranslationsResolverWicket.java | 2 +-
.../viewer/wicket/viewer/services/mementos/ObjectMarshaller.java | 2 +-
.../viewer/wicket/viewer/services/mementos/ObjectUnmarshaller.java | 2 +-
.../isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java | 7 ++++---
.../main/java/org/apache/isis/webapp/modules/WebModuleContext.java | 2 +-
.../webapp/modules/templresources/TemplateResourceServlet.java | 2 +-
.../apache/isis/webapp/webappctx/IsisWebAppContextListener.java | 2 +-
89 files changed, 118 insertions(+), 95 deletions(-)
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/concurrent/_ConcurrentTaskList.java b/core/commons/src/main/java/org/apache/isis/commons/internal/concurrent/_ConcurrentTaskList.java
index 38ea8a4..bc6295f 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/concurrent/_ConcurrentTaskList.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/concurrent/_ConcurrentTaskList.java
@@ -37,8 +37,8 @@ import org.apache.isis.commons.internal.collections._Lists;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@RequiredArgsConstructor(staticName = "named")
@Log4j2
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/environment/IsisSystemEnvironment.java b/core/commons/src/main/java/org/apache/isis/commons/internal/environment/IsisSystemEnvironment.java
index ad2e7cd..611a473 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/environment/IsisSystemEnvironment.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/environment/IsisSystemEnvironment.java
@@ -39,8 +39,8 @@ import org.apache.isis.commons.internal.ioc.IocContainer;
import org.apache.isis.commons.internal.ioc.spring.IocContainerSpring;
import lombok.Getter;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
* Represents configuration, that is required in an early bootstrapping phase.
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/_CDI_Lifecycle.java b/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/_CDI_Lifecycle.java
index 21db9cd..8f5c49a 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/_CDI_Lifecycle.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/_CDI_Lifecycle.java
@@ -21,8 +21,8 @@ package org.apache.isis.commons.internal.ioc.cdi;
import org.apache.isis.commons.internal.functions._Functions.CheckedRunnable;
import lombok.RequiredArgsConstructor;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@RequiredArgsConstructor(staticName="of") @Log4j2
final class _CDI_Lifecycle implements AutoCloseable {
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/_Spring.java b/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/_Spring.java
index 117b701..b2ea841 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/_Spring.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/_Spring.java
@@ -41,8 +41,8 @@ import org.apache.isis.commons.internal.collections._Maps;
import static org.apache.isis.commons.internal.base._NullSafe.stream;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
* <h1>- internal use only -</h1>
diff --git a/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanFactoryPostProcessorForSpring.java b/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanFactoryPostProcessorForSpring.java
index bbc8c07..b8eb257 100644
--- a/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanFactoryPostProcessorForSpring.java
+++ b/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanFactoryPostProcessorForSpring.java
@@ -31,8 +31,8 @@ import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.ViewModel;
import lombok.Getter;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
* The framework's stereotypes {@link DomainService}, {@link DomainObject}, {@link ViewModel}, etc.
diff --git a/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistry.java b/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistry.java
index 5c94661..34855cd 100644
--- a/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistry.java
+++ b/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistry.java
@@ -46,8 +46,8 @@ import static org.apache.isis.commons.internal.reflection._Annotations.findNeare
import lombok.Getter;
import lombok.NoArgsConstructor;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
* Holds the set of domain services, persistent entities and fixture scripts etc.
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/authorization/standard/AuthorizationFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/authorization/standard/AuthorizationFacetAbstract.java
index b424fd8..641ad6f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/authorization/standard/AuthorizationFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/authorization/standard/AuthorizationFacetAbstract.java
@@ -28,8 +28,8 @@ import org.apache.isis.metamodel.interactions.UsabilityContext;
import org.apache.isis.metamodel.interactions.VisibilityContext;
import org.apache.isis.security.api.authorization.manager.AuthorizationManager;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Log4j2
public abstract class AuthorizationFacetAbstract extends FacetAbstract implements AuthorizationFacet {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/DependentArgUtils.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/DependentArgUtils.java
index 7cff5de..cd760e0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/DependentArgUtils.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/DependentArgUtils.java
@@ -34,9 +34,9 @@ import lombok.Builder;
import lombok.Getter;
import lombok.NonNull;
import lombok.Value;
+import lombok.val;
import lombok.experimental.UtilityClass;
import lombok.extern.log4j.Log4j2;
-import lombok.val;
/**
*
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
index 9a5ba1f..06d8065 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
@@ -32,8 +32,8 @@ import org.apache.isis.metamodel.facets.Annotations;
import org.apache.isis.metamodel.facets.object.title.TitleFacetAbstract;
import org.apache.isis.metamodel.spec.ManagedObject;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Log4j2
public class TitleFacetViaTitleAnnotation extends TitleFacetAbstract {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/methods/TitleFacetViaTitleMethod.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/methods/TitleFacetViaTitleMethod.java
index 330403c..6e9a8f1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/methods/TitleFacetViaTitleMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/methods/TitleFacetViaTitleMethod.java
@@ -31,8 +31,8 @@ import org.apache.isis.metamodel.facets.ImperativeFacet;
import org.apache.isis.metamodel.facets.object.title.TitleFacetAbstract;
import org.apache.isis.metamodel.spec.ManagedObject;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Log4j2
public class TitleFacetViaTitleMethod extends TitleFacetAbstract implements ImperativeFacet {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/create/ObjectCreator_builtinHandlers.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/create/ObjectCreator_builtinHandlers.java
index 249e648..43228a3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/create/ObjectCreator_builtinHandlers.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/create/ObjectCreator_builtinHandlers.java
@@ -37,8 +37,8 @@ import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.spec.feature.Contributed;
import lombok.Data;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
*
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelInitFilterDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelInitFilterDefault.java
index 9967aa1..8f3251b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelInitFilterDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelInitFilterDefault.java
@@ -32,8 +32,8 @@ import org.apache.isis.metamodel.facets.FacetFactory;
import org.apache.isis.metamodel.progmodel.ProgrammingModel.Marker;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidator;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
*
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceInjectorLegacy.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceInjectorLegacy.java
index 312a6cc..e9ee83e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceInjectorLegacy.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceInjectorLegacy.java
@@ -45,8 +45,8 @@ import org.apache.isis.metamodel.commons.ToString;
import org.apache.isis.metamodel.exceptions.MetaModelException;
import org.apache.isis.metamodel.spec.InjectorMethodEvaluator;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Log4j2
public class ServiceInjectorLegacy implements ServiceInjector {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
index c1ef00d..be2030b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
@@ -61,8 +61,8 @@ import org.apache.isis.metamodel.specloader.specimpl.ContributeeMember;
import static org.apache.isis.commons.internal.base._NullSafe.stream;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Repository
@Named("isisMetaModel.ApplicationFeatureRepositoryDefault")
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/layout/LayoutServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/layout/LayoutServiceDefault.java
index a41d431..90fc923 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/layout/LayoutServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/layout/LayoutServiceDefault.java
@@ -45,8 +45,8 @@ import org.apache.isis.metamodel.facets.object.grid.GridFacet;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Service
@Named("isisMetaModel.LayoutServiceDefault")
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/title/TitleServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/title/TitleServiceDefault.java
index b030ebf..7be0891 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/title/TitleServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/title/TitleServiceDefault.java
@@ -33,8 +33,8 @@ import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Service
@Named("isisMetaModel.TitleServiceDefault")
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ProgrammingModelServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ProgrammingModelServiceDefault.java
index 54782c5..8b0541b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ProgrammingModelServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ProgrammingModelServiceDefault.java
@@ -37,8 +37,8 @@ import org.apache.isis.metamodel.progmodel.ProgrammingModelInitFilter;
import org.apache.isis.metamodel.progmodel.ProgrammingModelService;
import org.apache.isis.metamodel.progmodels.dflt.ProgrammingModelFacetsJava8;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Service
@Named("isisMetaModel.ProgrammingModelServiceDefault")
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
index 5ca4d65..da510c2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
@@ -69,8 +69,8 @@ import org.apache.isis.metamodel.specloader.validator.ValidationFailures;
import static org.apache.isis.commons.internal.base._With.requires;
import lombok.Getter;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
* <p>
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/FacetedMethodsBuilder.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
index 7e4d42e..08c3c07 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
@@ -57,8 +57,8 @@ import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.metamodel.specloader.facetprocessor.FacetProcessor;
import org.apache.isis.metamodel.specloader.traverser.TypeExtractorMethodReturn;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Log4j2
public class FacetedMethodsBuilder {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index 1d084e6..c9f8129 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -94,8 +94,8 @@ import static org.apache.isis.commons.internal.base._NullSafe.stream;
import lombok.EqualsAndHashCode;
import lombok.Getter;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Log4j2 @EqualsAndHashCode(of = "correspondingClass", callSuper = false)
public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implements ObjectSpecification {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
index 90cd1e3..66b4120 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
@@ -72,8 +72,8 @@ import org.apache.isis.metamodel.specloader.specimpl.OneToOneAssociationDefault;
import static org.apache.isis.commons.internal.base._With.mapIfPresentElse;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Log4j2
public class ObjectSpecificationDefault extends ObjectSpecificationAbstract implements FacetHolder {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/util/snapshot/XmlSnapshot.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/util/snapshot/XmlSnapshot.java
index 60bb5ee..d6aa532 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/util/snapshot/XmlSnapshot.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/util/snapshot/XmlSnapshot.java
@@ -65,8 +65,8 @@ import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
* Traverses object graph from specified root, so that an XML representation of
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/interactions/InteractionUtils_isA_Test.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/interactions/InteractionUtils_isA_Test.java
index 2869ad9..8b55252 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/interactions/InteractionUtils_isA_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/interactions/InteractionUtils_isA_Test.java
@@ -25,9 +25,10 @@ import org.apache.isis.metamodel.facetapi.FacetAbstract;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
-import junit.framework.TestCase;
import lombok.val;
+import junit.framework.TestCase;
+
public class InteractionUtils_isA_Test extends TestCase {
public class FooSuperFacet extends FacetAbstract {
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusContextUtil.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusContextUtil.java
index a86c048..dd8099e 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusContextUtil.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusContextUtil.java
@@ -25,8 +25,8 @@ import org.datanucleus.ExecutionContext;
import org.apache.isis.metamodel.context.MetaModelContext;
-import lombok.experimental.UtilityClass;
import lombok.val;
+import lombok.experimental.UtilityClass;
/**
*
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java
index 1171aaf..541a0e7 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java
@@ -24,8 +24,8 @@ import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.command.CreateObjectCommand;
import org.apache.isis.runtime.persistence.session.PersistenceSession;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Log4j2
public class DataNucleusCreateObjectCommand
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryFindAllInstancesProcessor.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryFindAllInstancesProcessor.java
index ccb2beb..d600c9a 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryFindAllInstancesProcessor.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryFindAllInstancesProcessor.java
@@ -24,8 +24,8 @@ import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.PersistenceSession5;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.query.PersistenceQueryFindAllInstances;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Log4j2
public class PersistenceQueryFindAllInstancesProcessor extends PersistenceQueryProcessorAbstract<PersistenceQueryFindAllInstances> {
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
index 11bc46b..6727263 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
@@ -35,8 +35,8 @@ import org.apache.isis.persistence.jdo.datanucleus5.datanucleus.metamodel.JdoPro
import org.apache.isis.persistence.jdo.datanucleus5.persistence.PersistenceSession5;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.query.PersistenceQueryFindUsingApplibQueryDefault;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Log4j2
public class PersistenceQueryFindUsingApplibQueryProcessor extends PersistenceQueryProcessorAbstract<PersistenceQueryFindUsingApplibQueryDefault> {
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java
index 116ec00..bcfa101 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java
@@ -39,8 +39,8 @@ import org.apache.isis.runtime.persistence.session.PersistenceSession;
import org.apache.isis.runtime.persistence.session.PersistenceSessionFactory;
import org.apache.isis.runtime.session.IsisSession;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Service
@Named("isisJdoDn5.JdoPersistenceLifecycleService")
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java
index 1ae31c7..8c0f3dd 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java
@@ -43,8 +43,8 @@ import org.apache.isis.runtime.persistence.session.PersistenceSession;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import lombok.Getter;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
* Encapsulate ObjectAdpater life-cycling.
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/DataNucleusApplicationComponents5.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/DataNucleusApplicationComponents5.java
index be7c45b..7e23788 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/DataNucleusApplicationComponents5.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/DataNucleusApplicationComponents5.java
@@ -50,8 +50,8 @@ import org.apache.isis.runtime.context.IsisContext;
import static org.apache.isis.commons.internal.base._NullSafe.stream;
import lombok.Getter;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Vetoed
@Log4j2
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java
index 16c068a..25d0281 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java
@@ -47,8 +47,8 @@ import org.apache.isis.runtime.persistence.transaction.ChangedObjectsService;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import lombok.Getter;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Log4j2
abstract class IsisPersistenceSessionJdoBase implements IsisPersistenceSessionJdo {
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java
index 7bdba5d..ee989f4 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java
@@ -40,8 +40,8 @@ import org.apache.isis.runtime.session.IsisSessionFactory;
import org.apache.isis.runtime.session.init.InitialisationSession;
import org.apache.isis.security.api.authentication.AuthenticationSession;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Service
@Named("isisJdoDn5.IsisPlatformTransactionManagerForJdo")
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionJdo.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionJdo.java
index c86026e..550cb40 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionJdo.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionJdo.java
@@ -44,8 +44,8 @@ import org.apache.isis.runtime.persistence.transaction.IsisTransactionFlushExcep
import org.apache.isis.runtime.persistence.transaction.IsisTransactionManagerException;
import lombok.Getter;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
* Used by the {@link IsisTransactionManagerJdo} to captures a set of changes to be
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionManagerJdo.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionManagerJdo.java
index 1c8fcd5..948f069 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionManagerJdo.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionManagerJdo.java
@@ -33,8 +33,8 @@ import org.apache.isis.runtime.persistence.transaction.IsisTransactionManagerExc
import org.apache.isis.runtime.persistence.transaction.IsisTransactionObject;
import lombok.Getter;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Vetoed @Log4j2
class IsisTransactionManagerJdo {
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession5.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession5.java
index dd2a647..20dfc98 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession5.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession5.java
@@ -97,8 +97,8 @@ import org.apache.isis.security.api.authentication.AuthenticationSession;
import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
import lombok.Getter;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
* A wrapper around the JDO {@link PersistenceManager}.
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java
index 45b2cb9..19ef0da 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java
@@ -55,8 +55,8 @@ import org.apache.isis.security.api.authentication.AuthenticationSession;
import lombok.Getter;
import lombok.Setter;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
*
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/BackgroundCommandExecution.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/BackgroundCommandExecution.java
index 4a346e2..80ca677 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/BackgroundCommandExecution.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/BackgroundCommandExecution.java
@@ -25,8 +25,8 @@ import org.apache.isis.applib.services.command.CommandExecutorService;
import org.apache.isis.applib.services.command.CommandWithDto;
import org.apache.isis.commons.internal.collections._Lists;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
* Intended to be used as a base class for executing queued up {@link Command background action}s.
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/bookmarks/BookmarkServiceInternalDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/bookmarks/BookmarkServiceInternalDefault.java
index e5c9e27..4b5db02 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/bookmarks/BookmarkServiceInternalDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/bookmarks/BookmarkServiceInternalDefault.java
@@ -49,8 +49,8 @@ import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.spec.ObjectSpecId;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
* This service enables a serializable 'bookmark' to be created for an entity.
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandExecutorServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandExecutorServiceDefault.java
index 96bb3f1..3df691f 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandExecutorServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandExecutorServiceDefault.java
@@ -71,8 +71,8 @@ import org.apache.isis.schema.common.v1.OidDto;
import org.apache.isis.schema.common.v1.OidsDto;
import org.apache.isis.schema.common.v1.ValueWithTypeDto;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Service
@Named("isisRuntimeServices.CommandExecutorServiceDefault")
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/confmenu/ConfigurationViewServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/confmenu/ConfigurationViewServiceDefault.java
index e5146ef..6b60725 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/confmenu/ConfigurationViewServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/confmenu/ConfigurationViewServiceDefault.java
@@ -44,8 +44,8 @@ import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.RestEasyConfiguration;
import org.apache.isis.config.util.ConfigUtil;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
* @since 2.0
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/factory/FactoryServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/factory/FactoryServiceDefault.java
index e28e7d7..49d8748 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/factory/FactoryServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/factory/FactoryServiceDefault.java
@@ -45,8 +45,8 @@ import org.apache.isis.runtime.session.IsisSessionFactory;
import static org.apache.isis.commons.internal.base._With.requires;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Service
@Named("isisRuntimeServices.FactoryServiceDefault")
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/homepage/HomePageResolverServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/homepage/HomePageResolverServiceDefault.java
index a00efb9..8427e9c 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/homepage/HomePageResolverServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/homepage/HomePageResolverServiceDefault.java
@@ -50,8 +50,8 @@ import org.apache.isis.metamodel.spec.feature.Contributed;
import org.apache.isis.metamodel.spec.feature.ObjectAction;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Service
@Named("isisRuntimeServices.HomePageResolverServiceDefault")
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/MenuBarsLoaderServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/MenuBarsLoaderServiceDefault.java
index b8a0013..4d6f63c 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/MenuBarsLoaderServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/MenuBarsLoaderServiceDefault.java
@@ -39,8 +39,8 @@ import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Service
@Named("isisRuntimeServices.MenuBarsLoaderServiceDefault")
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java
index a6e5135..dd2a14a 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java
@@ -64,8 +64,8 @@ import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.spec.feature.Contributed;
import org.apache.isis.metamodel.spec.feature.ObjectAction;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Service
@Named("isisRuntimeServices.MenuBarsServiceBS3")
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/repository/RepositoryServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/repository/RepositoryServiceDefault.java
index 721c0af..3f9d33d 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/repository/RepositoryServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/repository/RepositoryServiceDefault.java
@@ -47,8 +47,8 @@ import org.apache.isis.metamodel.objectmanager.ObjectManager;
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.runtime.persistence.session.PersistenceSession;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Repository
@Named("isisRuntimeServices.RepositoryServiceDefault")
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/routing/RoutingServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/routing/RoutingServiceDefault.java
index 8b4901e..42254cd 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/routing/RoutingServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/routing/RoutingServiceDefault.java
@@ -26,8 +26,8 @@ import org.springframework.stereotype.Controller;
import org.apache.isis.applib.services.routing.RoutingService;
import org.apache.isis.metamodel.services.homepage.HomePageResolverService;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Controller
@Named("isisRuntimeServices.RoutingServiceDefault")
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/sessmgmt/SessionManagementServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/sessmgmt/SessionManagementServiceDefault.java
index 5f5905e..43ccfef 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/sessmgmt/SessionManagementServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/sessmgmt/SessionManagementServiceDefault.java
@@ -32,8 +32,8 @@ import org.apache.isis.applib.services.sessmgmt.SessionManagementService;
import org.apache.isis.runtime.session.IsisSession;
import org.apache.isis.runtime.session.IsisSessionFactory;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Service
@Named("isisRuntimeServices.SessionManagementServiceDefault")
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault.java
index cdfcaf9..6f55fad 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault.java
@@ -68,8 +68,8 @@ import org.apache.isis.runtime.services.wrapper.handlers.ProxyContextHandler;
import org.apache.isis.runtime.services.wrapper.proxy.ProxyCreator;
import org.apache.isis.runtime.session.IsisSessionFactory;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
* This service provides the ability to 'wrap' a domain object such that it can
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xactn/TransactionServiceSpring.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xactn/TransactionServiceSpring.java
index 6215cce..b9f2e7b 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xactn/TransactionServiceSpring.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xactn/TransactionServiceSpring.java
@@ -42,8 +42,8 @@ import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.runtime.persistence.transaction.IsisTransactionAspectSupport;
import org.apache.isis.runtime.persistence.transaction.IsisTransactionObject;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Service
@Named("isisRuntimeServices.TransactionServiceSpring")
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/TimestampService.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/TimestampService.java
index 154837a..f5577aa 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/TimestampService.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/TimestampService.java
@@ -33,8 +33,8 @@ import org.apache.isis.applib.mixins.timestamp.HoldsUpdatedBy;
import org.apache.isis.applib.services.clock.ClockService;
import org.apache.isis.applib.services.user.UserService;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Service
@Named("isisRuntime.TimestampService")
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/AuditerDispatchService.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/AuditerDispatchService.java
index b091c9d..9263f22 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/AuditerDispatchService.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/AuditerDispatchService.java
@@ -41,8 +41,8 @@ import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facets.actions.action.invocation.CommandUtil;
import org.apache.isis.metamodel.facets.object.audit.AuditableFacet;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
* Wrapper around {@link org.apache.isis.applib.services.audit.AuditerService}.
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/ChangedObjectsService.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/ChangedObjectsService.java
index 60e8fe9..b905d55 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/ChangedObjectsService.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/ChangedObjectsService.java
@@ -45,8 +45,8 @@ import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.spec.feature.Contributed;
import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Service
@Named("isisRuntime.ChangedObjectsService")
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryDefault.java b/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryDefault.java
index 8e91395..cad97ec 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryDefault.java
@@ -53,8 +53,8 @@ import org.apache.isis.security.api.authentication.manager.AuthenticationManager
import static org.apache.isis.commons.internal.base._With.requires;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
* Is the factory of {@link IsisSession}s, also holding a reference to the current session using
diff --git a/core/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java b/core/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java
index 3bec52d..1204514 100644
--- a/core/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java
+++ b/core/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java
@@ -52,8 +52,8 @@ import org.apache.isis.webapp.modules.WebModuleContext;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.SneakyThrows;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
* WebModule to enable support for Shiro.
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_LifecycleResource.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_LifecycleResource.java
index d112c01..1cff5bb 100644
--- a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_LifecycleResource.java
+++ b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_LifecycleResource.java
@@ -26,8 +26,8 @@ import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
import static org.apache.isis.commons.internal.base._With.requires;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Log4j2
class _Config_LifecycleResource {
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_Parsers.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_Parsers.java
index b0b8888..d451773 100644
--- a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_Parsers.java
+++ b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_Parsers.java
@@ -26,8 +26,8 @@ import javax.annotation.Nullable;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.collections._Arrays;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Log4j2
final class _Config_Parsers {
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
index a496e23..8a29500 100644
--- a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
+++ b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
@@ -48,8 +48,8 @@ import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import static org.apache.isis.commons.internal.base._With.requires;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Generation.java b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Generation.java
index d2d65e1..0041437 100644
--- a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Generation.java
+++ b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Generation.java
@@ -46,6 +46,8 @@ import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
+import lombok.val;
+
import io.swagger.models.Info;
import io.swagger.models.ModelImpl;
import io.swagger.models.Operation;
@@ -61,7 +63,6 @@ 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/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/SwaggerSpecGenerator.java b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/SwaggerSpecGenerator.java
index 0c366a1..fc02f06 100644
--- a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/SwaggerSpecGenerator.java
+++ b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/SwaggerSpecGenerator.java
@@ -28,10 +28,11 @@ import org.springframework.stereotype.Component;
import org.apache.isis.applib.services.swagger.SwaggerService;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
+import lombok.extern.log4j.Log4j2;
+
import io.swagger.models.Swagger;
import io.swagger.util.Json;
import io.swagger.util.Yaml;
-import lombok.extern.log4j.Log4j2;
@Component
@Named("isisMetaModel.SwaggerSpecGenerator")
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyFactoryDefault.java b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyFactoryDefault.java
index 553501a..8eab088 100644
--- a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyFactoryDefault.java
+++ b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyFactoryDefault.java
@@ -39,6 +39,8 @@ import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.commons.internal.context._Plugin;
import org.apache.isis.viewer.restfulobjects.rendering.service.swagger.internal.ValuePropertyPlugin.ValuePropertyCollector;
+import lombok.extern.log4j.Log4j2;
+
import io.swagger.models.properties.BooleanProperty;
import io.swagger.models.properties.ByteArrayProperty;
import io.swagger.models.properties.DateProperty;
@@ -51,7 +53,6 @@ import io.swagger.models.properties.LongProperty;
import io.swagger.models.properties.Property;
import io.swagger.models.properties.StringProperty;
import io.swagger.models.properties.UUIDProperty;
-import lombok.extern.log4j.Log4j2;
@Component
@Named("isisMetaModel.ValuePropertyFactoryDefault")
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithMultiPending.java b/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithMultiPending.java
index 07f43c8..082481b 100644
--- a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithMultiPending.java
+++ b/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithMultiPending.java
@@ -27,8 +27,8 @@ import org.apache.wicket.model.Model;
import org.apache.isis.metamodel.spec.ObjectSpecId;
import org.apache.isis.webapp.context.memento.ObjectMemento;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
* For widgets that use a <tt>org.wicketstuff.select2.Select2MultiChoice</tt>;
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
index c246679..8b0aebe 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
@@ -46,11 +46,12 @@ import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
import org.apache.isis.viewer.wicket.ui.util.Tooltips;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import lombok.val;
+import lombok.extern.log4j.Log4j2;
+
import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig;
import de.agilecoders.wicket.extensions.markup.html.bootstrap.confirmation.ConfirmationBehavior;
import de.agilecoders.wicket.extensions.markup.html.bootstrap.confirmation.ConfirmationConfig;
-import lombok.extern.log4j.Log4j2;
-import lombok.val;
@Log4j2
public final class ServiceActionUtil {
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersForm.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersForm.java
index 6f9340a..ee6f3de 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersForm.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersForm.java
@@ -47,9 +47,10 @@ import org.apache.isis.viewer.wicket.ui.panels.PanelUtil;
import org.apache.isis.viewer.wicket.ui.panels.PromptFormAbstract;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
-import de.agilecoders.wicket.extensions.markup.html.bootstrap.confirmation.ConfirmationBehavior;
import lombok.val;
+import de.agilecoders.wicket.extensions.markup.html.bootstrap.confirmation.ConfirmationBehavior;
+
class ActionParametersForm extends PromptFormAbstract<ActionModel> {
private static final long serialVersionUID = 1L;
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
index a7c045f..5a45366 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
@@ -47,9 +47,10 @@ import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract2;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.isis.webapp.context.memento.ObjectMemento;
-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
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 ScalarPanelAbstract2}.
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java
index aed9382..c8d0a2a 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java
@@ -41,9 +41,10 @@ import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
import org.apache.isis.viewer.wicket.ui.components.collection.count.CollectionCountProvider;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import lombok.val;
+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+
/**
* {@link PanelAbstract Panel} that represents a {@link EntityCollectionModel
* collection of entity}s rendered using as a table of summary values with a
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.java
index e6ef83d..c2854e7 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.java
@@ -50,9 +50,10 @@ import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.isis.viewer.wicket.ui.util.Components;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
-import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons;
import lombok.val;
+import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons;
+
/**
* Provides a list of links for selecting other views that support
* {@link ComponentType#ENTITY} with a backing {@link EntityModel}.
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabGroupPanel.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabGroupPanel.java
index 9dbb445..b63cf0c 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabGroupPanel.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabGroupPanel.java
@@ -36,9 +36,10 @@ import org.apache.isis.viewer.wicket.model.util.ComponentHintKey;
import org.apache.isis.viewer.wicket.ui.components.layout.bs3.col.RepeatingViewWithDynamicallyVisibleContent;
import org.apache.isis.viewer.wicket.ui.panels.HasDynamicallyVisibleContent;
-import de.agilecoders.wicket.core.markup.html.bootstrap.tabs.AjaxBootstrapTabbedPanel;
import lombok.val;
+import de.agilecoders.wicket.core.markup.html.bootstrap.tabs.AjaxBootstrapTabbedPanel;
+
// hmmm... not sure how to make this implement HasDynamicallyVisibleContent
public class TabGroupPanel
extends AjaxBootstrapTabbedPanel<ITab>
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
index c8d6726..5fd5c55 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
@@ -74,9 +74,10 @@ import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.isis.viewer.wicket.ui.util.Components;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import lombok.val;
+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+
public abstract class ScalarPanelAbstract2
extends PanelAbstract<ScalarModel>
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
index b60aa64..302552b 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
@@ -53,9 +53,10 @@ import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract2;
import org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
import org.apache.isis.viewer.wicket.ui.util.Components;
-import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.fileinput.BootstrapFileInputField;
import lombok.val;
+import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.fileinput.BootstrapFileInputField;
+
public abstract class IsisBlobOrClobPanelAbstract<T extends NamedWithMimeType> extends ScalarPanelAbstract2 {
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
index 034b70a..e6965d9 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
@@ -38,10 +38,11 @@ import org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
import org.apache.isis.viewer.wicket.ui.util.Tooltips;
+import lombok.val;
+
import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.checkboxx.CheckBoxX;
import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.checkboxx.CheckBoxXConfig;
import de.agilecoders.wicket.jquery.Key;
-import lombok.val;
/**
* Panel for rendering scalars of type {@link Boolean} or <tt>boolean</tt>.
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java
index 0c13b77..c362223 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java
@@ -40,10 +40,11 @@ import org.apache.isis.viewer.wicket.model.models.ActionModel;
import org.apache.isis.viewer.wicket.ui.panels.PanelUtil;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
-import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons;
import lombok.Getter;
import lombok.val;
+import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons;
+
public abstract class ActionLink extends AjaxLink<ManagedObject> implements IAjaxIndicatorAware {
private static final long serialVersionUID = 1L;
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupport.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupport.java
index bd1c3a6..b1a72b6 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupport.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupport.java
@@ -23,9 +23,10 @@ import java.util.List;
import org.apache.isis.commons.internal.factory.InstanceUtil;
import org.apache.isis.config.IsisConfiguration;
-import de.agilecoders.wicket.core.settings.ThemeProvider;
import lombok.val;
+import de.agilecoders.wicket.core.settings.ThemeProvider;
+
/**
* @since 2.0
*/
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java
index f192fd8..0f4bbe1 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java
@@ -37,11 +37,12 @@ import org.apache.isis.commons.internal.base._Lazy;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.config.IsisConfiguration;
+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.extern.log4j.Log4j2;
-import lombok.val;
/**
* @since 2.0
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
index e3d99d6..1c5c458 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
@@ -34,6 +34,8 @@ import org.apache.wicket.util.string.Strings;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.runtime.session.IsisSessionFactory;
+import lombok.Getter;
+
import de.agilecoders.wicket.core.Bootstrap;
import de.agilecoders.wicket.core.settings.ActiveThemeProvider;
import de.agilecoders.wicket.core.settings.IBootstrapSettings;
@@ -46,7 +48,6 @@ import de.agilecoders.wicket.themes.markup.html.bootswatch.BootswatchTheme;
import de.agilecoders.wicket.themes.markup.html.bootswatch.BootswatchThemeProvider;
import de.agilecoders.wicket.themes.markup.html.vegibit.VegibitTheme;
import de.agilecoders.wicket.themes.markup.html.vegibit.VegibitThemeProvider;
-import lombok.Getter;
/**
* A panel used as a Navbar item to change the application theme/skin
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeProviderComposite.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeProviderComposite.java
index 816bd51..1410851 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeProviderComposite.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeProviderComposite.java
@@ -29,11 +29,12 @@ import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
-import de.agilecoders.wicket.core.settings.ITheme;
-import de.agilecoders.wicket.core.settings.ThemeProvider;
import lombok.RequiredArgsConstructor;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
+
+import de.agilecoders.wicket.core.settings.ITheme;
+import de.agilecoders.wicket.core.settings.ThemeProvider;
/**
*
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index c6228e7..eae16fe 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -85,13 +85,14 @@ import org.apache.isis.viewer.wicket.ui.errors.ExceptionModel;
import org.apache.isis.viewer.wicket.ui.errors.JGrowlBehaviour;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
+import lombok.extern.log4j.Log4j2;
+
import de.agilecoders.wicket.core.Bootstrap;
import de.agilecoders.wicket.core.markup.html.references.BootlintHeaderItem;
import de.agilecoders.wicket.core.markup.html.references.BootstrapJavaScriptReference;
import de.agilecoders.wicket.core.settings.IBootstrapSettings;
import de.agilecoders.wicket.core.settings.ITheme;
import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesomeCssReference;
-import lombok.extern.log4j.Log4j2;
/**
* Convenience adapter for {@link WebPage}s built up using {@link ComponentType}s.
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.java
index 066e048..532a362 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.java
@@ -32,9 +32,10 @@ import org.apache.isis.viewer.wicket.ui.pages.accmngt.AccountConfirmationMap;
import org.apache.isis.viewer.wicket.ui.pages.accmngt.AccountManagementPageAbstract;
import org.apache.isis.viewer.wicket.ui.pages.login.WicketSignInPage;
-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import lombok.val;
+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+
/**
* A page used for resetting the password of an user.
*/
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.java
index 583cfcc..d12e1d9 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.java
@@ -36,9 +36,10 @@ import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.pages.accmngt.AccountConfirmationMap;
import org.apache.isis.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/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
index 6996d9c..6c08b9f 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
@@ -65,8 +65,8 @@ import org.apache.isis.viewer.wicket.ui.util.Components;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
import org.apache.isis.webapp.context.memento.ObjectMemento;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Log4j2
public final class FormExecutorDefault<M extends BookmarkableModel<ManagedObject> & ParentEntityModelProvider>
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
index 77b9676..6ead0fd 100644
--- a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
+++ b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
@@ -68,8 +68,8 @@ import org.apache.isis.viewer.wicket.ui.pages.mmverror.MmvErrorPage;
import org.apache.isis.viewer.wicket.ui.panels.PromptFormAbstract;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
* Isis-specific implementation of the Wicket's {@link RequestCycle},
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
index 0de7f78..4783d39 100644
--- a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
+++ b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
@@ -50,8 +50,8 @@ import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistrar.C
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
* Implementation of {@link ComponentFactoryRegistry} that delegates to a
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/ImageResourceCacheClassPath.java b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/ImageResourceCacheClassPath.java
index d788830..f6f5aa2 100644
--- a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/ImageResourceCacheClassPath.java
+++ b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/ImageResourceCacheClassPath.java
@@ -44,9 +44,10 @@ import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.spec.Specification;
import org.apache.isis.viewer.wicket.model.models.ImageResourceCache;
-import images.Images;
import lombok.extern.log4j.Log4j2;
+import images.Images;
+
/**
* Caches images loaded either from the same package as the specified object, or from the <tt>images</tt> package (using the {@link Images} otherwise.
* class).
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java
index 6aa29f2..1777e33 100644
--- a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java
+++ b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java
@@ -41,8 +41,8 @@ import org.apache.isis.applib.services.i18n.TranslationsResolver;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.viewer.wicket.viewer.wicketapp.IsisWicketApplication;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMarshaller.java b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMarshaller.java
index e1ec967..1a33734 100644
--- a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMarshaller.java
+++ b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMarshaller.java
@@ -35,8 +35,8 @@ import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.spec.feature.Contributed;
import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
* converts a {@link ManagedObject} to serializable {@link Data}
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectUnmarshaller.java b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectUnmarshaller.java
index 53f9311..44a25c8 100644
--- a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectUnmarshaller.java
+++ b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectUnmarshaller.java
@@ -36,8 +36,8 @@ import static org.apache.isis.commons.internal.functions._Predicates.not;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
* Converts serializable {@link Data} back to a {@link ManagedObject}.
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
index ebbd881..3e1c87b 100644
--- a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
+++ b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
@@ -97,6 +97,10 @@ import org.apache.isis.webapp.context.memento.ObjectMemento;
import static org.apache.isis.commons.internal.base._With.requires;
+import lombok.Getter;
+import lombok.val;
+import lombok.extern.log4j.Log4j2;
+
import de.agilecoders.wicket.core.Bootstrap;
import de.agilecoders.wicket.core.markup.html.bootstrap.behavior.BootstrapBaseBehavior;
import de.agilecoders.wicket.core.settings.BootstrapSettings;
@@ -104,9 +108,6 @@ import de.agilecoders.wicket.core.settings.IBootstrapSettings;
import de.agilecoders.wicket.webjars.WicketWebjars;
import de.agilecoders.wicket.webjars.settings.IWebjarsSettings;
import de.agilecoders.wicket.webjars.settings.WebjarsSettings;
-import lombok.Getter;
-import lombok.extern.log4j.Log4j2;
-import lombok.val;
import net.ftlines.wicketsource.WicketSource;
//import lombok.val;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java b/core/webapp/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java
index 1f94521..618bd68 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java
+++ b/core/webapp/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java
@@ -37,8 +37,8 @@ import org.apache.isis.webapp.webappctx.IsisWebAppContextInitializer.ServletCont
import lombok.Getter;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
*
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceServlet.java b/core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceServlet.java
index 9805aea..8cb2411 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceServlet.java
+++ b/core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceServlet.java
@@ -41,8 +41,8 @@ import org.apache.isis.metamodel.commons.StringExtensions;
import static org.apache.isis.commons.internal.base._Strings.pair;
import static org.apache.isis.commons.internal.base._With.ifPresentElseGet;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
* Handles HTML-templates, where template's placeholders get replaced by their values.
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/webappctx/IsisWebAppContextListener.java b/core/webapp/src/main/java/org/apache/isis/webapp/webappctx/IsisWebAppContextListener.java
index 5cc6cac..e40d472 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/webappctx/IsisWebAppContextListener.java
+++ b/core/webapp/src/main/java/org/apache/isis/webapp/webappctx/IsisWebAppContextListener.java
@@ -30,8 +30,8 @@ import org.apache.isis.webapp.modules.WebModule;
import org.apache.isis.webapp.modules.WebModuleContext;
import org.apache.isis.webapp.webappctx.IsisWebAppContextInitializer.ServletContextResource;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
*
[isis] 06/08: ISIS-2158: (re) run 'optimize imports' for
examples/demo, examples/smoketests, incubator, legacy
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 38eb63fafd487de4ec50a90b2ebf6da54780cbca
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jan 4 14:31:10 2020 +0000
ISIS-2158: (re) run 'optimize imports' for examples/demo, examples/smoketests, incubator, legacy
---
.../demoapp/dom/actions/assoc/AssociatedActionDemo.java | 3 ++-
.../dom/actions/assoc/AssociatedActionDemo.layout.xml | 9 ++++-----
.../java/demoapp/dom/actions/async/AsyncActionDemo.java | 3 ++-
.../demoapp/dom/actions/async/AsyncActionDemo.layout.xml | 9 ++++-----
.../dom/actions/depargs/DependentArgsActionDemo.java | 3 ++-
.../actions/depargs/DependentArgsActionDemo.layout.xml | 9 ++++-----
.../src/main/java/demoapp/dom/error/ErrorDemo.layout.xml | 9 ++++-----
.../main/java/demoapp/dom/events/DemoEventSubscriber.java | 7 ++++---
.../src/main/java/demoapp/dom/events/EventLogEntry.java | 3 ++-
.../main/java/demoapp/dom/events/EventsDemo.layout.xml | 4 +++-
.../src/main/java/demoapp/dom/homepage/DemoHomePage.java | 3 ++-
.../java/demoapp/dom/homepage/DemoHomePage.layout.xml | 8 +++-----
.../demo/src/main/java/demoapp/dom/jee/JeeDemo.layout.xml | 4 +++-
examples/demo/src/main/java/demoapp/dom/tabs/TabDemo.java | 3 ++-
.../src/main/java/demoapp/dom/tabs/TabDemo.layout.xml | 4 +++-
.../src/main/java/demoapp/dom/tooltip/TooltipDemo.java | 5 +++--
.../main/java/demoapp/dom/tooltip/TooltipDemo.layout.xml | 8 +++-----
.../demo/src/main/java/demoapp/dom/tree/FileNode-File.svg | 4 ++--
.../java/demoapp/dom/tree/FileNode-FileSystemRoot.svg | 4 ++--
.../src/main/java/demoapp/dom/tree/FileNode-Folder.svg | 4 ++--
.../demo/src/main/java/demoapp/dom/tree/TreeDemo.java | 3 ++-
.../src/main/java/demoapp/dom/tree/TreeDemo.layout.xml | 6 +++++-
.../demo/src/main/java/demoapp/dom/tree/TreeDemoMenu.java | 3 ++-
.../main/java/demoapp/dom/types/FeaturedTypesMenu.java | 3 ++-
.../src/main/java/demoapp/dom/types/blob/BlobDemo.java | 3 ++-
.../main/java/demoapp/dom/types/blob/BlobDemo.layout.xml | 6 +++++-
.../java/demoapp/dom/types/primitive/PrimitivesDemo.java | 3 ++-
.../demoapp/dom/types/primitive/PrimitivesDemo.layout.xml | 9 ++++-----
.../src/main/java/demoapp/dom/types/text/TextDemo.java | 3 ++-
.../main/java/demoapp/dom/types/text/TextDemo.layout.xml | 6 +++++-
.../main/java/demoapp/dom/types/time/TemporalDemo.java | 3 ++-
.../java/demoapp/dom/types/time/TemporalDemo.layout.xml | 6 +++++-
examples/demo/src/main/java/demoapp/utils/DemoStub.svg | 4 ++--
.../demo/src/main/java/demoapp/webapp/menubars.layout.xml | 6 +++++-
.../isis/testdomain/auditing/AuditerServiceTest.java | 6 +++---
.../testdomain/bootstrapping/AutoConfigurationTest.java | 11 ++++++-----
.../testdomain/bootstrapping/JdoBootstrappingTest.java | 6 +++---
.../bootstrapping/JdoBootstrappingTest_usingFixtures.java | 6 +++---
.../bootstrapping/SpringServiceInjectOrderTest.java | 15 ++++++++-------
.../bootstrapping/SpringServiceProvisioningTest.java | 8 +++++---
.../isis/testdomain/commandexecution/WrapperTest.java | 8 ++++----
.../java/org/apache/isis/testdomain/config/FooTest.java | 6 +++---
.../apache/isis/testdomain/config/IsisConfigBeanTest.java | 6 +++---
.../config/IsisConfigBeanTest_usingHeadless.java | 6 +++---
.../testdomain/domainmodel/AnnotationSyntesizerTest.java | 6 +++---
.../domainmodel/DomainModelTest_usingBadDomain.java | 6 +++---
.../DomainModelTest_usingBadDomain_noActionEnforced.java | 8 ++++----
.../domainmodel/DomainModelTest_usingGoodDomain.java | 10 +++++-----
.../testdomain/domainmodel/SpecloaderPerformanceTest.java | 4 ++--
.../eventhandling/GenericEventPublishingTest.java | 4 ++--
.../eventhandling/SpringEventPublishingTest.java | 4 ++--
.../isis/testdomain/ldap/LdapEmbeddedServerTest.java | 6 +++---
.../apache/isis/testdomain/logging/LoggerSetupTest.java | 4 ++--
.../isis/testdomain/publishing/PublisherServiceTest.java | 6 +++---
.../org/apache/isis/testdomain/rest/RestServiceTest.java | 10 +++++-----
.../org/apache/isis/testdomain/shiro/ShiroLdapTest.java | 10 +++++-----
.../apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java | 12 ++++++------
.../shiro/ShiroSecmanLdap_restfulStressTest.java | 13 +++++++------
.../org/apache/isis/testdomain/shiro/ShiroSecmanTest.java | 10 +++++-----
.../org/apache/isis/testdomain/shiro/ShiroSimpleTest.java | 6 +++---
.../isis/testdomain/timestamping/TimestampingTest.java | 4 ++--
.../testdomain/transactions/TransactionRollbackTest.java | 6 +++---
.../TransactionRollbackTest_usingTransactional.java | 4 ++--
.../runtime/jee_support/IsisCDIBeanScanInterceptor.java | 2 +-
.../commons/internal/threadpool/ThreadPoolSupport.java | 7 ++++---
.../facets/value/ColorValueSemanticsProviderTest.java | 6 +++---
.../facets/value/MoneyValueSemanticsProviderTest.java | 6 +++---
.../value/PercentageValueSemanticsProviderTest.java | 4 ++--
.../value/PolishMoneyValueSemanticsProviderTest.java | 6 +++---
.../org/apache/isis/legacy/restclient/RestEasyLegacy.java | 1 -
70 files changed, 225 insertions(+), 188 deletions(-)
diff --git a/examples/demo/src/main/java/demoapp/dom/actions/assoc/AssociatedActionDemo.java b/examples/demo/src/main/java/demoapp/dom/actions/assoc/AssociatedActionDemo.java
index 16ba34f..169395a 100644
--- a/examples/demo/src/main/java/demoapp/dom/actions/assoc/AssociatedActionDemo.java
+++ b/examples/demo/src/main/java/demoapp/dom/actions/assoc/AssociatedActionDemo.java
@@ -36,9 +36,10 @@ import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.services.message.MessageService;
-import demoapp.utils.DemoStub;
import lombok.Getter;
+import demoapp.utils.DemoStub;
+
@XmlRootElement(name = "Demo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/examples/demo/src/main/java/demoapp/dom/actions/assoc/AssociatedActionDemo.layout.xml b/examples/demo/src/main/java/demoapp/dom/actions/assoc/AssociatedActionDemo.layout.xml
index 791a6de..8b02d0d 100644
--- a/examples/demo/src/main/java/demoapp/dom/actions/assoc/AssociatedActionDemo.layout.xml
+++ b/examples/demo/src/main/java/demoapp/dom/actions/assoc/AssociatedActionDemo.layout.xml
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<bs3:grid
- xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/links http://isis.apache.org/applib/layout/links/links.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
- xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
- xmlns:cpt="http://isis.apache.org/applib/layout/component"
- xmlns:lnk="http://isis.apache.org/applib/layout/links"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject />
diff --git a/examples/demo/src/main/java/demoapp/dom/actions/async/AsyncActionDemo.java b/examples/demo/src/main/java/demoapp/dom/actions/async/AsyncActionDemo.java
index 4964edf..7b33d09 100644
--- a/examples/demo/src/main/java/demoapp/dom/actions/async/AsyncActionDemo.java
+++ b/examples/demo/src/main/java/demoapp/dom/actions/async/AsyncActionDemo.java
@@ -38,11 +38,12 @@ import org.apache.isis.extensions.sse.api.SseService;
import org.apache.isis.extensions.sse.api.SseService.ExecutionBehavior;
import org.apache.isis.extensions.sse.markup.ListeningMarkup;
-import demoapp.utils.DemoStub;
import lombok.Getter;
import lombok.Setter;
import lombok.val;
+import demoapp.utils.DemoStub;
+
@XmlRootElement(name = "Demo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/examples/demo/src/main/java/demoapp/dom/actions/async/AsyncActionDemo.layout.xml b/examples/demo/src/main/java/demoapp/dom/actions/async/AsyncActionDemo.layout.xml
index 6551bb4..57cb458 100644
--- a/examples/demo/src/main/java/demoapp/dom/actions/async/AsyncActionDemo.layout.xml
+++ b/examples/demo/src/main/java/demoapp/dom/actions/async/AsyncActionDemo.layout.xml
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<bs3:grid
- xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/links http://isis.apache.org/applib/layout/links/links.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
- xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
- xmlns:cpt="http://isis.apache.org/applib/layout/component"
- xmlns:lnk="http://isis.apache.org/applib/layout/links"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject />
diff --git a/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo.java b/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo.java
index 7af9f32..46d77c3 100644
--- a/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo.java
+++ b/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo.java
@@ -33,9 +33,10 @@ import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.value.Markup;
-import demoapp.utils.DemoStub;
import lombok.Getter;
+import demoapp.utils.DemoStub;
+
@XmlRootElement(name = "Demo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo.layout.xml b/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo.layout.xml
index cabbd81..76ff059 100644
--- a/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo.layout.xml
+++ b/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo.layout.xml
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<bs3:grid
- xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/links http://isis.apache.org/applib/layout/links/links.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
- xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
- xmlns:cpt="http://isis.apache.org/applib/layout/component"
- xmlns:lnk="http://isis.apache.org/applib/layout/links"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject />
diff --git a/examples/demo/src/main/java/demoapp/dom/error/ErrorDemo.layout.xml b/examples/demo/src/main/java/demoapp/dom/error/ErrorDemo.layout.xml
index e7b98d7..e52391e 100644
--- a/examples/demo/src/main/java/demoapp/dom/error/ErrorDemo.layout.xml
+++ b/examples/demo/src/main/java/demoapp/dom/error/ErrorDemo.layout.xml
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<bs3:grid
- xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/links http://isis.apache.org/applib/layout/links/links.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
- xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
- xmlns:cpt="http://isis.apache.org/applib/layout/component"
- xmlns:lnk="http://isis.apache.org/applib/layout/links"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject />
diff --git a/examples/demo/src/main/java/demoapp/dom/events/DemoEventSubscriber.java b/examples/demo/src/main/java/demoapp/dom/events/DemoEventSubscriber.java
index a57aa19..039cad9 100644
--- a/examples/demo/src/main/java/demoapp/dom/events/DemoEventSubscriber.java
+++ b/examples/demo/src/main/java/demoapp/dom/events/DemoEventSubscriber.java
@@ -31,12 +31,13 @@ import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
-import static demoapp.utils.DemoUtils.emphasize;
-
-import demoapp.dom.events.EventsDemo.UiButtonEvent;
import lombok.val;
import lombok.extern.log4j.Log4j2;
+import demoapp.dom.events.EventsDemo.UiButtonEvent;
+
+import static demoapp.utils.DemoUtils.emphasize;
+
@Service
@Named("demoapp.eventSubscriber")
@Qualifier("demo")
diff --git a/examples/demo/src/main/java/demoapp/dom/events/EventLogEntry.java b/examples/demo/src/main/java/demoapp/dom/events/EventLogEntry.java
index 802b756..5655162 100644
--- a/examples/demo/src/main/java/demoapp/dom/events/EventLogEntry.java
+++ b/examples/demo/src/main/java/demoapp/dom/events/EventLogEntry.java
@@ -29,11 +29,12 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Property;
-import demoapp.dom.events.EventsDemo.UiButtonEvent;
import lombok.Getter;
import lombok.Setter;
import lombok.val;
+import demoapp.dom.events.EventsDemo.UiButtonEvent;
+
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo" )
@DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
@DomainObject
diff --git a/examples/demo/src/main/java/demoapp/dom/events/EventsDemo.layout.xml b/examples/demo/src/main/java/demoapp/dom/events/EventsDemo.layout.xml
index c5e28b7..1d73f68 100644
--- a/examples/demo/src/main/java/demoapp/dom/events/EventsDemo.layout.xml
+++ b/examples/demo/src/main/java/demoapp/dom/events/EventsDemo.layout.xml
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/componenthttp://isis.apache.org/applib/layout/component/component.xsdhttp://isis.apache.org/applib/layout/linkshttp://isis.apache.org/applib/layout/links/links.xsdhttp://isis.apache.org/applib/layout/grid/bootstrap3http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:lnk="http:/ [...]
+<bs3:grid xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject/>
diff --git a/examples/demo/src/main/java/demoapp/dom/homepage/DemoHomePage.java b/examples/demo/src/main/java/demoapp/dom/homepage/DemoHomePage.java
index c8d803f..1205541 100644
--- a/examples/demo/src/main/java/demoapp/dom/homepage/DemoHomePage.java
+++ b/examples/demo/src/main/java/demoapp/dom/homepage/DemoHomePage.java
@@ -36,10 +36,11 @@ import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.util.JaxbAdapters.MarkupAdapter;
import org.apache.isis.applib.value.Markup;
-import demoapp.utils.DemoStub;
import lombok.Getter;
import lombok.Setter;
+import demoapp.utils.DemoStub;
+
@XmlRootElement(name = "Demo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/examples/demo/src/main/java/demoapp/dom/homepage/DemoHomePage.layout.xml b/examples/demo/src/main/java/demoapp/dom/homepage/DemoHomePage.layout.xml
index 09759d7..4d5efd6 100644
--- a/examples/demo/src/main/java/demoapp/dom/homepage/DemoHomePage.layout.xml
+++ b/examples/demo/src/main/java/demoapp/dom/homepage/DemoHomePage.layout.xml
@@ -1,10 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<bs3:grid
- xsi:schemaLocation="http://isis.apache.org/applib/layout/componenthttp://isis.apache.org/applib/layout/component/component.xsdhttp://isis.apache.org/applib/layout/linkshttp://isis.apache.org/applib/layout/links/links.xsdhttp://isis.apache.org/applib/layout/grid/bootstrap3http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
- xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
- xmlns:cpt="http://isis.apache.org/applib/layout/component"
- xmlns:lnk="http://isis.apache.org/applib/layout/links"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject />
diff --git a/examples/demo/src/main/java/demoapp/dom/jee/JeeDemo.layout.xml b/examples/demo/src/main/java/demoapp/dom/jee/JeeDemo.layout.xml
index d669ce1..c6b1952 100644
--- a/examples/demo/src/main/java/demoapp/dom/jee/JeeDemo.layout.xml
+++ b/examples/demo/src/main/java/demoapp/dom/jee/JeeDemo.layout.xml
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/componenthttp://isis.apache.org/applib/layout/component/component.xsdhttp://isis.apache.org/applib/layout/linkshttp://isis.apache.org/applib/layout/links/links.xsdhttp://isis.apache.org/applib/layout/grid/bootstrap3http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:lnk="http:/ [...]
+<bs3:grid xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject/>
diff --git a/examples/demo/src/main/java/demoapp/dom/tabs/TabDemo.java b/examples/demo/src/main/java/demoapp/dom/tabs/TabDemo.java
index db7b1b9..b93ce96 100644
--- a/examples/demo/src/main/java/demoapp/dom/tabs/TabDemo.java
+++ b/examples/demo/src/main/java/demoapp/dom/tabs/TabDemo.java
@@ -28,10 +28,11 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.Programmatic;
-import demoapp.utils.DemoStub;
import lombok.Getter;
import lombok.Setter;
+import demoapp.utils.DemoStub;
+
@XmlRootElement(name = "Demo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/examples/demo/src/main/java/demoapp/dom/tabs/TabDemo.layout.xml b/examples/demo/src/main/java/demoapp/dom/tabs/TabDemo.layout.xml
index 73fc9c9..f2d7194 100644
--- a/examples/demo/src/main/java/demoapp/dom/tabs/TabDemo.layout.xml
+++ b/examples/demo/src/main/java/demoapp/dom/tabs/TabDemo.layout.xml
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/componenthttp://isis.apache.org/applib/layout/component/component.xsdhttp://isis.apache.org/applib/layout/linkshttp://isis.apache.org/applib/layout/links/links.xsdhttp://isis.apache.org/applib/layout/grid/bootstrap3http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:lnk="http:/ [...]
+<bs3:grid xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject/>
diff --git a/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipDemo.java b/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipDemo.java
index 9fc0d2b..a442028 100644
--- a/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipDemo.java
+++ b/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipDemo.java
@@ -44,11 +44,12 @@ import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.value.Markup;
import org.apache.isis.incubator.model.applib.annotation.Model;
-import demoapp.dom.actions.assoc.DemoItem;
-import demoapp.utils.DemoStub;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom.actions.assoc.DemoItem;
+import demoapp.utils.DemoStub;
+
@XmlRootElement(name = "Demo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipDemo.layout.xml b/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipDemo.layout.xml
index 851d12b..7ca44da 100644
--- a/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipDemo.layout.xml
+++ b/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipDemo.layout.xml
@@ -1,10 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<bs3:grid
- xsi:schemaLocation="http://isis.apache.org/applib/layout/componenthttp://isis.apache.org/applib/layout/component/component.xsdhttp://isis.apache.org/applib/layout/linkshttp://isis.apache.org/applib/layout/links/links.xsdhttp://isis.apache.org/applib/layout/grid/bootstrap3http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
- xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
- xmlns:cpt="http://isis.apache.org/applib/layout/component"
- xmlns:lnk="http://isis.apache.org/applib/layout/links"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject />
diff --git a/examples/demo/src/main/java/demoapp/dom/tree/FileNode-File.svg b/examples/demo/src/main/java/demoapp/dom/tree/FileNode-File.svg
index 70ff5fc..b788c7f 100644
--- a/examples/demo/src/main/java/demoapp/dom/tree/FileNode-File.svg
+++ b/examples/demo/src/main/java/demoapp/dom/tree/FileNode-File.svg
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- viewBox="0 0 58 58" style="enable-background:new 0 0 58 58;" xml:space="preserve">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+ viewBox="0 0 58 58" style="enable-background:new 0 0 58 58;" xml:space="preserve">
<polygon style="fill:#EDEADA;" points="51.5,14 37.5,0 6.5,0 6.5,58 51.5,58 "/>
<g>
<path style="fill:#CEC9AE;" d="M16.5,23h25c0.552,0,1-0.447,1-1s-0.448-1-1-1h-25c-0.552,0-1,0.447-1,1S15.948,23,16.5,23z"/>
diff --git a/examples/demo/src/main/java/demoapp/dom/tree/FileNode-FileSystemRoot.svg b/examples/demo/src/main/java/demoapp/dom/tree/FileNode-FileSystemRoot.svg
index bca7ba1..5f1cdc9 100644
--- a/examples/demo/src/main/java/demoapp/dom/tree/FileNode-FileSystemRoot.svg
+++ b/examples/demo/src/main/java/demoapp/dom/tree/FileNode-FileSystemRoot.svg
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- viewBox="0 0 58 58" style="enable-background:new 0 0 58 58;" xml:space="preserve">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+ viewBox="0 0 58 58" style="enable-background:new 0 0 58 58;" xml:space="preserve">
<path style="fill:#EFCE4A;" d="M55.981,54.5H2.019C0.904,54.5,0,53.596,0,52.481V20.5h58v31.981C58,53.596,57.096,54.5,55.981,54.5z
"/>
<path style="fill:#EBBA16;" d="M26.019,11.5V5.519C26.019,4.404,25.115,3.5,24,3.5H2.019C0.904,3.5,0,4.404,0,5.519V10.5v10h58
diff --git a/examples/demo/src/main/java/demoapp/dom/tree/FileNode-Folder.svg b/examples/demo/src/main/java/demoapp/dom/tree/FileNode-Folder.svg
index 9aedff1..4c25f81 100644
--- a/examples/demo/src/main/java/demoapp/dom/tree/FileNode-Folder.svg
+++ b/examples/demo/src/main/java/demoapp/dom/tree/FileNode-Folder.svg
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- viewBox="0 0 58 58" style="enable-background:new 0 0 58 58;" xml:space="preserve">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+ viewBox="0 0 58 58" style="enable-background:new 0 0 58 58;" xml:space="preserve">
<path style="fill:#EFCE4A;" d="M46.324,52.5H1.565c-1.03,0-1.779-0.978-1.51-1.973l10.166-27.871
c0.184-0.682,0.803-1.156,1.51-1.156H56.49c1.03,0,1.51,0.984,1.51,1.973L47.834,51.344C47.65,52.026,47.031,52.5,46.324,52.5z"/>
<path style="fill:#F4EFDC;" d="M10.221,22.656c0.184-0.683,0.803-1.156,1.51-1.156H53v-7H9l-6,6v21.953L10.221,22.656z"/>
diff --git a/examples/demo/src/main/java/demoapp/dom/tree/TreeDemo.java b/examples/demo/src/main/java/demoapp/dom/tree/TreeDemo.java
index f68e413..06bef30 100644
--- a/examples/demo/src/main/java/demoapp/dom/tree/TreeDemo.java
+++ b/examples/demo/src/main/java/demoapp/dom/tree/TreeDemo.java
@@ -25,9 +25,10 @@ import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.tree.TreeNode;
import org.apache.isis.applib.tree.TreePath;
-import demoapp.utils.DemoStub;
import lombok.val;
+import demoapp.utils.DemoStub;
+
@DomainObject(nature = Nature.VIEW_MODEL, objectType = "demo.Tree")
public class TreeDemo extends DemoStub {
diff --git a/examples/demo/src/main/java/demoapp/dom/tree/TreeDemo.layout.xml b/examples/demo/src/main/java/demoapp/dom/tree/TreeDemo.layout.xml
index 4b04d5e..b2b9bbb 100644
--- a/examples/demo/src/main/java/demoapp/dom/tree/TreeDemo.layout.xml
+++ b/examples/demo/src/main/java/demoapp/dom/tree/TreeDemo.layout.xml
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/links http://isis.apache.org/applib/layout/links/links.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:lnk="h [...]
+<bs3:grid
+ xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject/>
diff --git a/examples/demo/src/main/java/demoapp/dom/tree/TreeDemoMenu.java b/examples/demo/src/main/java/demoapp/dom/tree/TreeDemoMenu.java
index d22ebee..67fd98b 100644
--- a/examples/demo/src/main/java/demoapp/dom/tree/TreeDemoMenu.java
+++ b/examples/demo/src/main/java/demoapp/dom/tree/TreeDemoMenu.java
@@ -27,9 +27,10 @@ import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.services.factory.FactoryService;
-import demoapp.utils.DemoStub;
import lombok.val;
+import demoapp.utils.DemoStub;
+
@DomainService(nature=NatureOfService.VIEW, objectType = "demo.TreeDemoMenu")
@DomainObjectLayout(named="Tree Demo")
public class TreeDemoMenu {
diff --git a/examples/demo/src/main/java/demoapp/dom/types/FeaturedTypesMenu.java b/examples/demo/src/main/java/demoapp/dom/types/FeaturedTypesMenu.java
index 172e52c..112bdec 100644
--- a/examples/demo/src/main/java/demoapp/dom/types/FeaturedTypesMenu.java
+++ b/examples/demo/src/main/java/demoapp/dom/types/FeaturedTypesMenu.java
@@ -27,11 +27,12 @@ import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.services.factory.FactoryService;
+import lombok.val;
+
import demoapp.dom.types.blob.BlobDemo;
import demoapp.dom.types.primitive.PrimitivesDemo;
import demoapp.dom.types.text.TextDemo;
import demoapp.dom.types.time.TemporalDemo;
-import lombok.val;
@DomainService(nature=NatureOfService.VIEW, objectType = "demo.FeaturedTypesMenu")
@DomainObjectLayout(named="Featured Types")
diff --git a/examples/demo/src/main/java/demoapp/dom/types/blob/BlobDemo.java b/examples/demo/src/main/java/demoapp/dom/types/blob/BlobDemo.java
index f957c5c..dbc9a54 100644
--- a/examples/demo/src/main/java/demoapp/dom/types/blob/BlobDemo.java
+++ b/examples/demo/src/main/java/demoapp/dom/types/blob/BlobDemo.java
@@ -34,12 +34,13 @@ import org.apache.isis.applib.value.Blob;
import org.apache.isis.commons.internal.base._Bytes;
import org.apache.isis.commons.internal.resources._Resources;
-import demoapp.utils.DemoStub;
import lombok.Getter;
import lombok.Setter;
import lombok.val;
import lombok.extern.log4j.Log4j2;
+import demoapp.utils.DemoStub;
+
@XmlRootElement(name = "Demo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/examples/demo/src/main/java/demoapp/dom/types/blob/BlobDemo.layout.xml b/examples/demo/src/main/java/demoapp/dom/types/blob/BlobDemo.layout.xml
index 035aee4..9c4036b 100644
--- a/examples/demo/src/main/java/demoapp/dom/types/blob/BlobDemo.layout.xml
+++ b/examples/demo/src/main/java/demoapp/dom/types/blob/BlobDemo.layout.xml
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/links http://isis.apache.org/applib/layout/links/links.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:lnk="h [...]
+<bs3:grid
+ xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject/>
diff --git a/examples/demo/src/main/java/demoapp/dom/types/primitive/PrimitivesDemo.java b/examples/demo/src/main/java/demoapp/dom/types/primitive/PrimitivesDemo.java
index b1282b3..90b98f0 100644
--- a/examples/demo/src/main/java/demoapp/dom/types/primitive/PrimitivesDemo.java
+++ b/examples/demo/src/main/java/demoapp/dom/types/primitive/PrimitivesDemo.java
@@ -33,11 +33,12 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.commons.internal.collections._Lists;
-import demoapp.utils.DemoStub;
import lombok.Getter;
import lombok.Setter;
import lombok.extern.log4j.Log4j2;
+import demoapp.utils.DemoStub;
+
@XmlRootElement(name = "Demo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/examples/demo/src/main/java/demoapp/dom/types/primitive/PrimitivesDemo.layout.xml b/examples/demo/src/main/java/demoapp/dom/types/primitive/PrimitivesDemo.layout.xml
index 165bb29..14d96b29 100644
--- a/examples/demo/src/main/java/demoapp/dom/types/primitive/PrimitivesDemo.layout.xml
+++ b/examples/demo/src/main/java/demoapp/dom/types/primitive/PrimitivesDemo.layout.xml
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<bs3:grid
- xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/links http://isis.apache.org/applib/layout/links/links.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
- xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
- xmlns:cpt="http://isis.apache.org/applib/layout/component"
- xmlns:lnk="http://isis.apache.org/applib/layout/links"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject />
diff --git a/examples/demo/src/main/java/demoapp/dom/types/text/TextDemo.java b/examples/demo/src/main/java/demoapp/dom/types/text/TextDemo.java
index bc07781..09d1c79 100644
--- a/examples/demo/src/main/java/demoapp/dom/types/text/TextDemo.java
+++ b/examples/demo/src/main/java/demoapp/dom/types/text/TextDemo.java
@@ -30,11 +30,12 @@ import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import demoapp.utils.DemoStub;
import lombok.Getter;
import lombok.Setter;
import lombok.extern.log4j.Log4j2;
+import demoapp.utils.DemoStub;
+
@XmlRootElement(name = "Demo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/examples/demo/src/main/java/demoapp/dom/types/text/TextDemo.layout.xml b/examples/demo/src/main/java/demoapp/dom/types/text/TextDemo.layout.xml
index bf4b283..f571b41 100644
--- a/examples/demo/src/main/java/demoapp/dom/types/text/TextDemo.layout.xml
+++ b/examples/demo/src/main/java/demoapp/dom/types/text/TextDemo.layout.xml
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/links http://isis.apache.org/applib/layout/links/links.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:lnk="h [...]
+<bs3:grid
+ xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject/>
diff --git a/examples/demo/src/main/java/demoapp/dom/types/time/TemporalDemo.java b/examples/demo/src/main/java/demoapp/dom/types/time/TemporalDemo.java
index 53dc90f..7aff9a2 100644
--- a/examples/demo/src/main/java/demoapp/dom/types/time/TemporalDemo.java
+++ b/examples/demo/src/main/java/demoapp/dom/types/time/TemporalDemo.java
@@ -42,11 +42,12 @@ import org.apache.isis.applib.util.JaxbAdapters.OffsetDateTimeAdapter;
import org.apache.isis.applib.util.JaxbAdapters.SqlDateAdapter;
import org.apache.isis.applib.util.JaxbAdapters.SqlTimestampAdapter;
-import demoapp.utils.DemoStub;
import lombok.Getter;
import lombok.Setter;
import lombok.extern.log4j.Log4j2;
+import demoapp.utils.DemoStub;
+
@XmlRootElement(name = "Demo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/examples/demo/src/main/java/demoapp/dom/types/time/TemporalDemo.layout.xml b/examples/demo/src/main/java/demoapp/dom/types/time/TemporalDemo.layout.xml
index d7a4971..4badb1c 100644
--- a/examples/demo/src/main/java/demoapp/dom/types/time/TemporalDemo.layout.xml
+++ b/examples/demo/src/main/java/demoapp/dom/types/time/TemporalDemo.layout.xml
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/links http://isis.apache.org/applib/layout/links/links.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:lnk="h [...]
+<bs3:grid
+ xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject/>
diff --git a/examples/demo/src/main/java/demoapp/utils/DemoStub.svg b/examples/demo/src/main/java/demoapp/utils/DemoStub.svg
index 891a739..7f31ff8 100644
--- a/examples/demo/src/main/java/demoapp/utils/DemoStub.svg
+++ b/examples/demo/src/main/java/demoapp/utils/DemoStub.svg
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- viewBox="0 0 511.999 511.999" style="enable-background:new 0 0 511.999 511.999;" xml:space="preserve">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+ viewBox="0 0 511.999 511.999" style="enable-background:new 0 0 511.999 511.999;" xml:space="preserve">
<path style="fill:#FC1A40;" d="M415.534,259.599l-48.6-17.701c-1.5-0.599-3.3-0.899-5.099-0.899h-311.4c-8.401,0-15,6.599-15,15v211
c0,24.899,20.099,45,45,45h300c24.901,0,45-20.101,45-45V273.698C425.435,267.399,421.534,261.699,415.534,259.599z"/>
<path style="fill:#C60034;" d="M425.435,273.698v193.301c0,24.899-20.099,45-45,45h-150v-271h131.4c1.8,0,3.6,0.3,5.099,0.899
diff --git a/examples/demo/src/main/java/demoapp/webapp/menubars.layout.xml b/examples/demo/src/main/java/demoapp/webapp/menubars.layout.xml
index 8de069d..447d8fa 100644
--- a/examples/demo/src/main/java/demoapp/webapp/menubars.layout.xml
+++ b/examples/demo/src/main/java/demoapp/webapp/menubars.layout.xml
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<mb3:menuBars xsi:schemaLocation="http://isis.apache.org/applib/layout/menubars/bootstrap3 http://isis.apache.org/applib/layout/menubars/bootstrap3/menubars.xsd http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/links http://isis.apache.org/applib/layout/links/links.xsd" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:lnk="http://isis.apache.org/applib/layout/links" xmlns:mb3="h [...]
+<mb3:menuBars
+ xsi:schemaLocation="http://isis.apache.org/applib/layout/menubars/bootstrap3 http://isis.apache.org/applib/layout/menubars/bootstrap3/menubars.xsd http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:mb3="http://isis.apache.org/applib/layout/menubars/bootstrap3"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<mb3:primary>
<mb3:menu>
<mb3:named>Featured Types</mb3:named>
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
index fa72a78..b87ad02 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
@@ -34,6 +34,9 @@ import org.springframework.test.context.TestPropertySource;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.support.TransactionTemplate;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import org.apache.isis.applib.services.audit.AuditerService;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.repository.RepositoryService;
@@ -48,9 +51,6 @@ import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import org.apache.isis.testdomain.jdo.Book;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/AutoConfigurationTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/AutoConfigurationTest.java
index e230773..9f847ca 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/AutoConfigurationTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/AutoConfigurationTest.java
@@ -29,12 +29,15 @@ import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Component;
import org.springframework.test.context.TestPropertySource;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring;
import org.apache.isis.config.beans.IsisBeanTypeRegistryHolder;
import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.metamodel.context.MetaModelContexts;
-//import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingStereotypes;
import org.apache.isis.testdomain.model.stereotypes.MyObject;
@@ -42,12 +45,10 @@ import org.apache.isis.testdomain.model.stereotypes.MyObject_mixin;
import org.apache.isis.testdomain.model.stereotypes.MyService;
import org.apache.isis.testdomain.model.stereotypes.MyView;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
import lombok.val;
+//import org.apache.isis.testdomain.Incubating;
+
@Smoketest
@SpringBootTest(
classes = {
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest.java
index f1a4a8b..f926438 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest.java
@@ -35,6 +35,9 @@ import org.springframework.test.annotation.Rollback;
import org.springframework.test.context.TestPropertySource;
import org.springframework.transaction.annotation.Transactional;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.testdomain.Smoketest;
@@ -43,9 +46,6 @@ import org.apache.isis.testdomain.jdo.Book;
import org.apache.isis.testdomain.jdo.Inventory;
import org.apache.isis.testdomain.jdo.Product;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import lombok.val;
@Smoketest
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
index 7a4a63a..0f7e346 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
@@ -25,6 +25,9 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.transaction.annotation.Transactional;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
@@ -33,9 +36,6 @@ import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import org.apache.isis.testdomain.jdo.Inventory;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import lombok.val;
@Smoketest
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java
index 4ef0824..0e6d120 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java
@@ -37,24 +37,25 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.springframework.test.context.TestPropertySource;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.runtime.services.message.MessageServiceDefault;
-//import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_headless;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import lombok.Getter;
import lombok.val;
+//import org.apache.isis.testdomain.Incubating;
+
@Smoketest
@SpringBootTest(
classes = {
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceProvisioningTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceProvisioningTest.java
index 3a3f1c8..fc7c5ec 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceProvisioningTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceProvisioningTest.java
@@ -31,23 +31,25 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.commons.internal.ioc.ManagedBeanAdapter;
import org.apache.isis.commons.internal.resources._Resources;
import org.apache.isis.config.presets.IsisPresets;
-//import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import static org.apache.isis.commons.internal.collections._Collections.toStringJoiningNewLine;
import static org.apache.isis.commons.internal.collections._Sets.intersectSorted;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
import lombok.val;
+//import org.apache.isis.testdomain.Incubating;
+
@Smoketest
@SpringBootTest(
classes = {
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperTest.java
index a6231b3..6b13d20 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperTest.java
@@ -33,6 +33,10 @@ import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Service;
import org.springframework.test.context.TestPropertySource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.isis.applib.events.domain.AbstractDomainEvent.Phase;
import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.services.repository.RepositoryService;
@@ -46,10 +50,6 @@ import org.apache.isis.testdomain.jdo.InventoryManager;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
import org.apache.isis.testdomain.jdo.Product;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import lombok.Getter;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/FooTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/FooTest.java
index 28de4cb..878c933 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/FooTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/FooTest.java
@@ -32,13 +32,13 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.TestPropertySource;
-import org.apache.isis.config.presets.IsisPresets;
-import org.apache.isis.testdomain.Smoketest;
-
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.testdomain.Smoketest;
+
@Smoketest
@SpringBootTest(
classes = {
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest.java
index 8e704bd..b9ac34e 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest.java
@@ -24,14 +24,14 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.IsisModuleConfig;
import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.testdomain.Smoketest;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
@Smoketest
@SpringBootTest(
classes = {
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest_usingHeadless.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest_usingHeadless.java
index 6ffdf0e..277438e 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest_usingHeadless.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest_usingHeadless.java
@@ -24,14 +24,14 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_headless;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
@Smoketest
@SpringBootTest(
classes = {
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/AnnotationSyntesizerTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/AnnotationSyntesizerTest.java
index bce8f3c..9c288f4 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/AnnotationSyntesizerTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/AnnotationSyntesizerTest.java
@@ -25,6 +25,9 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
import org.springframework.util.ReflectionUtils;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.events.domain.ActionDomainEvent;
import org.apache.isis.applib.services.jaxb.JaxbService;
@@ -38,9 +41,6 @@ import org.apache.isis.testdomain.model.bad.Configuration_usingInvalidDomain;
import org.apache.isis.testdomain.model.bad.InvalidPropertyAnnotationOnAction;
import org.apache.isis.testdomain.model.good.Configuration_usingValidDomain;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.fail;
-
import lombok.val;
@Smoketest
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
index 450b2c3..ff8c2db 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
@@ -25,6 +25,9 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.metamodel.specloader.IntrospectionMode;
@@ -41,9 +44,6 @@ import org.apache.isis.testdomain.model.bad.InvalidOrphanedCollectionSupport;
import org.apache.isis.testdomain.model.bad.InvalidOrphanedPropertySupport;
import org.apache.isis.testdomain.model.bad.InvalidPropertyAnnotationOnAction;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import lombok.val;
@Smoketest
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain_noActionEnforced.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain_noActionEnforced.java
index bd9d78c..c043f29 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain_noActionEnforced.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain_noActionEnforced.java
@@ -24,6 +24,10 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.metamodel.specloader.IntrospectionMode;
@@ -36,10 +40,6 @@ import org.apache.isis.testdomain.conf.Configuration_headless;
import org.apache.isis.testdomain.model.badnoact.Configuration_usingInvalidDomain_noActionEnforced;
import org.apache.isis.testdomain.model.badnoact.InvalidOrphanedActionSupportNoActionEnforced;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import lombok.val;
@Smoketest
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
index 4d6cecf..ca76cec 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
@@ -24,6 +24,11 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.services.metamodel.MetaModelService;
import org.apache.isis.config.presets.IsisPresets;
@@ -37,11 +42,6 @@ import org.apache.isis.testdomain.jdo.Product;
import org.apache.isis.testdomain.model.good.Configuration_usingValidDomain;
import org.apache.isis.testdomain.model.good.ProperMemberSupport;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
import lombok.val;
@Smoketest
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/SpecloaderPerformanceTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/SpecloaderPerformanceTest.java
index cad8a4a..74aef35 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/SpecloaderPerformanceTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/SpecloaderPerformanceTest.java
@@ -25,6 +25,8 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
+import static org.junit.jupiter.api.Assertions.fail;
+
import org.apache.isis.commons.internal.base._Timing;
import org.apache.isis.commons.internal.reflection._Annotations;
import org.apache.isis.config.IsisConfiguration;
@@ -35,8 +37,6 @@ import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_headless;
import org.apache.isis.testdomain.model.good.Configuration_usingValidDomain;
-import static org.junit.jupiter.api.Assertions.fail;
-
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/eventhandling/GenericEventPublishingTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/eventhandling/GenericEventPublishingTest.java
index 8f2c777..bd4afe0 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/eventhandling/GenericEventPublishingTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/eventhandling/GenericEventPublishingTest.java
@@ -27,11 +27,11 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Service;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.isis.applib.services.eventbus.EventBusService;
import org.apache.isis.runtime.services.eventbus.EventBusServiceSpring;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import lombok.Getter;
import lombok.Value;
import lombok.val;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/eventhandling/SpringEventPublishingTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/eventhandling/SpringEventPublishingTest.java
index 53e3ee4..8e63bf8 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/eventhandling/SpringEventPublishingTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/eventhandling/SpringEventPublishingTest.java
@@ -29,10 +29,10 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Service;
-import org.apache.isis.commons.internal.ioc.spring._Spring;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.apache.isis.commons.internal.ioc.spring._Spring;
+
import lombok.Getter;
import lombok.Value;
import lombok.val;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/ldap/LdapEmbeddedServerTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/ldap/LdapEmbeddedServerTest.java
index 2d62e0a..4ad18f5 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/ldap/LdapEmbeddedServerTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/ldap/LdapEmbeddedServerTest.java
@@ -30,12 +30,12 @@ import org.junit.runners.model.InitializationError;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
-import org.apache.isis.config.presets.IsisPresets;
-import org.apache.isis.testdomain.Smoketest;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
+import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.testdomain.Smoketest;
+
import lombok.val;
@Smoketest
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/logging/LoggerSetupTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/logging/LoggerSetupTest.java
index d563810..706ea46 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/logging/LoggerSetupTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/logging/LoggerSetupTest.java
@@ -25,10 +25,10 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.TestPropertySource;
-import org.apache.isis.config.presets.IsisPresets;
-
import static org.junit.jupiter.api.Assertions.assertFalse;
+import org.apache.isis.config.presets.IsisPresets;
+
import lombok.val;
@SpringBootTest(
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java
index 857a7a2..d7d322a 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java
@@ -37,6 +37,9 @@ import org.springframework.test.context.TestPropertySource;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.support.TransactionTemplate;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import org.apache.isis.applib.services.iactn.Interaction.Execution;
import org.apache.isis.applib.services.publish.PublishedObjects;
import org.apache.isis.applib.services.publish.PublisherService;
@@ -52,9 +55,6 @@ import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import org.apache.isis.testdomain.jdo.Book;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
import lombok.Getter;
import lombok.val;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java
index 91a88fa..dbc5791 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java
@@ -27,16 +27,16 @@ import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.context.annotation.Import;
import org.springframework.test.context.TestPropertySource;
-import org.apache.isis.config.presets.IsisPresets;
-import org.apache.isis.testdomain.conf.Configuration_usingJdo;
-import org.apache.isis.testdomain.jdo.Book;
-import org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.IsisModuleRestfulObjectsJaxrsResteasy4;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
+import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.testdomain.conf.Configuration_usingJdo;
+import org.apache.isis.testdomain.jdo.Book;
+import org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.IsisModuleRestfulObjectsJaxrsResteasy4;
+
import lombok.val;
@SpringBootTest(
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroLdapTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroLdapTest.java
index 5b7cc14..208faaa 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroLdapTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroLdapTest.java
@@ -31,6 +31,11 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Import;
import org.springframework.test.context.TestPropertySource;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.testdomain.Incubating;
@@ -39,11 +44,6 @@ import org.apache.isis.testdomain.conf.Configuration_usingJdoAndShiro;
import org.apache.isis.testdomain.ldap.LdapConstants;
import org.apache.isis.testdomain.ldap.LdapServerService;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
index 846cbfd..2fe5bd1 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
@@ -31,6 +31,12 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Import;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
@@ -47,12 +53,6 @@ import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
import org.apache.isis.testdomain.ldap.LdapConstants;
import org.apache.isis.testdomain.ldap.LdapServerService;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
import lombok.val;
@Smoketest
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
index 0964153..a424dc6 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
@@ -18,6 +18,8 @@
*/
package org.apache.isis.testdomain.shiro;
+import static java.time.Duration.ofMillis;
+
import javax.inject.Inject;
import org.junit.jupiter.api.AfterEach;
@@ -27,6 +29,11 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Import;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTimeout;
+import static org.junit.jupiter.api.Assertions.fail;
+
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
@@ -46,12 +53,6 @@ import org.apache.isis.testdomain.ldap.LdapServerService;
import org.apache.isis.testdomain.rest.RestEndpointService;
import org.apache.isis.viewer.restfulobjects.viewer.IsisModuleRestfulObjectsViewer;
-import static java.time.Duration.ofMillis;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTimeout;
-import static org.junit.jupiter.api.Assertions.fail;
-
import lombok.val;
@Smoketest
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java
index 8297ed8..bc03993 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java
@@ -31,6 +31,11 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Import;
import org.springframework.test.context.TestPropertySource;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
@@ -42,11 +47,6 @@ import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdoAndShiro;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
import lombok.val;
@Smoketest
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSimpleTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSimpleTest.java
index fe0d0f7..afccd2d 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSimpleTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSimpleTest.java
@@ -29,13 +29,13 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.testdomain.Smoketest;
-
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import org.apache.isis.applib.services.inject.ServiceInjector;
+import org.apache.isis.testdomain.Smoketest;
+
import lombok.val;
@Smoketest
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/timestamping/TimestampingTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/timestamping/TimestampingTest.java
index bb7adfb..88ebe68 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/timestamping/TimestampingTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/timestamping/TimestampingTest.java
@@ -25,6 +25,8 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.transaction.annotation.Transactional;
+import static org.junit.Assert.assertNotNull;
+
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
import org.apache.isis.testdomain.Smoketest;
@@ -33,8 +35,6 @@ import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
import org.apache.isis.testdomain.jdo.Product;
import org.apache.isis.testdomain.jdo.ProductComment;
-import static org.junit.Assert.assertNotNull;
-
import lombok.val;
@Smoketest
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java
index 2a2fd4b..1fc15e8 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java
@@ -25,6 +25,9 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.commons.internal.exceptions._Exceptions;
@@ -35,9 +38,6 @@ import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import org.apache.isis.testdomain.jdo.Book;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
@Smoketest
@SpringBootTest(
classes = {
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java
index b7e3bc0..90ac093 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java
@@ -29,6 +29,8 @@ import org.springframework.test.annotation.Commit;
import org.springframework.test.context.TestPropertySource;
import org.springframework.transaction.annotation.Transactional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
@@ -37,8 +39,6 @@ import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import org.apache.isis.testdomain.jdo.Book;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
/**
* These tests use the {@code @Transactional} annotation as provided by Spring.
* <p>
diff --git a/incubator/core/microprofile/src/main/java/org/apache/isis/runtime/jee_support/IsisCDIBeanScanInterceptor.java b/incubator/core/microprofile/src/main/java/org/apache/isis/runtime/jee_support/IsisCDIBeanScanInterceptor.java
index cebb542..4e3d607 100644
--- a/incubator/core/microprofile/src/main/java/org/apache/isis/runtime/jee_support/IsisCDIBeanScanInterceptor.java
+++ b/incubator/core/microprofile/src/main/java/org/apache/isis/runtime/jee_support/IsisCDIBeanScanInterceptor.java
@@ -32,8 +32,8 @@ import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
import org.apache.isis.applib.services.metrics.MetricsService;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
*
diff --git a/legacy/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolSupport.java b/legacy/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolSupport.java
index f0e8353..9c3006b 100644
--- a/legacy/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolSupport.java
+++ b/legacy/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolSupport.java
@@ -37,15 +37,16 @@ import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
+import static java.util.stream.Collectors.toList;
+
import javax.annotation.Nullable;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import static java.util.Collections.emptyList;
-import static java.util.Collections.singletonList;
-import static java.util.stream.Collectors.toList;
import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
import static org.apache.isis.commons.internal.base._With.requires;
diff --git a/legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/ColorValueSemanticsProviderTest.java b/legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/ColorValueSemanticsProviderTest.java
index b106b7c..6bd1053 100644
--- a/legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/ColorValueSemanticsProviderTest.java
+++ b/legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/ColorValueSemanticsProviderTest.java
@@ -22,6 +22,9 @@ package org.apache.isis.legacy.metamodel.facets.value;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
import org.apache.isis.legacy.applib.value.Color;
import org.apache.isis.legacy.metamodel.facets.value.color.ColorValueSemanticsProvider;
import org.apache.isis.metamodel.facetapi.FacetHolder;
@@ -29,9 +32,6 @@ import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.metamodel.facets.value.ValueSemanticsProviderAbstractTestCase;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
public class ColorValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
private ColorValueSemanticsProvider value;
diff --git a/legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/MoneyValueSemanticsProviderTest.java b/legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/MoneyValueSemanticsProviderTest.java
index efff2e2..9a7511c 100644
--- a/legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/MoneyValueSemanticsProviderTest.java
+++ b/legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/MoneyValueSemanticsProviderTest.java
@@ -24,6 +24,9 @@ import java.util.Locale;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
import org.apache.isis.legacy.applib.value.Money;
import org.apache.isis.legacy.metamodel.facets.value.money.MoneyValueSemanticsProvider;
import org.apache.isis.metamodel.context.MetaModelContextAware;
@@ -32,9 +35,6 @@ import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.metamodel.facets.value.ValueSemanticsProviderAbstractTestCase;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
public class MoneyValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
private static final String POUND_SYMBOL = "\u00A3";
diff --git a/legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PercentageValueSemanticsProviderTest.java b/legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PercentageValueSemanticsProviderTest.java
index 17bc81e..e468bcc 100644
--- a/legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PercentageValueSemanticsProviderTest.java
+++ b/legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PercentageValueSemanticsProviderTest.java
@@ -22,6 +22,8 @@ package org.apache.isis.legacy.metamodel.facets.value;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
import org.apache.isis.legacy.applib.value.Percentage;
import org.apache.isis.legacy.metamodel.facets.value.percentage.PercentageValueSemanticsProvider;
import org.apache.isis.metamodel.context.MetaModelContextAware;
@@ -30,8 +32,6 @@ import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.metamodel.facets.value.ValueSemanticsProviderAbstractTestCase;
import org.apache.isis.unittestsupport.config.internal._Config;
-import static org.junit.Assert.assertEquals;
-
public class PercentageValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
private PercentageValueSemanticsProvider adapter;
private Percentage percentage;
diff --git a/legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PolishMoneyValueSemanticsProviderTest.java b/legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PolishMoneyValueSemanticsProviderTest.java
index e3cf50b..c6d592f 100644
--- a/legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PolishMoneyValueSemanticsProviderTest.java
+++ b/legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PolishMoneyValueSemanticsProviderTest.java
@@ -25,6 +25,9 @@ import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
import org.apache.isis.legacy.applib.value.Money;
import org.apache.isis.legacy.metamodel.facets.value.money.MoneyValueSemanticsProvider;
import org.apache.isis.metamodel.context.MetaModelContextAware;
@@ -33,9 +36,6 @@ import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.metamodel.facets.value.ValueSemanticsProviderAbstractTestCase;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
@Ignore
// TODO once the semantics provider has a way to reset the formatters for the new
// local then this test can be reinstated.
diff --git a/legacy/vro/restclient/src/main/java/org/apache/isis/legacy/restclient/RestEasyLegacy.java b/legacy/vro/restclient/src/main/java/org/apache/isis/legacy/restclient/RestEasyLegacy.java
index 893d77b..383e83b 100644
--- a/legacy/vro/restclient/src/main/java/org/apache/isis/legacy/restclient/RestEasyLegacy.java
+++ b/legacy/vro/restclient/src/main/java/org/apache/isis/legacy/restclient/RestEasyLegacy.java
@@ -22,7 +22,6 @@ import java.lang.reflect.Method;
import javax.ws.rs.NotSupportedException;
import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.Response;
/**
* Compatibility layer, legacy of deprecated resteasy client API.
[isis] 01/08: ISIS-2247: @TestPropertySource reformatting, is all.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 75e70e97c21f231b1b88bcffb79efef05a8092c2
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jan 4 14:10:36 2020 +0000
ISIS-2247: @TestPropertySource reformatting, is all.
---
.../test/java/org/apache/isis/testdomain/logging/LoggerSetupTest.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/logging/LoggerSetupTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/logging/LoggerSetupTest.java
index 316c7e4..d563810 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/logging/LoggerSetupTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/logging/LoggerSetupTest.java
@@ -37,9 +37,7 @@ import lombok.val;
},
properties = {
})
-@TestPropertySource({
- IsisPresets.SilenceWicket
-})
+@TestPropertySource(IsisPresets.SilenceWicket)
public class LoggerSetupTest {
@Configuration
[isis] 08/08: ISIS-2158: sh sync_adoc.sh
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 1f7ce8eeaf779b52bc2d60d8800d4fe0a5fcee1c
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jan 4 14:34:02 2020 +0000
ISIS-2158: sh sync_adoc.sh
---
.../src/main/doc/modules/applib-ant/examples/annotation/HomePage.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/HomePage.java b/core/applib/src/main/doc/modules/applib-ant/examples/annotation/HomePage.java
index c29c668..05b4954 100644
--- a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/HomePage.java
+++ b/core/applib/src/main/doc/modules/applib-ant/examples/annotation/HomePage.java
@@ -25,6 +25,8 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import org.apache.isis.applib.ViewModel;
+
/**
* Indicates that the (no-arg) action (on a domain service) to be invoked automatically
* and the contents used for the home page.
[isis] 04/08: ISIS-2158: re-run 'optimize imports' for 'extensions'
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 6343fd95e2f2bc0536287bd9002c6693c4572fe0
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jan 4 14:27:42 2020 +0000
ISIS-2158: re-run 'optimize imports' for 'extensions'
---
.../isis/extensions/h2console/dom/webmodule/WebModuleH2Console.java | 2 +-
.../secman/jdo/dom/permission/ApplicationPermissionRepository.java | 2 +-
.../isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java | 2 +-
.../secman/shiro/services/SecurityRealmServiceUsingShiro.java | 2 +-
.../isis/extensions/fixtures/modules/ModuleWithFixturesService.java | 2 +-
.../specsupport/integration/ObjectFactoryForIntegration.java | 3 ++-
.../org/apache/isis/extensions/sse/services/SseServiceDefault.java | 2 +-
7 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/extensions/persistence/h2console/impl/src/main/java/org/apache/isis/extensions/h2console/dom/webmodule/WebModuleH2Console.java b/extensions/persistence/h2console/impl/src/main/java/org/apache/isis/extensions/h2console/dom/webmodule/WebModuleH2Console.java
index d634b62..e7fb567 100644
--- a/extensions/persistence/h2console/impl/src/main/java/org/apache/isis/extensions/h2console/dom/webmodule/WebModuleH2Console.java
+++ b/extensions/persistence/h2console/impl/src/main/java/org/apache/isis/extensions/h2console/dom/webmodule/WebModuleH2Console.java
@@ -41,8 +41,8 @@ import org.apache.isis.webapp.modules.WebModuleAbstract;
import org.apache.isis.webapp.modules.WebModuleContext;
import lombok.Getter;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Service
@Named("isisExtH2Console.WebModuleH2Console")
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermissionRepository.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermissionRepository.java
index 14c7968..39e3f97 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermissionRepository.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermissionRepository.java
@@ -51,8 +51,8 @@ import org.apache.isis.metamodel.services.appfeat.ApplicationFeatureId;
import org.apache.isis.metamodel.services.appfeat.ApplicationFeatureRepositoryDefault;
import org.apache.isis.metamodel.services.appfeat.ApplicationFeatureType;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Repository
@Named("isisExtSecman.applicationPermissionRepository")
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java
index b5d34c0..42af90a 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java
@@ -31,8 +31,8 @@ import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
import org.apache.isis.runtime.context.session.AppLifecycleEvent;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Service
@Named("isisExtSecman.SeedSecurityModuleService")
diff --git a/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/services/SecurityRealmServiceUsingShiro.java b/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/services/SecurityRealmServiceUsingShiro.java
index bf72e95..79cf142 100644
--- a/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/services/SecurityRealmServiceUsingShiro.java
+++ b/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/services/SecurityRealmServiceUsingShiro.java
@@ -31,8 +31,8 @@ import org.apache.isis.extensions.secman.api.SecurityRealm;
import org.apache.isis.extensions.secman.api.SecurityRealmService;
import org.apache.isis.extensions.secman.shiro.util.ShiroUtils;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Service
@Named("isisExtSecman.SecurityRealmServiceUsingShiro")
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/modules/ModuleWithFixturesService.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/modules/ModuleWithFixturesService.java
index 7a45160..51ab0f6 100644
--- a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/modules/ModuleWithFixturesService.java
+++ b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/modules/ModuleWithFixturesService.java
@@ -46,8 +46,8 @@ import org.apache.isis.extensions.spring.service.SpringBeansService;
import org.apache.isis.metamodel.facets.Annotations;
import lombok.Data;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Service
@Named("isisExtFixtures.ModuleService")
diff --git a/extensions/testing/specsupport/src/main/java/org/apache/isis/extensions/specsupport/integration/ObjectFactoryForIntegration.java b/extensions/testing/specsupport/src/main/java/org/apache/isis/extensions/specsupport/integration/ObjectFactoryForIntegration.java
index eb27644..2ca5da2 100644
--- a/extensions/testing/specsupport/src/main/java/org/apache/isis/extensions/specsupport/integration/ObjectFactoryForIntegration.java
+++ b/extensions/testing/specsupport/src/main/java/org/apache/isis/extensions/specsupport/integration/ObjectFactoryForIntegration.java
@@ -24,9 +24,10 @@ import java.util.Map;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.commons.internal.collections._Maps;
+import lombok.RequiredArgsConstructor;
+
import cucumber.api.java.ObjectFactory;
import cucumber.runtime.CucumberException;
-import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor
public class ObjectFactoryForIntegration implements ObjectFactory {
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java b/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java
index 9be96c2..eac8a9a 100644
--- a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java
+++ b/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java
@@ -51,8 +51,8 @@ import org.apache.isis.runtime.session.IsisSessionFactory;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.Value;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
* Server-sent events.
[isis] 07/08: ISIS-2158: updates IntelliJ config for lombok import
order.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit c9b244dbb3bf30a7e1e560589f3c612ab7b4457c
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jan 4 14:32:19 2020 +0000
ISIS-2158: updates IntelliJ config for lombok import order.
---
ide-settings/intellij/Apache-Isis.xml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/ide-settings/intellij/Apache-Isis.xml b/ide-settings/intellij/Apache-Isis.xml
index f019625..5ca1f1f 100644
--- a/ide-settings/intellij/Apache-Isis.xml
+++ b/ide-settings/intellij/Apache-Isis.xml
@@ -35,6 +35,11 @@
<emptyLine />
<package name="org.incode" withSubpackages="true" static="true" />
<emptyLine />
+ <package name="lombok" withSubpackages="true" static="false" />
+ <package name="lombok.experimental" withSubpackages="true" static="false" />
+ <package name="lombok.extern.log4j" withSubpackages="true" static="false" />
+ <package name="lombok.extern" withSubpackages="true" static="false" />
+ <emptyLine />
<package name="" withSubpackages="true" static="false" />
<emptyLine />
<package name="" withSubpackages="true" static="true" />