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:13 UTC
[isis] 02/08: ISIS-2158: organize imports for 'extensions'
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.