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:17 UTC
[isis] 06/08: ISIS-2158: (re) run 'optimize imports' for
examples/demo, examples/smoketests, incubator, legacy
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 38eb63fafd487de4ec50a90b2ebf6da54780cbca
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jan 4 14:31:10 2020 +0000
ISIS-2158: (re) run 'optimize imports' for examples/demo, examples/smoketests, incubator, legacy
---
.../demoapp/dom/actions/assoc/AssociatedActionDemo.java | 3 ++-
.../dom/actions/assoc/AssociatedActionDemo.layout.xml | 9 ++++-----
.../java/demoapp/dom/actions/async/AsyncActionDemo.java | 3 ++-
.../demoapp/dom/actions/async/AsyncActionDemo.layout.xml | 9 ++++-----
.../dom/actions/depargs/DependentArgsActionDemo.java | 3 ++-
.../actions/depargs/DependentArgsActionDemo.layout.xml | 9 ++++-----
.../src/main/java/demoapp/dom/error/ErrorDemo.layout.xml | 9 ++++-----
.../main/java/demoapp/dom/events/DemoEventSubscriber.java | 7 ++++---
.../src/main/java/demoapp/dom/events/EventLogEntry.java | 3 ++-
.../main/java/demoapp/dom/events/EventsDemo.layout.xml | 4 +++-
.../src/main/java/demoapp/dom/homepage/DemoHomePage.java | 3 ++-
.../java/demoapp/dom/homepage/DemoHomePage.layout.xml | 8 +++-----
.../demo/src/main/java/demoapp/dom/jee/JeeDemo.layout.xml | 4 +++-
examples/demo/src/main/java/demoapp/dom/tabs/TabDemo.java | 3 ++-
.../src/main/java/demoapp/dom/tabs/TabDemo.layout.xml | 4 +++-
.../src/main/java/demoapp/dom/tooltip/TooltipDemo.java | 5 +++--
.../main/java/demoapp/dom/tooltip/TooltipDemo.layout.xml | 8 +++-----
.../demo/src/main/java/demoapp/dom/tree/FileNode-File.svg | 4 ++--
.../java/demoapp/dom/tree/FileNode-FileSystemRoot.svg | 4 ++--
.../src/main/java/demoapp/dom/tree/FileNode-Folder.svg | 4 ++--
.../demo/src/main/java/demoapp/dom/tree/TreeDemo.java | 3 ++-
.../src/main/java/demoapp/dom/tree/TreeDemo.layout.xml | 6 +++++-
.../demo/src/main/java/demoapp/dom/tree/TreeDemoMenu.java | 3 ++-
.../main/java/demoapp/dom/types/FeaturedTypesMenu.java | 3 ++-
.../src/main/java/demoapp/dom/types/blob/BlobDemo.java | 3 ++-
.../main/java/demoapp/dom/types/blob/BlobDemo.layout.xml | 6 +++++-
.../java/demoapp/dom/types/primitive/PrimitivesDemo.java | 3 ++-
.../demoapp/dom/types/primitive/PrimitivesDemo.layout.xml | 9 ++++-----
.../src/main/java/demoapp/dom/types/text/TextDemo.java | 3 ++-
.../main/java/demoapp/dom/types/text/TextDemo.layout.xml | 6 +++++-
.../main/java/demoapp/dom/types/time/TemporalDemo.java | 3 ++-
.../java/demoapp/dom/types/time/TemporalDemo.layout.xml | 6 +++++-
examples/demo/src/main/java/demoapp/utils/DemoStub.svg | 4 ++--
.../demo/src/main/java/demoapp/webapp/menubars.layout.xml | 6 +++++-
.../isis/testdomain/auditing/AuditerServiceTest.java | 6 +++---
.../testdomain/bootstrapping/AutoConfigurationTest.java | 11 ++++++-----
.../testdomain/bootstrapping/JdoBootstrappingTest.java | 6 +++---
.../bootstrapping/JdoBootstrappingTest_usingFixtures.java | 6 +++---
.../bootstrapping/SpringServiceInjectOrderTest.java | 15 ++++++++-------
.../bootstrapping/SpringServiceProvisioningTest.java | 8 +++++---
.../isis/testdomain/commandexecution/WrapperTest.java | 8 ++++----
.../java/org/apache/isis/testdomain/config/FooTest.java | 6 +++---
.../apache/isis/testdomain/config/IsisConfigBeanTest.java | 6 +++---
.../config/IsisConfigBeanTest_usingHeadless.java | 6 +++---
.../testdomain/domainmodel/AnnotationSyntesizerTest.java | 6 +++---
.../domainmodel/DomainModelTest_usingBadDomain.java | 6 +++---
.../DomainModelTest_usingBadDomain_noActionEnforced.java | 8 ++++----
.../domainmodel/DomainModelTest_usingGoodDomain.java | 10 +++++-----
.../testdomain/domainmodel/SpecloaderPerformanceTest.java | 4 ++--
.../eventhandling/GenericEventPublishingTest.java | 4 ++--
.../eventhandling/SpringEventPublishingTest.java | 4 ++--
.../isis/testdomain/ldap/LdapEmbeddedServerTest.java | 6 +++---
.../apache/isis/testdomain/logging/LoggerSetupTest.java | 4 ++--
.../isis/testdomain/publishing/PublisherServiceTest.java | 6 +++---
.../org/apache/isis/testdomain/rest/RestServiceTest.java | 10 +++++-----
.../org/apache/isis/testdomain/shiro/ShiroLdapTest.java | 10 +++++-----
.../apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java | 12 ++++++------
.../shiro/ShiroSecmanLdap_restfulStressTest.java | 13 +++++++------
.../org/apache/isis/testdomain/shiro/ShiroSecmanTest.java | 10 +++++-----
.../org/apache/isis/testdomain/shiro/ShiroSimpleTest.java | 6 +++---
.../isis/testdomain/timestamping/TimestampingTest.java | 4 ++--
.../testdomain/transactions/TransactionRollbackTest.java | 6 +++---
.../TransactionRollbackTest_usingTransactional.java | 4 ++--
.../runtime/jee_support/IsisCDIBeanScanInterceptor.java | 2 +-
.../commons/internal/threadpool/ThreadPoolSupport.java | 7 ++++---
.../facets/value/ColorValueSemanticsProviderTest.java | 6 +++---
.../facets/value/MoneyValueSemanticsProviderTest.java | 6 +++---
.../value/PercentageValueSemanticsProviderTest.java | 4 ++--
.../value/PolishMoneyValueSemanticsProviderTest.java | 6 +++---
.../org/apache/isis/legacy/restclient/RestEasyLegacy.java | 1 -
70 files changed, 225 insertions(+), 188 deletions(-)
diff --git a/examples/demo/src/main/java/demoapp/dom/actions/assoc/AssociatedActionDemo.java b/examples/demo/src/main/java/demoapp/dom/actions/assoc/AssociatedActionDemo.java
index 16ba34f..169395a 100644
--- a/examples/demo/src/main/java/demoapp/dom/actions/assoc/AssociatedActionDemo.java
+++ b/examples/demo/src/main/java/demoapp/dom/actions/assoc/AssociatedActionDemo.java
@@ -36,9 +36,10 @@ import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.services.message.MessageService;
-import demoapp.utils.DemoStub;
import lombok.Getter;
+import demoapp.utils.DemoStub;
+
@XmlRootElement(name = "Demo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/examples/demo/src/main/java/demoapp/dom/actions/assoc/AssociatedActionDemo.layout.xml b/examples/demo/src/main/java/demoapp/dom/actions/assoc/AssociatedActionDemo.layout.xml
index 791a6de..8b02d0d 100644
--- a/examples/demo/src/main/java/demoapp/dom/actions/assoc/AssociatedActionDemo.layout.xml
+++ b/examples/demo/src/main/java/demoapp/dom/actions/assoc/AssociatedActionDemo.layout.xml
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<bs3:grid
- xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/links http://isis.apache.org/applib/layout/links/links.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
- xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
- xmlns:cpt="http://isis.apache.org/applib/layout/component"
- xmlns:lnk="http://isis.apache.org/applib/layout/links"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject />
diff --git a/examples/demo/src/main/java/demoapp/dom/actions/async/AsyncActionDemo.java b/examples/demo/src/main/java/demoapp/dom/actions/async/AsyncActionDemo.java
index 4964edf..7b33d09 100644
--- a/examples/demo/src/main/java/demoapp/dom/actions/async/AsyncActionDemo.java
+++ b/examples/demo/src/main/java/demoapp/dom/actions/async/AsyncActionDemo.java
@@ -38,11 +38,12 @@ import org.apache.isis.extensions.sse.api.SseService;
import org.apache.isis.extensions.sse.api.SseService.ExecutionBehavior;
import org.apache.isis.extensions.sse.markup.ListeningMarkup;
-import demoapp.utils.DemoStub;
import lombok.Getter;
import lombok.Setter;
import lombok.val;
+import demoapp.utils.DemoStub;
+
@XmlRootElement(name = "Demo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/examples/demo/src/main/java/demoapp/dom/actions/async/AsyncActionDemo.layout.xml b/examples/demo/src/main/java/demoapp/dom/actions/async/AsyncActionDemo.layout.xml
index 6551bb4..57cb458 100644
--- a/examples/demo/src/main/java/demoapp/dom/actions/async/AsyncActionDemo.layout.xml
+++ b/examples/demo/src/main/java/demoapp/dom/actions/async/AsyncActionDemo.layout.xml
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<bs3:grid
- xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/links http://isis.apache.org/applib/layout/links/links.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
- xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
- xmlns:cpt="http://isis.apache.org/applib/layout/component"
- xmlns:lnk="http://isis.apache.org/applib/layout/links"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject />
diff --git a/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo.java b/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo.java
index 7af9f32..46d77c3 100644
--- a/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo.java
+++ b/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo.java
@@ -33,9 +33,10 @@ import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.value.Markup;
-import demoapp.utils.DemoStub;
import lombok.Getter;
+import demoapp.utils.DemoStub;
+
@XmlRootElement(name = "Demo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo.layout.xml b/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo.layout.xml
index cabbd81..76ff059 100644
--- a/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo.layout.xml
+++ b/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo.layout.xml
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<bs3:grid
- xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/links http://isis.apache.org/applib/layout/links/links.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
- xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
- xmlns:cpt="http://isis.apache.org/applib/layout/component"
- xmlns:lnk="http://isis.apache.org/applib/layout/links"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject />
diff --git a/examples/demo/src/main/java/demoapp/dom/error/ErrorDemo.layout.xml b/examples/demo/src/main/java/demoapp/dom/error/ErrorDemo.layout.xml
index e7b98d7..e52391e 100644
--- a/examples/demo/src/main/java/demoapp/dom/error/ErrorDemo.layout.xml
+++ b/examples/demo/src/main/java/demoapp/dom/error/ErrorDemo.layout.xml
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<bs3:grid
- xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/links http://isis.apache.org/applib/layout/links/links.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
- xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
- xmlns:cpt="http://isis.apache.org/applib/layout/component"
- xmlns:lnk="http://isis.apache.org/applib/layout/links"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject />
diff --git a/examples/demo/src/main/java/demoapp/dom/events/DemoEventSubscriber.java b/examples/demo/src/main/java/demoapp/dom/events/DemoEventSubscriber.java
index a57aa19..039cad9 100644
--- a/examples/demo/src/main/java/demoapp/dom/events/DemoEventSubscriber.java
+++ b/examples/demo/src/main/java/demoapp/dom/events/DemoEventSubscriber.java
@@ -31,12 +31,13 @@ import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
-import static demoapp.utils.DemoUtils.emphasize;
-
-import demoapp.dom.events.EventsDemo.UiButtonEvent;
import lombok.val;
import lombok.extern.log4j.Log4j2;
+import demoapp.dom.events.EventsDemo.UiButtonEvent;
+
+import static demoapp.utils.DemoUtils.emphasize;
+
@Service
@Named("demoapp.eventSubscriber")
@Qualifier("demo")
diff --git a/examples/demo/src/main/java/demoapp/dom/events/EventLogEntry.java b/examples/demo/src/main/java/demoapp/dom/events/EventLogEntry.java
index 802b756..5655162 100644
--- a/examples/demo/src/main/java/demoapp/dom/events/EventLogEntry.java
+++ b/examples/demo/src/main/java/demoapp/dom/events/EventLogEntry.java
@@ -29,11 +29,12 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Property;
-import demoapp.dom.events.EventsDemo.UiButtonEvent;
import lombok.Getter;
import lombok.Setter;
import lombok.val;
+import demoapp.dom.events.EventsDemo.UiButtonEvent;
+
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo" )
@DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
@DomainObject
diff --git a/examples/demo/src/main/java/demoapp/dom/events/EventsDemo.layout.xml b/examples/demo/src/main/java/demoapp/dom/events/EventsDemo.layout.xml
index c5e28b7..1d73f68 100644
--- a/examples/demo/src/main/java/demoapp/dom/events/EventsDemo.layout.xml
+++ b/examples/demo/src/main/java/demoapp/dom/events/EventsDemo.layout.xml
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/componenthttp://isis.apache.org/applib/layout/component/component.xsdhttp://isis.apache.org/applib/layout/linkshttp://isis.apache.org/applib/layout/links/links.xsdhttp://isis.apache.org/applib/layout/grid/bootstrap3http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:lnk="http:/ [...]
+<bs3:grid xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject/>
diff --git a/examples/demo/src/main/java/demoapp/dom/homepage/DemoHomePage.java b/examples/demo/src/main/java/demoapp/dom/homepage/DemoHomePage.java
index c8d803f..1205541 100644
--- a/examples/demo/src/main/java/demoapp/dom/homepage/DemoHomePage.java
+++ b/examples/demo/src/main/java/demoapp/dom/homepage/DemoHomePage.java
@@ -36,10 +36,11 @@ import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.util.JaxbAdapters.MarkupAdapter;
import org.apache.isis.applib.value.Markup;
-import demoapp.utils.DemoStub;
import lombok.Getter;
import lombok.Setter;
+import demoapp.utils.DemoStub;
+
@XmlRootElement(name = "Demo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/examples/demo/src/main/java/demoapp/dom/homepage/DemoHomePage.layout.xml b/examples/demo/src/main/java/demoapp/dom/homepage/DemoHomePage.layout.xml
index 09759d7..4d5efd6 100644
--- a/examples/demo/src/main/java/demoapp/dom/homepage/DemoHomePage.layout.xml
+++ b/examples/demo/src/main/java/demoapp/dom/homepage/DemoHomePage.layout.xml
@@ -1,10 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<bs3:grid
- xsi:schemaLocation="http://isis.apache.org/applib/layout/componenthttp://isis.apache.org/applib/layout/component/component.xsdhttp://isis.apache.org/applib/layout/linkshttp://isis.apache.org/applib/layout/links/links.xsdhttp://isis.apache.org/applib/layout/grid/bootstrap3http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
- xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
- xmlns:cpt="http://isis.apache.org/applib/layout/component"
- xmlns:lnk="http://isis.apache.org/applib/layout/links"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject />
diff --git a/examples/demo/src/main/java/demoapp/dom/jee/JeeDemo.layout.xml b/examples/demo/src/main/java/demoapp/dom/jee/JeeDemo.layout.xml
index d669ce1..c6b1952 100644
--- a/examples/demo/src/main/java/demoapp/dom/jee/JeeDemo.layout.xml
+++ b/examples/demo/src/main/java/demoapp/dom/jee/JeeDemo.layout.xml
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/componenthttp://isis.apache.org/applib/layout/component/component.xsdhttp://isis.apache.org/applib/layout/linkshttp://isis.apache.org/applib/layout/links/links.xsdhttp://isis.apache.org/applib/layout/grid/bootstrap3http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:lnk="http:/ [...]
+<bs3:grid xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject/>
diff --git a/examples/demo/src/main/java/demoapp/dom/tabs/TabDemo.java b/examples/demo/src/main/java/demoapp/dom/tabs/TabDemo.java
index db7b1b9..b93ce96 100644
--- a/examples/demo/src/main/java/demoapp/dom/tabs/TabDemo.java
+++ b/examples/demo/src/main/java/demoapp/dom/tabs/TabDemo.java
@@ -28,10 +28,11 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.Programmatic;
-import demoapp.utils.DemoStub;
import lombok.Getter;
import lombok.Setter;
+import demoapp.utils.DemoStub;
+
@XmlRootElement(name = "Demo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/examples/demo/src/main/java/demoapp/dom/tabs/TabDemo.layout.xml b/examples/demo/src/main/java/demoapp/dom/tabs/TabDemo.layout.xml
index 73fc9c9..f2d7194 100644
--- a/examples/demo/src/main/java/demoapp/dom/tabs/TabDemo.layout.xml
+++ b/examples/demo/src/main/java/demoapp/dom/tabs/TabDemo.layout.xml
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/componenthttp://isis.apache.org/applib/layout/component/component.xsdhttp://isis.apache.org/applib/layout/linkshttp://isis.apache.org/applib/layout/links/links.xsdhttp://isis.apache.org/applib/layout/grid/bootstrap3http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:lnk="http:/ [...]
+<bs3:grid xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject/>
diff --git a/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipDemo.java b/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipDemo.java
index 9fc0d2b..a442028 100644
--- a/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipDemo.java
+++ b/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipDemo.java
@@ -44,11 +44,12 @@ import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.value.Markup;
import org.apache.isis.incubator.model.applib.annotation.Model;
-import demoapp.dom.actions.assoc.DemoItem;
-import demoapp.utils.DemoStub;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom.actions.assoc.DemoItem;
+import demoapp.utils.DemoStub;
+
@XmlRootElement(name = "Demo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipDemo.layout.xml b/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipDemo.layout.xml
index 851d12b..7ca44da 100644
--- a/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipDemo.layout.xml
+++ b/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipDemo.layout.xml
@@ -1,10 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<bs3:grid
- xsi:schemaLocation="http://isis.apache.org/applib/layout/componenthttp://isis.apache.org/applib/layout/component/component.xsdhttp://isis.apache.org/applib/layout/linkshttp://isis.apache.org/applib/layout/links/links.xsdhttp://isis.apache.org/applib/layout/grid/bootstrap3http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
- xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
- xmlns:cpt="http://isis.apache.org/applib/layout/component"
- xmlns:lnk="http://isis.apache.org/applib/layout/links"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject />
diff --git a/examples/demo/src/main/java/demoapp/dom/tree/FileNode-File.svg b/examples/demo/src/main/java/demoapp/dom/tree/FileNode-File.svg
index 70ff5fc..b788c7f 100644
--- a/examples/demo/src/main/java/demoapp/dom/tree/FileNode-File.svg
+++ b/examples/demo/src/main/java/demoapp/dom/tree/FileNode-File.svg
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- viewBox="0 0 58 58" style="enable-background:new 0 0 58 58;" xml:space="preserve">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+ viewBox="0 0 58 58" style="enable-background:new 0 0 58 58;" xml:space="preserve">
<polygon style="fill:#EDEADA;" points="51.5,14 37.5,0 6.5,0 6.5,58 51.5,58 "/>
<g>
<path style="fill:#CEC9AE;" d="M16.5,23h25c0.552,0,1-0.447,1-1s-0.448-1-1-1h-25c-0.552,0-1,0.447-1,1S15.948,23,16.5,23z"/>
diff --git a/examples/demo/src/main/java/demoapp/dom/tree/FileNode-FileSystemRoot.svg b/examples/demo/src/main/java/demoapp/dom/tree/FileNode-FileSystemRoot.svg
index bca7ba1..5f1cdc9 100644
--- a/examples/demo/src/main/java/demoapp/dom/tree/FileNode-FileSystemRoot.svg
+++ b/examples/demo/src/main/java/demoapp/dom/tree/FileNode-FileSystemRoot.svg
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- viewBox="0 0 58 58" style="enable-background:new 0 0 58 58;" xml:space="preserve">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+ viewBox="0 0 58 58" style="enable-background:new 0 0 58 58;" xml:space="preserve">
<path style="fill:#EFCE4A;" d="M55.981,54.5H2.019C0.904,54.5,0,53.596,0,52.481V20.5h58v31.981C58,53.596,57.096,54.5,55.981,54.5z
"/>
<path style="fill:#EBBA16;" d="M26.019,11.5V5.519C26.019,4.404,25.115,3.5,24,3.5H2.019C0.904,3.5,0,4.404,0,5.519V10.5v10h58
diff --git a/examples/demo/src/main/java/demoapp/dom/tree/FileNode-Folder.svg b/examples/demo/src/main/java/demoapp/dom/tree/FileNode-Folder.svg
index 9aedff1..4c25f81 100644
--- a/examples/demo/src/main/java/demoapp/dom/tree/FileNode-Folder.svg
+++ b/examples/demo/src/main/java/demoapp/dom/tree/FileNode-Folder.svg
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- viewBox="0 0 58 58" style="enable-background:new 0 0 58 58;" xml:space="preserve">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+ viewBox="0 0 58 58" style="enable-background:new 0 0 58 58;" xml:space="preserve">
<path style="fill:#EFCE4A;" d="M46.324,52.5H1.565c-1.03,0-1.779-0.978-1.51-1.973l10.166-27.871
c0.184-0.682,0.803-1.156,1.51-1.156H56.49c1.03,0,1.51,0.984,1.51,1.973L47.834,51.344C47.65,52.026,47.031,52.5,46.324,52.5z"/>
<path style="fill:#F4EFDC;" d="M10.221,22.656c0.184-0.683,0.803-1.156,1.51-1.156H53v-7H9l-6,6v21.953L10.221,22.656z"/>
diff --git a/examples/demo/src/main/java/demoapp/dom/tree/TreeDemo.java b/examples/demo/src/main/java/demoapp/dom/tree/TreeDemo.java
index f68e413..06bef30 100644
--- a/examples/demo/src/main/java/demoapp/dom/tree/TreeDemo.java
+++ b/examples/demo/src/main/java/demoapp/dom/tree/TreeDemo.java
@@ -25,9 +25,10 @@ import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.tree.TreeNode;
import org.apache.isis.applib.tree.TreePath;
-import demoapp.utils.DemoStub;
import lombok.val;
+import demoapp.utils.DemoStub;
+
@DomainObject(nature = Nature.VIEW_MODEL, objectType = "demo.Tree")
public class TreeDemo extends DemoStub {
diff --git a/examples/demo/src/main/java/demoapp/dom/tree/TreeDemo.layout.xml b/examples/demo/src/main/java/demoapp/dom/tree/TreeDemo.layout.xml
index 4b04d5e..b2b9bbb 100644
--- a/examples/demo/src/main/java/demoapp/dom/tree/TreeDemo.layout.xml
+++ b/examples/demo/src/main/java/demoapp/dom/tree/TreeDemo.layout.xml
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/links http://isis.apache.org/applib/layout/links/links.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:lnk="h [...]
+<bs3:grid
+ xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject/>
diff --git a/examples/demo/src/main/java/demoapp/dom/tree/TreeDemoMenu.java b/examples/demo/src/main/java/demoapp/dom/tree/TreeDemoMenu.java
index d22ebee..67fd98b 100644
--- a/examples/demo/src/main/java/demoapp/dom/tree/TreeDemoMenu.java
+++ b/examples/demo/src/main/java/demoapp/dom/tree/TreeDemoMenu.java
@@ -27,9 +27,10 @@ import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.services.factory.FactoryService;
-import demoapp.utils.DemoStub;
import lombok.val;
+import demoapp.utils.DemoStub;
+
@DomainService(nature=NatureOfService.VIEW, objectType = "demo.TreeDemoMenu")
@DomainObjectLayout(named="Tree Demo")
public class TreeDemoMenu {
diff --git a/examples/demo/src/main/java/demoapp/dom/types/FeaturedTypesMenu.java b/examples/demo/src/main/java/demoapp/dom/types/FeaturedTypesMenu.java
index 172e52c..112bdec 100644
--- a/examples/demo/src/main/java/demoapp/dom/types/FeaturedTypesMenu.java
+++ b/examples/demo/src/main/java/demoapp/dom/types/FeaturedTypesMenu.java
@@ -27,11 +27,12 @@ import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.services.factory.FactoryService;
+import lombok.val;
+
import demoapp.dom.types.blob.BlobDemo;
import demoapp.dom.types.primitive.PrimitivesDemo;
import demoapp.dom.types.text.TextDemo;
import demoapp.dom.types.time.TemporalDemo;
-import lombok.val;
@DomainService(nature=NatureOfService.VIEW, objectType = "demo.FeaturedTypesMenu")
@DomainObjectLayout(named="Featured Types")
diff --git a/examples/demo/src/main/java/demoapp/dom/types/blob/BlobDemo.java b/examples/demo/src/main/java/demoapp/dom/types/blob/BlobDemo.java
index f957c5c..dbc9a54 100644
--- a/examples/demo/src/main/java/demoapp/dom/types/blob/BlobDemo.java
+++ b/examples/demo/src/main/java/demoapp/dom/types/blob/BlobDemo.java
@@ -34,12 +34,13 @@ import org.apache.isis.applib.value.Blob;
import org.apache.isis.commons.internal.base._Bytes;
import org.apache.isis.commons.internal.resources._Resources;
-import demoapp.utils.DemoStub;
import lombok.Getter;
import lombok.Setter;
import lombok.val;
import lombok.extern.log4j.Log4j2;
+import demoapp.utils.DemoStub;
+
@XmlRootElement(name = "Demo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/examples/demo/src/main/java/demoapp/dom/types/blob/BlobDemo.layout.xml b/examples/demo/src/main/java/demoapp/dom/types/blob/BlobDemo.layout.xml
index 035aee4..9c4036b 100644
--- a/examples/demo/src/main/java/demoapp/dom/types/blob/BlobDemo.layout.xml
+++ b/examples/demo/src/main/java/demoapp/dom/types/blob/BlobDemo.layout.xml
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/links http://isis.apache.org/applib/layout/links/links.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:lnk="h [...]
+<bs3:grid
+ xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject/>
diff --git a/examples/demo/src/main/java/demoapp/dom/types/primitive/PrimitivesDemo.java b/examples/demo/src/main/java/demoapp/dom/types/primitive/PrimitivesDemo.java
index b1282b3..90b98f0 100644
--- a/examples/demo/src/main/java/demoapp/dom/types/primitive/PrimitivesDemo.java
+++ b/examples/demo/src/main/java/demoapp/dom/types/primitive/PrimitivesDemo.java
@@ -33,11 +33,12 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.commons.internal.collections._Lists;
-import demoapp.utils.DemoStub;
import lombok.Getter;
import lombok.Setter;
import lombok.extern.log4j.Log4j2;
+import demoapp.utils.DemoStub;
+
@XmlRootElement(name = "Demo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/examples/demo/src/main/java/demoapp/dom/types/primitive/PrimitivesDemo.layout.xml b/examples/demo/src/main/java/demoapp/dom/types/primitive/PrimitivesDemo.layout.xml
index 165bb29..14d96b29 100644
--- a/examples/demo/src/main/java/demoapp/dom/types/primitive/PrimitivesDemo.layout.xml
+++ b/examples/demo/src/main/java/demoapp/dom/types/primitive/PrimitivesDemo.layout.xml
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<bs3:grid
- xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/links http://isis.apache.org/applib/layout/links/links.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
- xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
- xmlns:cpt="http://isis.apache.org/applib/layout/component"
- xmlns:lnk="http://isis.apache.org/applib/layout/links"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject />
diff --git a/examples/demo/src/main/java/demoapp/dom/types/text/TextDemo.java b/examples/demo/src/main/java/demoapp/dom/types/text/TextDemo.java
index bc07781..09d1c79 100644
--- a/examples/demo/src/main/java/demoapp/dom/types/text/TextDemo.java
+++ b/examples/demo/src/main/java/demoapp/dom/types/text/TextDemo.java
@@ -30,11 +30,12 @@ import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import demoapp.utils.DemoStub;
import lombok.Getter;
import lombok.Setter;
import lombok.extern.log4j.Log4j2;
+import demoapp.utils.DemoStub;
+
@XmlRootElement(name = "Demo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/examples/demo/src/main/java/demoapp/dom/types/text/TextDemo.layout.xml b/examples/demo/src/main/java/demoapp/dom/types/text/TextDemo.layout.xml
index bf4b283..f571b41 100644
--- a/examples/demo/src/main/java/demoapp/dom/types/text/TextDemo.layout.xml
+++ b/examples/demo/src/main/java/demoapp/dom/types/text/TextDemo.layout.xml
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/links http://isis.apache.org/applib/layout/links/links.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:lnk="h [...]
+<bs3:grid
+ xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject/>
diff --git a/examples/demo/src/main/java/demoapp/dom/types/time/TemporalDemo.java b/examples/demo/src/main/java/demoapp/dom/types/time/TemporalDemo.java
index 53dc90f..7aff9a2 100644
--- a/examples/demo/src/main/java/demoapp/dom/types/time/TemporalDemo.java
+++ b/examples/demo/src/main/java/demoapp/dom/types/time/TemporalDemo.java
@@ -42,11 +42,12 @@ import org.apache.isis.applib.util.JaxbAdapters.OffsetDateTimeAdapter;
import org.apache.isis.applib.util.JaxbAdapters.SqlDateAdapter;
import org.apache.isis.applib.util.JaxbAdapters.SqlTimestampAdapter;
-import demoapp.utils.DemoStub;
import lombok.Getter;
import lombok.Setter;
import lombok.extern.log4j.Log4j2;
+import demoapp.utils.DemoStub;
+
@XmlRootElement(name = "Demo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/examples/demo/src/main/java/demoapp/dom/types/time/TemporalDemo.layout.xml b/examples/demo/src/main/java/demoapp/dom/types/time/TemporalDemo.layout.xml
index d7a4971..4badb1c 100644
--- a/examples/demo/src/main/java/demoapp/dom/types/time/TemporalDemo.layout.xml
+++ b/examples/demo/src/main/java/demoapp/dom/types/time/TemporalDemo.layout.xml
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/links http://isis.apache.org/applib/layout/links/links.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:lnk="h [...]
+<bs3:grid
+ xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject/>
diff --git a/examples/demo/src/main/java/demoapp/utils/DemoStub.svg b/examples/demo/src/main/java/demoapp/utils/DemoStub.svg
index 891a739..7f31ff8 100644
--- a/examples/demo/src/main/java/demoapp/utils/DemoStub.svg
+++ b/examples/demo/src/main/java/demoapp/utils/DemoStub.svg
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- viewBox="0 0 511.999 511.999" style="enable-background:new 0 0 511.999 511.999;" xml:space="preserve">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+ viewBox="0 0 511.999 511.999" style="enable-background:new 0 0 511.999 511.999;" xml:space="preserve">
<path style="fill:#FC1A40;" d="M415.534,259.599l-48.6-17.701c-1.5-0.599-3.3-0.899-5.099-0.899h-311.4c-8.401,0-15,6.599-15,15v211
c0,24.899,20.099,45,45,45h300c24.901,0,45-20.101,45-45V273.698C425.435,267.399,421.534,261.699,415.534,259.599z"/>
<path style="fill:#C60034;" d="M425.435,273.698v193.301c0,24.899-20.099,45-45,45h-150v-271h131.4c1.8,0,3.6,0.3,5.099,0.899
diff --git a/examples/demo/src/main/java/demoapp/webapp/menubars.layout.xml b/examples/demo/src/main/java/demoapp/webapp/menubars.layout.xml
index 8de069d..447d8fa 100644
--- a/examples/demo/src/main/java/demoapp/webapp/menubars.layout.xml
+++ b/examples/demo/src/main/java/demoapp/webapp/menubars.layout.xml
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<mb3:menuBars xsi:schemaLocation="http://isis.apache.org/applib/layout/menubars/bootstrap3 http://isis.apache.org/applib/layout/menubars/bootstrap3/menubars.xsd http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/links http://isis.apache.org/applib/layout/links/links.xsd" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:lnk="http://isis.apache.org/applib/layout/links" xmlns:mb3="h [...]
+<mb3:menuBars
+ xsi:schemaLocation="http://isis.apache.org/applib/layout/menubars/bootstrap3 http://isis.apache.org/applib/layout/menubars/bootstrap3/menubars.xsd http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:mb3="http://isis.apache.org/applib/layout/menubars/bootstrap3"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<mb3:primary>
<mb3:menu>
<mb3:named>Featured Types</mb3:named>
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
index fa72a78..b87ad02 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
@@ -34,6 +34,9 @@ import org.springframework.test.context.TestPropertySource;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.support.TransactionTemplate;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import org.apache.isis.applib.services.audit.AuditerService;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.repository.RepositoryService;
@@ -48,9 +51,6 @@ import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import org.apache.isis.testdomain.jdo.Book;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/AutoConfigurationTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/AutoConfigurationTest.java
index e230773..9f847ca 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/AutoConfigurationTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/AutoConfigurationTest.java
@@ -29,12 +29,15 @@ import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Component;
import org.springframework.test.context.TestPropertySource;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring;
import org.apache.isis.config.beans.IsisBeanTypeRegistryHolder;
import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.metamodel.context.MetaModelContexts;
-//import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingStereotypes;
import org.apache.isis.testdomain.model.stereotypes.MyObject;
@@ -42,12 +45,10 @@ import org.apache.isis.testdomain.model.stereotypes.MyObject_mixin;
import org.apache.isis.testdomain.model.stereotypes.MyService;
import org.apache.isis.testdomain.model.stereotypes.MyView;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
import lombok.val;
+//import org.apache.isis.testdomain.Incubating;
+
@Smoketest
@SpringBootTest(
classes = {
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest.java
index f1a4a8b..f926438 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest.java
@@ -35,6 +35,9 @@ import org.springframework.test.annotation.Rollback;
import org.springframework.test.context.TestPropertySource;
import org.springframework.transaction.annotation.Transactional;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.testdomain.Smoketest;
@@ -43,9 +46,6 @@ import org.apache.isis.testdomain.jdo.Book;
import org.apache.isis.testdomain.jdo.Inventory;
import org.apache.isis.testdomain.jdo.Product;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import lombok.val;
@Smoketest
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
index 7a4a63a..0f7e346 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
@@ -25,6 +25,9 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.transaction.annotation.Transactional;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
@@ -33,9 +36,6 @@ import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import org.apache.isis.testdomain.jdo.Inventory;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import lombok.val;
@Smoketest
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java
index 4ef0824..0e6d120 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java
@@ -37,24 +37,25 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.springframework.test.context.TestPropertySource;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.runtime.services.message.MessageServiceDefault;
-//import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_headless;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import lombok.Getter;
import lombok.val;
+//import org.apache.isis.testdomain.Incubating;
+
@Smoketest
@SpringBootTest(
classes = {
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceProvisioningTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceProvisioningTest.java
index 3a3f1c8..fc7c5ec 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceProvisioningTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceProvisioningTest.java
@@ -31,23 +31,25 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.commons.internal.ioc.ManagedBeanAdapter;
import org.apache.isis.commons.internal.resources._Resources;
import org.apache.isis.config.presets.IsisPresets;
-//import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import static org.apache.isis.commons.internal.collections._Collections.toStringJoiningNewLine;
import static org.apache.isis.commons.internal.collections._Sets.intersectSorted;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
import lombok.val;
+//import org.apache.isis.testdomain.Incubating;
+
@Smoketest
@SpringBootTest(
classes = {
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperTest.java
index a6231b3..6b13d20 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperTest.java
@@ -33,6 +33,10 @@ import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Service;
import org.springframework.test.context.TestPropertySource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.isis.applib.events.domain.AbstractDomainEvent.Phase;
import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.services.repository.RepositoryService;
@@ -46,10 +50,6 @@ import org.apache.isis.testdomain.jdo.InventoryManager;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
import org.apache.isis.testdomain.jdo.Product;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import lombok.Getter;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/FooTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/FooTest.java
index 28de4cb..878c933 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/FooTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/FooTest.java
@@ -32,13 +32,13 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.TestPropertySource;
-import org.apache.isis.config.presets.IsisPresets;
-import org.apache.isis.testdomain.Smoketest;
-
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.testdomain.Smoketest;
+
@Smoketest
@SpringBootTest(
classes = {
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest.java
index 8e704bd..b9ac34e 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest.java
@@ -24,14 +24,14 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.IsisModuleConfig;
import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.testdomain.Smoketest;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
@Smoketest
@SpringBootTest(
classes = {
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest_usingHeadless.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest_usingHeadless.java
index 6ffdf0e..277438e 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest_usingHeadless.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest_usingHeadless.java
@@ -24,14 +24,14 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_headless;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
@Smoketest
@SpringBootTest(
classes = {
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/AnnotationSyntesizerTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/AnnotationSyntesizerTest.java
index bce8f3c..9c288f4 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/AnnotationSyntesizerTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/AnnotationSyntesizerTest.java
@@ -25,6 +25,9 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
import org.springframework.util.ReflectionUtils;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.events.domain.ActionDomainEvent;
import org.apache.isis.applib.services.jaxb.JaxbService;
@@ -38,9 +41,6 @@ import org.apache.isis.testdomain.model.bad.Configuration_usingInvalidDomain;
import org.apache.isis.testdomain.model.bad.InvalidPropertyAnnotationOnAction;
import org.apache.isis.testdomain.model.good.Configuration_usingValidDomain;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.fail;
-
import lombok.val;
@Smoketest
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
index 450b2c3..ff8c2db 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
@@ -25,6 +25,9 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.metamodel.specloader.IntrospectionMode;
@@ -41,9 +44,6 @@ import org.apache.isis.testdomain.model.bad.InvalidOrphanedCollectionSupport;
import org.apache.isis.testdomain.model.bad.InvalidOrphanedPropertySupport;
import org.apache.isis.testdomain.model.bad.InvalidPropertyAnnotationOnAction;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import lombok.val;
@Smoketest
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain_noActionEnforced.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain_noActionEnforced.java
index bd9d78c..c043f29 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain_noActionEnforced.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain_noActionEnforced.java
@@ -24,6 +24,10 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.metamodel.specloader.IntrospectionMode;
@@ -36,10 +40,6 @@ import org.apache.isis.testdomain.conf.Configuration_headless;
import org.apache.isis.testdomain.model.badnoact.Configuration_usingInvalidDomain_noActionEnforced;
import org.apache.isis.testdomain.model.badnoact.InvalidOrphanedActionSupportNoActionEnforced;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import lombok.val;
@Smoketest
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
index 4d6cecf..ca76cec 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
@@ -24,6 +24,11 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.services.metamodel.MetaModelService;
import org.apache.isis.config.presets.IsisPresets;
@@ -37,11 +42,6 @@ import org.apache.isis.testdomain.jdo.Product;
import org.apache.isis.testdomain.model.good.Configuration_usingValidDomain;
import org.apache.isis.testdomain.model.good.ProperMemberSupport;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
import lombok.val;
@Smoketest
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/SpecloaderPerformanceTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/SpecloaderPerformanceTest.java
index cad8a4a..74aef35 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/SpecloaderPerformanceTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/SpecloaderPerformanceTest.java
@@ -25,6 +25,8 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
+import static org.junit.jupiter.api.Assertions.fail;
+
import org.apache.isis.commons.internal.base._Timing;
import org.apache.isis.commons.internal.reflection._Annotations;
import org.apache.isis.config.IsisConfiguration;
@@ -35,8 +37,6 @@ import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_headless;
import org.apache.isis.testdomain.model.good.Configuration_usingValidDomain;
-import static org.junit.jupiter.api.Assertions.fail;
-
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/eventhandling/GenericEventPublishingTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/eventhandling/GenericEventPublishingTest.java
index 8f2c777..bd4afe0 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/eventhandling/GenericEventPublishingTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/eventhandling/GenericEventPublishingTest.java
@@ -27,11 +27,11 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Service;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.isis.applib.services.eventbus.EventBusService;
import org.apache.isis.runtime.services.eventbus.EventBusServiceSpring;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import lombok.Getter;
import lombok.Value;
import lombok.val;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/eventhandling/SpringEventPublishingTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/eventhandling/SpringEventPublishingTest.java
index 53e3ee4..8e63bf8 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/eventhandling/SpringEventPublishingTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/eventhandling/SpringEventPublishingTest.java
@@ -29,10 +29,10 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Service;
-import org.apache.isis.commons.internal.ioc.spring._Spring;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.apache.isis.commons.internal.ioc.spring._Spring;
+
import lombok.Getter;
import lombok.Value;
import lombok.val;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/ldap/LdapEmbeddedServerTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/ldap/LdapEmbeddedServerTest.java
index 2d62e0a..4ad18f5 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/ldap/LdapEmbeddedServerTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/ldap/LdapEmbeddedServerTest.java
@@ -30,12 +30,12 @@ import org.junit.runners.model.InitializationError;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
-import org.apache.isis.config.presets.IsisPresets;
-import org.apache.isis.testdomain.Smoketest;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
+import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.testdomain.Smoketest;
+
import lombok.val;
@Smoketest
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/logging/LoggerSetupTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/logging/LoggerSetupTest.java
index d563810..706ea46 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/logging/LoggerSetupTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/logging/LoggerSetupTest.java
@@ -25,10 +25,10 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.TestPropertySource;
-import org.apache.isis.config.presets.IsisPresets;
-
import static org.junit.jupiter.api.Assertions.assertFalse;
+import org.apache.isis.config.presets.IsisPresets;
+
import lombok.val;
@SpringBootTest(
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java
index 857a7a2..d7d322a 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java
@@ -37,6 +37,9 @@ import org.springframework.test.context.TestPropertySource;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.support.TransactionTemplate;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import org.apache.isis.applib.services.iactn.Interaction.Execution;
import org.apache.isis.applib.services.publish.PublishedObjects;
import org.apache.isis.applib.services.publish.PublisherService;
@@ -52,9 +55,6 @@ import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import org.apache.isis.testdomain.jdo.Book;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
import lombok.Getter;
import lombok.val;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java
index 91a88fa..dbc5791 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java
@@ -27,16 +27,16 @@ import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.context.annotation.Import;
import org.springframework.test.context.TestPropertySource;
-import org.apache.isis.config.presets.IsisPresets;
-import org.apache.isis.testdomain.conf.Configuration_usingJdo;
-import org.apache.isis.testdomain.jdo.Book;
-import org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.IsisModuleRestfulObjectsJaxrsResteasy4;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
+import org.apache.isis.config.presets.IsisPresets;
+import org.apache.isis.testdomain.conf.Configuration_usingJdo;
+import org.apache.isis.testdomain.jdo.Book;
+import org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.IsisModuleRestfulObjectsJaxrsResteasy4;
+
import lombok.val;
@SpringBootTest(
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroLdapTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroLdapTest.java
index 5b7cc14..208faaa 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroLdapTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroLdapTest.java
@@ -31,6 +31,11 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Import;
import org.springframework.test.context.TestPropertySource;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.testdomain.Incubating;
@@ -39,11 +44,6 @@ import org.apache.isis.testdomain.conf.Configuration_usingJdoAndShiro;
import org.apache.isis.testdomain.ldap.LdapConstants;
import org.apache.isis.testdomain.ldap.LdapServerService;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
index 846cbfd..2fe5bd1 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
@@ -31,6 +31,12 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Import;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
@@ -47,12 +53,6 @@ import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
import org.apache.isis.testdomain.ldap.LdapConstants;
import org.apache.isis.testdomain.ldap.LdapServerService;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
import lombok.val;
@Smoketest
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
index 0964153..a424dc6 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
@@ -18,6 +18,8 @@
*/
package org.apache.isis.testdomain.shiro;
+import static java.time.Duration.ofMillis;
+
import javax.inject.Inject;
import org.junit.jupiter.api.AfterEach;
@@ -27,6 +29,11 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Import;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTimeout;
+import static org.junit.jupiter.api.Assertions.fail;
+
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
@@ -46,12 +53,6 @@ import org.apache.isis.testdomain.ldap.LdapServerService;
import org.apache.isis.testdomain.rest.RestEndpointService;
import org.apache.isis.viewer.restfulobjects.viewer.IsisModuleRestfulObjectsViewer;
-import static java.time.Duration.ofMillis;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTimeout;
-import static org.junit.jupiter.api.Assertions.fail;
-
import lombok.val;
@Smoketest
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java
index 8297ed8..bc03993 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java
@@ -31,6 +31,11 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Import;
import org.springframework.test.context.TestPropertySource;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
@@ -42,11 +47,6 @@ import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdoAndShiro;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
import lombok.val;
@Smoketest
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSimpleTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSimpleTest.java
index fe0d0f7..afccd2d 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSimpleTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSimpleTest.java
@@ -29,13 +29,13 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.testdomain.Smoketest;
-
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import org.apache.isis.applib.services.inject.ServiceInjector;
+import org.apache.isis.testdomain.Smoketest;
+
import lombok.val;
@Smoketest
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/timestamping/TimestampingTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/timestamping/TimestampingTest.java
index bb7adfb..88ebe68 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/timestamping/TimestampingTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/timestamping/TimestampingTest.java
@@ -25,6 +25,8 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.transaction.annotation.Transactional;
+import static org.junit.Assert.assertNotNull;
+
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
import org.apache.isis.testdomain.Smoketest;
@@ -33,8 +35,6 @@ import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
import org.apache.isis.testdomain.jdo.Product;
import org.apache.isis.testdomain.jdo.ProductComment;
-import static org.junit.Assert.assertNotNull;
-
import lombok.val;
@Smoketest
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java
index 2a2fd4b..1fc15e8 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java
@@ -25,6 +25,9 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.commons.internal.exceptions._Exceptions;
@@ -35,9 +38,6 @@ import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import org.apache.isis.testdomain.jdo.Book;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
@Smoketest
@SpringBootTest(
classes = {
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java
index b7e3bc0..90ac093 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java
@@ -29,6 +29,8 @@ import org.springframework.test.annotation.Commit;
import org.springframework.test.context.TestPropertySource;
import org.springframework.transaction.annotation.Transactional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
@@ -37,8 +39,6 @@ import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import org.apache.isis.testdomain.jdo.Book;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
/**
* These tests use the {@code @Transactional} annotation as provided by Spring.
* <p>
diff --git a/incubator/core/microprofile/src/main/java/org/apache/isis/runtime/jee_support/IsisCDIBeanScanInterceptor.java b/incubator/core/microprofile/src/main/java/org/apache/isis/runtime/jee_support/IsisCDIBeanScanInterceptor.java
index cebb542..4e3d607 100644
--- a/incubator/core/microprofile/src/main/java/org/apache/isis/runtime/jee_support/IsisCDIBeanScanInterceptor.java
+++ b/incubator/core/microprofile/src/main/java/org/apache/isis/runtime/jee_support/IsisCDIBeanScanInterceptor.java
@@ -32,8 +32,8 @@ import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
import org.apache.isis.applib.services.metrics.MetricsService;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
*
diff --git a/legacy/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolSupport.java b/legacy/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolSupport.java
index f0e8353..9c3006b 100644
--- a/legacy/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolSupport.java
+++ b/legacy/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolSupport.java
@@ -37,15 +37,16 @@ import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
+import static java.util.stream.Collectors.toList;
+
import javax.annotation.Nullable;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import static java.util.Collections.emptyList;
-import static java.util.Collections.singletonList;
-import static java.util.stream.Collectors.toList;
import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
import static org.apache.isis.commons.internal.base._With.requires;
diff --git a/legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/ColorValueSemanticsProviderTest.java b/legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/ColorValueSemanticsProviderTest.java
index b106b7c..6bd1053 100644
--- a/legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/ColorValueSemanticsProviderTest.java
+++ b/legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/ColorValueSemanticsProviderTest.java
@@ -22,6 +22,9 @@ package org.apache.isis.legacy.metamodel.facets.value;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
import org.apache.isis.legacy.applib.value.Color;
import org.apache.isis.legacy.metamodel.facets.value.color.ColorValueSemanticsProvider;
import org.apache.isis.metamodel.facetapi.FacetHolder;
@@ -29,9 +32,6 @@ import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.metamodel.facets.value.ValueSemanticsProviderAbstractTestCase;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
public class ColorValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
private ColorValueSemanticsProvider value;
diff --git a/legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/MoneyValueSemanticsProviderTest.java b/legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/MoneyValueSemanticsProviderTest.java
index efff2e2..9a7511c 100644
--- a/legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/MoneyValueSemanticsProviderTest.java
+++ b/legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/MoneyValueSemanticsProviderTest.java
@@ -24,6 +24,9 @@ import java.util.Locale;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
import org.apache.isis.legacy.applib.value.Money;
import org.apache.isis.legacy.metamodel.facets.value.money.MoneyValueSemanticsProvider;
import org.apache.isis.metamodel.context.MetaModelContextAware;
@@ -32,9 +35,6 @@ import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.metamodel.facets.value.ValueSemanticsProviderAbstractTestCase;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
public class MoneyValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
private static final String POUND_SYMBOL = "\u00A3";
diff --git a/legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PercentageValueSemanticsProviderTest.java b/legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PercentageValueSemanticsProviderTest.java
index 17bc81e..e468bcc 100644
--- a/legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PercentageValueSemanticsProviderTest.java
+++ b/legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PercentageValueSemanticsProviderTest.java
@@ -22,6 +22,8 @@ package org.apache.isis.legacy.metamodel.facets.value;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
import org.apache.isis.legacy.applib.value.Percentage;
import org.apache.isis.legacy.metamodel.facets.value.percentage.PercentageValueSemanticsProvider;
import org.apache.isis.metamodel.context.MetaModelContextAware;
@@ -30,8 +32,6 @@ import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.metamodel.facets.value.ValueSemanticsProviderAbstractTestCase;
import org.apache.isis.unittestsupport.config.internal._Config;
-import static org.junit.Assert.assertEquals;
-
public class PercentageValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
private PercentageValueSemanticsProvider adapter;
private Percentage percentage;
diff --git a/legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PolishMoneyValueSemanticsProviderTest.java b/legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PolishMoneyValueSemanticsProviderTest.java
index e3cf50b..c6d592f 100644
--- a/legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PolishMoneyValueSemanticsProviderTest.java
+++ b/legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PolishMoneyValueSemanticsProviderTest.java
@@ -25,6 +25,9 @@ import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
import org.apache.isis.legacy.applib.value.Money;
import org.apache.isis.legacy.metamodel.facets.value.money.MoneyValueSemanticsProvider;
import org.apache.isis.metamodel.context.MetaModelContextAware;
@@ -33,9 +36,6 @@ import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.metamodel.facets.value.ValueSemanticsProviderAbstractTestCase;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
@Ignore
// TODO once the semantics provider has a way to reset the formatters for the new
// local then this test can be reinstated.
diff --git a/legacy/vro/restclient/src/main/java/org/apache/isis/legacy/restclient/RestEasyLegacy.java b/legacy/vro/restclient/src/main/java/org/apache/isis/legacy/restclient/RestEasyLegacy.java
index 893d77b..383e83b 100644
--- a/legacy/vro/restclient/src/main/java/org/apache/isis/legacy/restclient/RestEasyLegacy.java
+++ b/legacy/vro/restclient/src/main/java/org/apache/isis/legacy/restclient/RestEasyLegacy.java
@@ -22,7 +22,6 @@ import java.lang.reflect.Method;
import javax.ws.rs.NotSupportedException;
import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.Response;
/**
* Compatibility layer, legacy of deprecated resteasy client API.