You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/05/01 06:36:18 UTC
[isis] branch master updated: ISIS-2297: batch organize imports on
meta-model module
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 5cf7c0d ISIS-2297: batch organize imports on meta-model module
5cf7c0d is described below
commit 5cf7c0d1219db2003920d272a6ef952bb08cb2ff
Author: ahuber@apache.org <ah...@luna>
AuthorDate: Sat May 1 08:36:05 2021 +0200
ISIS-2297: batch organize imports on meta-model module
---
.../metamodel/_testing/MetaModelContext_forTesting.java | 4 ++--
.../core/metamodel/commons/CanonicalParameterUtil.java | 4 ++--
.../apache/isis/core/metamodel/commons/ClassUtil.java | 6 +++---
.../isis/core/metamodel/commons/ListExtensions.java | 4 ++--
.../org/apache/isis/core/metamodel/consent/Veto.java | 4 ++--
.../isis/core/metamodel/facetapi/FacetAbstract.java | 4 ++--
.../isis/core/metamodel/facetapi/FacetHolderImpl.java | 4 ++--
.../isis/core/metamodel/facets/DomainEventHelper.java | 10 +++++-----
.../annotation/HomePageFacetAnnotationFactory.java | 4 ++--
.../metamodel/facets/collections/CollectionFacet.java | 4 ++--
.../collections/javautilcollection/JavaArrayFacet.java | 4 ++--
.../SortedByFacetForCollectionLayoutAnnotation.java | 4 ++--
.../layout/SortedByFacetForCollectionXml.java | 4 ++--
.../core/metamodel/facets/jaxb/JaxbFacetFactory.java | 6 +++---
.../domainobject/DomainObjectAnnotationFacetFactory.java | 4 ++--
.../annotation/RemoveAnnotatedMethodsFacetFactory.java | 4 ++--
.../object/mixin/MetaModelValidatorForMixinTypes.java | 4 ++--
.../mixin/MixinFacetForDomainObjectAnnotation.java | 4 ++--
.../metamodel/facets/object/parseable/ParserUtil.java | 4 ++--
.../title/methods/TitleFacetViaMethodsFactory.java | 6 +++---
.../object/value/vsp/ValueSemanticsProviderUtil.java | 4 ++--
...PropertySetterOrClearFacetForDomainEventAbstract.java | 4 ++--
.../isis/core/metamodel/methods/MethodFinderUtils.java | 4 ++--
.../all/i18n/TranslationPostProcessor.java | 4 ----
.../metamodel/progmodel/ProgrammingModelInitFilter.java | 4 ++--
.../progmodel/ProgrammingModelInitFilterDefault.java | 6 +++---
.../progmodels/dflt/ProgrammingModelFacetsJava8.java | 16 ++++++++--------
.../services/grid/GridSystemServiceAbstract.java | 4 ++--
.../services/grid/bootstrap3/GridSystemServiceBS3.java | 4 ++--
.../isis/core/metamodel/spec/feature/ObjectAction.java | 4 ++--
.../core/metamodel/specloader/SpecificationLoader.java | 6 +++---
.../specimpl/ObjectActionParameterAbstract.java | 4 ++--
.../specloader/specimpl/ObjectSpecificationAbstract.java | 4 ++--
.../specimpl/dflt/ObjectSpecificationDefault.java | 4 ++--
.../specloader/validator/ValidationFailure.java | 6 +++---
.../isis/core/metamodel/MetaModelContext_configTest.java | 4 ++--
.../isis/core/metamodel/commons/IoUtils_CopyTest.java | 4 ++--
.../metamodel/commons/JavaClassUtilsTest_getBuiltIn.java | 4 ++--
.../core/metamodel/commons/ListUtilsTest_adjust.java | 8 ++++----
.../core/metamodel/commons/ListUtilsTest_insert.java | 8 ++++----
.../metamodel/commons/ListUtilsTest_mutableCopy.java | 10 +++++-----
.../isis/core/metamodel/commons/LocaleUtilsTest.java | 4 ++--
.../metamodel/commons/StringUtilsTest_enumTitle.java | 4 ++--
.../metamodel/commons/StringUtils_NaturalNameTest.java | 4 ++--
.../metamodel/commons/StringUtils_NaturalizeTest.java | 4 ++--
.../metamodel/commons/StringUtils_NormalizedTest.java | 6 +++---
.../commons/StringUtils_StripLeadingSlashTest.java | 4 ++--
.../metamodel/commons/StringUtils_StripNewLinesTest.java | 4 ++--
.../metamodel/commons/StringUtils_camelLowerFirst.java | 4 ++--
.../metamodel/commons/StringUtils_toLineSeparated.java | 4 ++--
.../metamodel/commons/StringUtils_toLowerDashed.java | 4 ++--
.../core/metamodel/commons/TypesTest_filteredList.java | 6 +++---
.../matchers/IsisMatchers_NonEmptyStringTest.java | 6 +++---
.../core/metamodel/consent/InteractionResultTest.java | 8 ++++----
.../facetapi/FeatureTypeTest_identifierFor.java | 6 +++---
.../isis/core/metamodel/facets/AnnotationsTest.java | 8 ++++----
.../facets/Annotations_getAnnotations_on_Class_Test.java | 8 ++++----
.../facets/Annotations_getAnnotations_on_Field_Test.java | 6 +++---
.../Annotations_getAnnotations_on_Method_Test.java | 6 +++---
.../Annotations_getAnnotations_on_Parameter_Test.java | 6 +++---
.../core/metamodel/facets/CollectionFacetUtilsTest.java | 10 +++++-----
.../DomainEventHelperTest_newActionInteractionEvent.java | 7 +++----
...nEventHelperTest_newCollectionDomainEvent_forAdd.java | 8 ++++----
...entHelperTest_newCollectionDomainEvent_forRemove.java | 8 ++++----
...nEventHelperTest_newPropertyDomainEvent_forClear.java | 11 +++++------
...EventHelperTest_newPropertyDomainEvent_forModify.java | 6 +++---
.../core/metamodel/facets/MethodFinderUtilsTest.java | 10 +++++-----
.../core/metamodel/facets/ObjectAdapterUtilsTest.java | 6 +++---
.../action/ActionAnnotationFacetFactoryTest_Hidden.java | 6 +++---
.../ActionAnnotationFacetFactoryTest_Invocation.java | 7 +++----
.../ActionAnnotationFacetFactoryTest_RestrictTo.java | 4 ++--
.../ActionAnnotationFacetFactoryTest_Semantics.java | 6 +++---
.../action/ActionAnnotationFacetFactoryTest_TypeOf.java | 7 +++----
...tionAnnotationFacetFactoryTest_commandPublishing.java | 8 ++++----
...onAnnotationFacetFactoryTest_executionPublishing.java | 8 ++++----
.../ActionLayoutXmlLayoutAnnotationFacetFactoryTest.java | 12 ++++++------
...enuFacetDerivedFromDomainServiceFacetFactoryTest.java | 8 ++++----
.../actions/prototype/PrototypeFacetAbstractTest.java | 4 ++--
.../facets/collections/JavaCollectionFacetTest.java | 6 +++---
.../collection/CollectionAnnotationFacetFactoryTest.java | 15 +++------------
...medFacetForCollectionLayoutAnnotationFactoryTest.java | 8 ++++----
.../members/cssclassfa/CssClassFaFacetAbstractTest.java | 4 ++--
.../ViewModelSemanticCheckingFacetFactoryTest.java | 8 ++++----
.../DomainObjectAnnotationFacetFactoryTest.java | 10 +++++-----
.../ObjectTypeAnnotationFacetFactoryTest.java | 6 +++---
.../DomainObjectLayoutFactoryTest.java | 14 +++++++-------
.../annotation/DomainServiceLayoutFacetFactoryTest.java | 4 ++--
.../ident/cssclass/CssClassFacetMethodFactoryTest.java | 4 ++--
.../object/ident/cssclass/CssClassFacetMethodTest.java | 8 ++++----
.../cssclass/CssClassFacetMethodWithProblemTest.java | 8 ++++----
.../object/ident/icon/IconFacetMethodFactoryTest.java | 4 ++--
.../facets/object/ident/icon/IconFacetMethodTest.java | 8 ++++----
.../object/ident/layout/LayoutFacetFactoryTest.java | 4 ++--
.../object/ident/layout/LayoutFacetMethodTest.java | 8 ++++----
.../object/ident/title/TitleFacetViaMethodTest.java | 6 +++---
.../annotation/TitleAnnotationFacetFactoryTest.java | 6 +++---
.../annotation/TitleFacetViaTitleAnnotationTest.java | 6 +++---
.../facets/object/layoutxml/GridFacetDefaultTest.java | 8 ++++----
.../metamodel/facets/object/mixin/MixinIntendedAs.java | 4 ++--
.../facets/object/mixin/MixinIntendedAsActionTest.java | 8 ++++----
.../object/navparent/NavigableParentFacetMethodTest.java | 8 ++++----
...ObjectSpecIdFacetDerivedFromClassNameFactoryTest.java | 8 ++++----
...elAtFacetForParameterLayoutAnnotationFactoryTest.java | 4 ++--
...amedFacetForParameterLayoutAnnotationFactoryTest.java | 4 ++--
.../facets/param/name/ParameterNameFacetTest.java | 6 +++---
.../parameter/ParameterAnnotationFacetFactoryTest.java | 8 ++++----
.../PromptStyleFacetFromPropertyAnnotation_Test.java | 6 +++---
.../DisabledAnnotationOnPropertyFacetFactoryTest.java | 4 ++--
...NotPersistedAnnotationOnPropertyFacetFactoryTest.java | 2 +-
.../property/PropertyAnnotationFacetFactoryTest.java | 10 +++++-----
.../propparam/specification/SpecificationAndTests.java | 4 ++--
.../propparam/specification/SpecificationNotTests.java | 4 ++--
.../propparam/specification/SpecificationOrTests.java | 4 ++--
.../value/BigDecimalValueSemanticsProviderTest.java | 6 +++---
.../facets/value/BigIntValueSemanticsProviderTest.java | 6 +++---
.../facets/value/BlobValueSemanticsProviderTest.java | 6 +++---
.../facets/value/BooleanValueSemanticsProviderTest.java | 6 +++---
.../facets/value/ByteValueSemanticsProviderTest.java | 6 +++---
.../value/CharacterValueSemanticsProviderTest.java | 6 +++---
.../facets/value/ClobValueSemanticsProviderTest.java | 6 +++---
.../facets/value/DoubleValueSemanticsProviderTest.java | 6 +++---
.../facets/value/FloatValueSemanticsProviderTest.java | 6 +++---
.../facets/value/IntValueSemanticsProviderTest.java | 6 +++---
.../value/JavaSqlDateValueSemanticsProviderTest.java | 6 +++---
.../value/JavaSqlTimeValueSemanticsProviderTest.java | 4 ++--
.../value/JavaUtilDateValueSemanticsProviderTest.java | 6 +++---
.../facets/value/LongValueSemanticsProviderTest.java | 6 +++---
.../facets/value/PasswordValueSemanticsProviderTest.java | 4 ++--
.../facets/value/ShortValueSemanticsProviderTest.java | 6 +++---
.../facets/value/StringValueSemanticsProviderTest.java | 4 ++--
.../value/ValueSemanticsProviderAbstractTestCase.java | 14 +++++++-------
.../JodaLocalDateTimeValueSemanticsProviderTest.java | 8 ++++----
.../facets/value/temporal/TemporalAdjustTest.java | 6 +++---
.../ObjectAssociationPredicatesTest_visibleWhere.java | 6 +++---
.../interactions/InteractionUtils_isA_Test.java | 3 +--
.../objects/ObjectActionLayoutXmlDefaultTest.java | 10 +++++-----
.../objects/OneToManyAssociationDefaultTest.java | 10 ++++------
.../metamodel/objects/TypeExtractorMethodReturnTest.java | 6 +++---
.../objects/TypeExtractorMethodsParametersTest.java | 6 +++---
.../services/ServiceInjectorDefaultTest_usingFields.java | 6 +++---
.../ServiceInjectorDefaultTest_validateServices.java | 6 +++---
...erviceInjectorDefaultTest_validateServices_happy.java | 4 ++--
.../services/appfeat/ApplicationFeatureIdTest.java | 16 ++++++++--------
.../appfeat/ApplicationFeatureRepositoryDefaultTest.java | 14 +++++++-------
.../services/appfeat/ApplicationFeatureTest.java | 8 ++++----
.../services/appfeat/ApplicationFeatureTypeTest.java | 8 ++++----
...ecognizerForRecoverableException_recognizes_Test.java | 6 +++---
.../isis/core/metamodel/services/grid/BS3GridTest.java | 9 ++++-----
.../GridLoaderServiceDefault_resourceNameFor_Test.java | 6 +++---
.../services/title/TitleServiceDefaultTest.java | 6 +++---
.../specloader/SpecificationCacheDefaultTest.java | 10 +++++-----
.../specloader/SpecificationLoaderTestAbstract.java | 10 +++++-----
.../specloader/SpecificationLoaderTest_array.java | 4 ++--
.../specloader/SpecificationLoaderTest_collection.java | 8 ++++----
.../specloader/SpecificationLoaderTest_value.java | 4 ++--
.../classsubstitutor/ClassSubstitutorTest_getClass.java | 4 ++--
.../specimpl/IntrospectionState_comparable_Test.java | 6 +++---
.../specloader/specimpl/ObjectActionMixedInTest.java | 4 ++--
...ectActionParameterAbstractTest_getId_and_getName.java | 6 +++---
.../specimpl/ObjectAssociationAbstractTest.java | 6 +++---
.../ObjectAssociationAbstractTest_alwaysHidden.java | 10 +++++-----
.../specloader/specimpl/ObjectMemberAbstractTest.java | 4 ++--
.../specimpl/OneToOneAssociationAbstractTest.java | 6 +++---
163 files changed, 495 insertions(+), 516 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/_testing/MetaModelContext_forTesting.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/_testing/MetaModelContext_forTesting.java
index 42a6927..1ec3924 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/_testing/MetaModelContext_forTesting.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/_testing/MetaModelContext_forTesting.java
@@ -18,13 +18,13 @@
*/
package org.apache.isis.core.metamodel._testing;
+import static java.util.Objects.requireNonNull;
+
import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
import java.util.stream.Stream;
-import static java.util.Objects.requireNonNull;
-
import org.springframework.core.env.AbstractEnvironment;
import org.apache.isis.applib.services.factory.FactoryService;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/CanonicalParameterUtil.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/CanonicalParameterUtil.java
index f5c9f62..3ee56d8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/CanonicalParameterUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/CanonicalParameterUtil.java
@@ -19,6 +19,8 @@
package org.apache.isis.core.metamodel.commons;
+import static org.apache.isis.commons.internal.base._NullSafe.isEmpty;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.Executable;
import java.lang.reflect.InvocationTargetException;
@@ -36,8 +38,6 @@ import org.apache.isis.commons.internal.collections._Arrays;
import org.apache.isis.commons.internal.collections._Collections;
import org.apache.isis.commons.internal.reflection._Reflect;
-import static org.apache.isis.commons.internal.base._NullSafe.isEmpty;
-
import lombok.NonNull;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ClassUtil.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ClassUtil.java
index d0da717..99c5034 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ClassUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ClassUtil.java
@@ -19,6 +19,9 @@
package org.apache.isis.core.metamodel.commons;
+import static org.apache.isis.commons.internal.base._With.requires;
+import static org.apache.isis.commons.internal.base._With.requiresNotEmpty;
+
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
@@ -29,9 +32,6 @@ import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import static org.apache.isis.commons.internal.base._With.requires;
-import static org.apache.isis.commons.internal.base._With.requiresNotEmpty;
-
import lombok.val;
public final class ClassUtil {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ListExtensions.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ListExtensions.java
index df27a27..425d4ca 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ListExtensions.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ListExtensions.java
@@ -19,6 +19,8 @@
package org.apache.isis.core.metamodel.commons;
+import static org.apache.isis.commons.internal.base._NullSafe.stream;
+
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
@@ -27,8 +29,6 @@ import java.util.stream.Collectors;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.collections._Lists;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-
public final class ListExtensions {
private static final String DEFAULT_DELIMITER = ",";
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Veto.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Veto.java
index 0620b89..9c50fa6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Veto.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Veto.java
@@ -19,10 +19,10 @@
package org.apache.isis.core.metamodel.consent;
-import org.apache.isis.core.metamodel.facetapi.Facet;
-
import static org.apache.isis.commons.internal.base._With.requiresNotEmpty;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+
public class Veto extends ConsentAbstract {
private static final long serialVersionUID = 1L;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetAbstract.java
index 88e7931..af7f9ee 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetAbstract.java
@@ -19,6 +19,8 @@
package org.apache.isis.core.metamodel.facetapi;
+import static org.apache.isis.commons.internal.base._With.requires;
+
import java.util.Map;
import java.util.Objects;
import java.util.Set;
@@ -29,8 +31,6 @@ import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.metamodel.context.HasMetaModelContext;
import org.apache.isis.core.metamodel.context.MetaModelContext;
-import static org.apache.isis.commons.internal.base._With.requires;
-
import lombok.Setter;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolderImpl.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolderImpl.java
index b810dd7..f4c5fe6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolderImpl.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolderImpl.java
@@ -19,6 +19,8 @@
package org.apache.isis.core.metamodel.facetapi;
+import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+
import java.util.HashMap;
import java.util.Map;
import java.util.stream.Stream;
@@ -30,8 +32,6 @@ import org.apache.isis.commons.internal.collections._Maps.AliasMap;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.context.MetaModelContextAware;
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
-
import lombok.Getter;
import lombok.Setter;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DomainEventHelper.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DomainEventHelper.java
index 2eb6e2c..f897f6d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DomainEventHelper.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DomainEventHelper.java
@@ -19,6 +19,11 @@
package org.apache.isis.core.metamodel.facets;
+import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+import static org.apache.isis.commons.internal.reflection._Reflect.Filter.paramAssignableFrom;
+import static org.apache.isis.commons.internal.reflection._Reflect.Filter.paramAssignableFromValue;
+import static org.apache.isis.commons.internal.reflection._Reflect.Filter.paramCount;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.util.Arrays;
@@ -46,11 +51,6 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
-import static org.apache.isis.commons.internal.reflection._Reflect.Filter.paramAssignableFrom;
-import static org.apache.isis.commons.internal.reflection._Reflect.Filter.paramAssignableFromValue;
-import static org.apache.isis.commons.internal.reflection._Reflect.Filter.paramCount;
-
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotationFactory.java
index 45328e2..bb1b388 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotationFactory.java
@@ -19,6 +19,8 @@
package org.apache.isis.core.metamodel.facets.actions.homepage.annotation;
+import static org.apache.isis.commons.internal.functions._Predicates.not;
+
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
@@ -41,8 +43,6 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelVisitingValidatorAbstract;
import org.apache.isis.core.metamodel.specloader.validator.ValidationFailure;
-import static org.apache.isis.commons.internal.functions._Predicates.not;
-
import lombok.NonNull;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/CollectionFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/CollectionFacet.java
index f6affcc..09223f9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/CollectionFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/CollectionFacet.java
@@ -19,6 +19,8 @@
package org.apache.isis.core.metamodel.facets.collections;
+import static org.apache.isis.commons.internal.base._With.requires;
+
import java.util.AbstractList;
import java.util.AbstractSet;
import java.util.ArrayList;
@@ -51,8 +53,6 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ManagedObjects.UnwrapUtil;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import static org.apache.isis.commons.internal.base._With.requires;
-
import lombok.val;
import lombok.experimental.UtilityClass;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/javautilcollection/JavaArrayFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/javautilcollection/JavaArrayFacet.java
index 832c1ab..a2e3465 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/javautilcollection/JavaArrayFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/javautilcollection/JavaArrayFacet.java
@@ -19,6 +19,8 @@
package org.apache.isis.core.metamodel.facets.collections.javautilcollection;
+import static org.apache.isis.commons.internal.collections._Arrays.toArray;
+
import java.util.function.Supplier;
import java.util.stream.Stream;
@@ -30,8 +32,6 @@ import org.apache.isis.core.metamodel.facets.collections.CollectionFacetAbstract
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import static org.apache.isis.commons.internal.collections._Arrays.toArray;
-
import lombok.val;
public class JavaArrayFacet extends CollectionFacetAbstract {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/SortedByFacetForCollectionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/SortedByFacetForCollectionLayoutAnnotation.java
index 5de092b..d149cb6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/SortedByFacetForCollectionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/SortedByFacetForCollectionLayoutAnnotation.java
@@ -19,6 +19,8 @@
package org.apache.isis.core.metamodel.facets.collections.layout;
+import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+
import java.util.Comparator;
import java.util.Optional;
@@ -27,8 +29,6 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.collections.sortedby.SortedByFacet;
import org.apache.isis.core.metamodel.facets.collections.sortedby.SortedByFacetAbstract;
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
-
public class SortedByFacetForCollectionLayoutAnnotation extends SortedByFacetAbstract {
public static SortedByFacet create(
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/SortedByFacetForCollectionXml.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/SortedByFacetForCollectionXml.java
index a146853..1ec1194 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/SortedByFacetForCollectionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/SortedByFacetForCollectionXml.java
@@ -19,6 +19,8 @@
package org.apache.isis.core.metamodel.facets.collections.layout;
+import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+
import java.util.Comparator;
import org.apache.isis.applib.layout.component.CollectionLayoutData;
@@ -27,8 +29,6 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.collections.sortedby.SortedByFacet;
import org.apache.isis.core.metamodel.facets.collections.sortedby.SortedByFacetAbstract;
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
-
public class SortedByFacetForCollectionXml extends SortedByFacetAbstract {
public static SortedByFacet create(CollectionLayoutData collectionLayout, FacetHolder holder) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/jaxb/JaxbFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/jaxb/JaxbFacetFactory.java
index 9912cdd..1daaeb6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/jaxb/JaxbFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/jaxb/JaxbFacetFactory.java
@@ -19,6 +19,9 @@
package org.apache.isis.core.metamodel.facets.jaxb;
+import static org.apache.isis.commons.internal.reflection._Reflect.Filter.isPublic;
+import static org.apache.isis.commons.internal.reflection._Reflect.Filter.paramCount;
+
import java.lang.reflect.Modifier;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -51,9 +54,6 @@ import org.apache.isis.core.metamodel.spec.feature.MixedIn;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.validator.ValidationFailure;
-import static org.apache.isis.commons.internal.reflection._Reflect.Filter.isPublic;
-import static org.apache.isis.commons.internal.reflection._Reflect.Filter.paramCount;
-
import lombok.val;
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
index 0f466b5..29b2dc9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
@@ -18,6 +18,8 @@
*/
package org.apache.isis.core.metamodel.facets.object.domainobject;
+import static org.apache.isis.commons.internal.base._NullSafe.stream;
+
import java.lang.reflect.Method;
import java.util.List;
import java.util.Optional;
@@ -78,8 +80,6 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelVisitingVali
import org.apache.isis.core.metamodel.specloader.validator.ValidationFailure;
import org.apache.isis.core.metamodel.util.EventUtil;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-
import lombok.NonNull;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java
index 937df72..377412f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java
@@ -19,6 +19,8 @@
package org.apache.isis.core.metamodel.facets.object.ignore.annotation;
+import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.util.List;
@@ -36,8 +38,6 @@ import org.apache.isis.core.metamodel.facetapi.MethodRemover;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
-
public class RemoveAnnotatedMethodsFacetFactory extends FacetFactoryAbstract {
private final List<String> eventHandlerClassNames = _Lists.of(
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mixin/MetaModelValidatorForMixinTypes.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mixin/MetaModelValidatorForMixinTypes.java
index bafb7e3..da00393 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mixin/MetaModelValidatorForMixinTypes.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mixin/MetaModelValidatorForMixinTypes.java
@@ -18,14 +18,14 @@
*/
package org.apache.isis.core.metamodel.facets.object.mixin;
+import static org.apache.isis.commons.internal.reflection._Reflect.Filter.paramCount;
+
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.id.LogicalType;
import org.apache.isis.commons.internal.reflection._Reflect;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.specloader.validator.ValidationFailure;
-import static org.apache.isis.commons.internal.reflection._Reflect.Filter.paramCount;
-
import lombok.NonNull;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinFacetForDomainObjectAnnotation.java
index cf30a76..9dd7202 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinFacetForDomainObjectAnnotation.java
@@ -19,6 +19,8 @@
package org.apache.isis.core.metamodel.facets.object.mixin;
+import static org.apache.isis.commons.internal.reflection._Reflect.Filter.paramCount;
+
import java.lang.reflect.Constructor;
import java.util.Optional;
@@ -29,8 +31,6 @@ import org.apache.isis.commons.internal.reflection._Reflect;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import static org.apache.isis.commons.internal.reflection._Reflect.Filter.paramCount;
-
import lombok.val;
public class MixinFacetForDomainObjectAnnotation
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParserUtil.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParserUtil.java
index b5b094b..4e77cc7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParserUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParserUtil.java
@@ -19,12 +19,12 @@
package org.apache.isis.core.metamodel.facets.object.parseable;
+import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.core.metamodel.commons.ClassUtil;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
-
public final class ParserUtil {
private ParserUtil() {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/methods/TitleFacetViaMethodsFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/methods/TitleFacetViaMethodsFactory.java
index 804cff1..5600f2e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/methods/TitleFacetViaMethodsFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/methods/TitleFacetViaMethodsFactory.java
@@ -19,6 +19,9 @@
package org.apache.isis.core.metamodel.facets.object.title.methods;
+import static org.apache.isis.core.metamodel.methods.MethodLiteralConstants.TITLE;
+import static org.apache.isis.core.metamodel.methods.MethodLiteralConstants.TO_STRING;
+
import java.lang.reflect.Method;
import org.apache.isis.applib.services.i18n.TranslationContext;
@@ -33,9 +36,6 @@ import org.apache.isis.core.metamodel.facets.object.title.TitleFacet;
import org.apache.isis.core.metamodel.methods.MethodFinderUtils;
import org.apache.isis.core.metamodel.methods.MethodPrefixBasedFacetFactoryAbstract;
-import static org.apache.isis.core.metamodel.methods.MethodLiteralConstants.TITLE;
-import static org.apache.isis.core.metamodel.methods.MethodLiteralConstants.TO_STRING;
-
import lombok.val;
public class TitleFacetViaMethodsFactory extends MethodPrefixBasedFacetFactoryAbstract {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderUtil.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderUtil.java
index 75f1fd5..c1fbbfd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderUtil.java
@@ -19,14 +19,14 @@
package org.apache.isis.core.metamodel.facets.object.value.vsp;
+import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+
import org.apache.isis.applib.adapters.ValueSemanticsProvider;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.metamodel.commons.ClassUtil;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
-
import lombok.extern.log4j.Log4j2;
@Log4j2
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java
index 2cfcb00..d890815 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java
@@ -19,6 +19,8 @@
package org.apache.isis.core.metamodel.facets.properties.property.modify;
+import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+
import java.util.Map;
import java.util.Objects;
@@ -43,8 +45,6 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ManagedObjects.UnwrapUtil;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
-
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/methods/MethodFinderUtils.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/methods/MethodFinderUtils.java
index a4e1a37..a0f9c04 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/methods/MethodFinderUtils.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/methods/MethodFinderUtils.java
@@ -18,6 +18,8 @@
*/
package org.apache.isis.core.metamodel.methods;
+import static org.apache.isis.commons.internal.reflection._Reflect.Filter.paramSignatureMatch;
+
import java.lang.annotation.Annotation;
import java.lang.reflect.Array;
import java.lang.reflect.Constructor;
@@ -38,8 +40,6 @@ import org.apache.isis.commons.internal.reflection._Reflect;
import org.apache.isis.core.metamodel.commons.MethodUtil;
import org.apache.isis.core.metamodel.facetapi.MethodRemover;
-import static org.apache.isis.commons.internal.reflection._Reflect.Filter.paramSignatureMatch;
-
import lombok.NonNull;
import lombok.Value;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/i18n/TranslationPostProcessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/i18n/TranslationPostProcessor.java
index ac364a3..1d051fd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/i18n/TranslationPostProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/i18n/TranslationPostProcessor.java
@@ -24,12 +24,8 @@ import javax.inject.Inject;
import org.apache.isis.applib.services.i18n.TranslationContext;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
-import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facetapi.IdentifiedHolder;
-import org.apache.isis.core.metamodel.facets.FacetFactory;
-import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacet;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.core.metamodel.postprocessors.ObjectSpecificationPostProcessorAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModelInitFilter.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModelInitFilter.java
index a131d0d..aff7a99 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModelInitFilter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModelInitFilter.java
@@ -18,6 +18,8 @@
*/
package org.apache.isis.core.metamodel.progmodel;
+import static org.apache.isis.commons.internal.base._NullSafe.isEmpty;
+
import java.util.EnumSet;
import java.util.function.Predicate;
@@ -28,8 +30,6 @@ import org.apache.isis.core.metamodel.facets.FacetFactory;
import org.apache.isis.core.metamodel.postprocessors.ObjectSpecificationPostProcessor;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
-import static org.apache.isis.commons.internal.base._NullSafe.isEmpty;
-
import lombok.val;
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModelInitFilterDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModelInitFilterDefault.java
index bc7095d..febce04 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModelInitFilterDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModelInitFilterDefault.java
@@ -18,6 +18,9 @@
*/
package org.apache.isis.core.metamodel.progmodel;
+import static org.apache.isis.core.metamodel.progmodel.ProgrammingModelInitFilter.excluding;
+import static org.apache.isis.core.metamodel.progmodel.ProgrammingModelInitFilter.excludingNone;
+
import java.util.EnumSet;
import java.util.function.Predicate;
@@ -32,9 +35,6 @@ import org.apache.isis.core.metamodel.facets.FacetFactory;
import org.apache.isis.core.metamodel.postprocessors.ObjectSpecificationPostProcessor;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
-import static org.apache.isis.core.metamodel.progmodel.ProgrammingModelInitFilter.excluding;
-import static org.apache.isis.core.metamodel.progmodel.ProgrammingModelInitFilter.excludingNone;
-
import lombok.val;
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodels/dflt/ProgrammingModelFacetsJava8.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodels/dflt/ProgrammingModelFacetsJava8.java
index 176a994..3b3fdac 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodels/dflt/ProgrammingModelFacetsJava8.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodels/dflt/ProgrammingModelFacetsJava8.java
@@ -18,7 +18,6 @@
package org.apache.isis.core.metamodel.progmodels.dflt;
import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.core.metamodel.postprocessors.allbutparam.authorization.AuthorizationFacetPostProcessor;
import org.apache.isis.core.metamodel.facets.actions.action.ActionAnnotationFacetFactory;
import org.apache.isis.core.metamodel.facets.actions.action.ActionAnnotationShouldEnforceConcreteTypeToBeIncludedWithMetamodelValidator;
import org.apache.isis.core.metamodel.facets.actions.action.ActionChoicesForCollectionParameterFacetFactory;
@@ -29,7 +28,6 @@ import org.apache.isis.core.metamodel.facets.actions.homepage.annotation.HomePag
import org.apache.isis.core.metamodel.facets.actions.layout.ActionLayoutFacetFactory;
import org.apache.isis.core.metamodel.facets.actions.notinservicemenu.derived.NotInServiceMenuFacetDerivedFromDomainServiceFacetFactory;
import org.apache.isis.core.metamodel.facets.actions.validate.method.ActionValidationFacetViaMethodFactory;
-import org.apache.isis.core.metamodel.postprocessors.all.i18n.TranslationPostProcessor;
import org.apache.isis.core.metamodel.facets.collections.accessor.CollectionAccessorFacetViaAccessorFactory;
import org.apache.isis.core.metamodel.facets.collections.collection.CollectionAnnotationFacetFactory;
import org.apache.isis.core.metamodel.facets.collections.javautilcollection.CollectionFacetFactory;
@@ -142,16 +140,18 @@ import org.apache.isis.core.metamodel.facets.value.uuid.UUIDValueFacetUsingSeman
import org.apache.isis.core.metamodel.methods.MemberSupportAnnotationEnforcesSupportingMethodValidator;
import org.apache.isis.core.metamodel.methods.MethodByClassMap;
import org.apache.isis.core.metamodel.methods.OrphanedSupportingMethodValidator;
+import org.apache.isis.core.metamodel.postprocessors.DeriveMixinMembersPostProcessor;
+import org.apache.isis.core.metamodel.postprocessors.all.DeriveDescribedAsFromTypePostProcessor;
+import org.apache.isis.core.metamodel.postprocessors.all.i18n.TranslationPostProcessor;
+import org.apache.isis.core.metamodel.postprocessors.allbutparam.authorization.AuthorizationFacetPostProcessor;
+import org.apache.isis.core.metamodel.postprocessors.collparam.DeriveCollectionParamDefaultsAndChoicesPostProcessor;
+import org.apache.isis.core.metamodel.postprocessors.members.TweakDomainEventsForMixinPostProcessor;
+import org.apache.isis.core.metamodel.postprocessors.object.DeriveProjectionFacetsPostProcessor;
import org.apache.isis.core.metamodel.postprocessors.properties.DeriveDisabledFromImmutablePostProcessor;
+import org.apache.isis.core.metamodel.postprocessors.properties.DeriveDisabledFromViewModelPostProcessor;
import org.apache.isis.core.metamodel.postprocessors.propparam.DeriveChoicesFromExistingChoicesPostProcessor;
-import org.apache.isis.core.metamodel.postprocessors.collparam.DeriveCollectionParamDefaultsAndChoicesPostProcessor;
import org.apache.isis.core.metamodel.postprocessors.propparam.DeriveDefaultFromTypePostProcessor;
-import org.apache.isis.core.metamodel.postprocessors.all.DeriveDescribedAsFromTypePostProcessor;
-import org.apache.isis.core.metamodel.postprocessors.properties.DeriveDisabledFromViewModelPostProcessor;
-import org.apache.isis.core.metamodel.postprocessors.object.DeriveProjectionFacetsPostProcessor;
-import org.apache.isis.core.metamodel.postprocessors.DeriveMixinMembersPostProcessor;
import org.apache.isis.core.metamodel.postprocessors.propparam.DeriveTypicalLengthFromTypePostProcessor;
-import org.apache.isis.core.metamodel.postprocessors.members.TweakDomainEventsForMixinPostProcessor;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModelAbstract;
import org.apache.isis.core.metamodel.services.title.TitlesAndTranslationsValidator;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java
index d103359..60fcee9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java
@@ -18,6 +18,8 @@
*/
package org.apache.isis.core.metamodel.services.grid;
+import static org.apache.isis.core.metamodel.facetapi.FacetUtil.addOrReplaceFacet;
+
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
@@ -85,8 +87,6 @@ import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import static org.apache.isis.core.metamodel.facetapi.FacetUtil.addOrReplaceFacet;
-
import lombok.Value;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
index f3ca834..5f6617b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
@@ -18,6 +18,8 @@
*/
package org.apache.isis.core.metamodel.services.grid.bootstrap3;
+import static org.apache.isis.commons.internal.base._NullSafe.stream;
+
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
@@ -69,8 +71,6 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
index 88a0e95..bb32628 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
@@ -17,6 +17,8 @@
package org.apache.isis.core.metamodel.spec.feature;
+import static org.apache.isis.commons.internal.base._NullSafe.stream;
+
import java.util.Collections;
import java.util.List;
import java.util.Objects;
@@ -58,8 +60,6 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.specimpl.MixedInMember;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-
import lombok.NonNull;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
index 3ceea19..2774478 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
@@ -18,6 +18,9 @@
*/
package org.apache.isis.core.metamodel.specloader;
+import static org.apache.isis.core.metamodel.specloader.specimpl.IntrospectionState.FULLY_INTROSPECTED;
+import static org.apache.isis.core.metamodel.specloader.specimpl.IntrospectionState.TYPE_INTROSPECTED;
+
import java.util.Optional;
import java.util.function.Consumer;
@@ -36,9 +39,6 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
import org.apache.isis.core.metamodel.specloader.validator.ValidationFailure;
import org.apache.isis.core.metamodel.specloader.validator.ValidationFailures;
-import static org.apache.isis.core.metamodel.specloader.specimpl.IntrospectionState.FULLY_INTROSPECTED;
-import static org.apache.isis.core.metamodel.specloader.specimpl.IntrospectionState.TYPE_INTROSPECTED;
-
import lombok.NonNull;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
index 7641a4d..4507510 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
@@ -19,6 +19,8 @@
package org.apache.isis.core.metamodel.specloader.specimpl;
+import static org.apache.isis.commons.internal.base._With.requires;
+
import java.util.ArrayList;
import org.apache.isis.applib.Identifier;
@@ -55,8 +57,6 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import static org.apache.isis.commons.internal.base._With.requires;
-
import lombok.NonNull;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index 5290521..42d102c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -19,6 +19,8 @@
package org.apache.isis.core.metamodel.specloader.specimpl;
+import static org.apache.isis.commons.internal.base._NullSafe.stream;
+
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collection;
@@ -82,8 +84,6 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
import org.apache.isis.core.metamodel.specloader.facetprocessor.FacetProcessor;
import org.apache.isis.core.metamodel.specloader.postprocessor.PostProcessor;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
index 46abed9..e3151ff 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
@@ -39,8 +39,6 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.facets.ImperativeFacet;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
-import org.apache.isis.core.metamodel.postprocessors.all.i18n.NamedFacetTranslated;
-import org.apache.isis.core.metamodel.postprocessors.all.i18n.PluralFacetTranslated;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacetInferred;
import org.apache.isis.core.metamodel.facets.object.plural.PluralFacet;
@@ -48,6 +46,8 @@ import org.apache.isis.core.metamodel.facets.object.plural.inferred.PluralFacetI
import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.isis.core.metamodel.facets.object.wizard.WizardFacet;
+import org.apache.isis.core.metamodel.postprocessors.all.i18n.NamedFacetTranslated;
+import org.apache.isis.core.metamodel.postprocessors.all.i18n.PluralFacetTranslated;
import org.apache.isis.core.metamodel.services.classsubstitutor.ClassSubstitutorRegistry;
import org.apache.isis.core.metamodel.spec.ActionType;
import org.apache.isis.core.metamodel.spec.ElementSpecificationProvider;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/ValidationFailure.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/ValidationFailure.java
index 1d106a9..c7b4cae 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/ValidationFailure.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/ValidationFailure.java
@@ -18,12 +18,12 @@
*/
package org.apache.isis.core.metamodel.specloader.validator;
-import java.util.Comparator;
-import java.util.Objects;
-
import static java.util.Comparator.naturalOrder;
import static java.util.Comparator.nullsFirst;
+import java.util.Comparator;
+import java.util.Objects;
+
import org.apache.isis.applib.Identifier;
import org.apache.isis.core.metamodel.facetapi.IdentifiedHolder;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_configTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_configTest.java
index caf798a..6cca628 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_configTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_configTest.java
@@ -18,12 +18,12 @@
*/
package org.apache.isis.core.metamodel;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.core.env.ConfigurableEnvironment;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import org.apache.isis.core.metamodel._testing.MetaModelContext_forTesting;
import org.apache.isis.core.metamodel.context.MetaModelContext;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/IoUtils_CopyTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/IoUtils_CopyTest.java
index 37f075b..134aee5 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/IoUtils_CopyTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/IoUtils_CopyTest.java
@@ -19,6 +19,8 @@
package org.apache.isis.core.metamodel.commons;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -29,8 +31,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import static org.hamcrest.MatcherAssert.assertThat;
-
public class IoUtils_CopyTest {
private static final class ArrayMatcher extends TypeSafeMatcher<byte[]> {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/JavaClassUtilsTest_getBuiltIn.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/JavaClassUtilsTest_getBuiltIn.java
index ed5a5da..831bc2a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/JavaClassUtilsTest_getBuiltIn.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/JavaClassUtilsTest_getBuiltIn.java
@@ -19,10 +19,10 @@
package org.apache.isis.core.metamodel.commons;
-import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+
public class JavaClassUtilsTest_getBuiltIn {
@Test
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/ListUtilsTest_adjust.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/ListUtilsTest_adjust.java
index de0a1e4..9ca05e0 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/ListUtilsTest_adjust.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/ListUtilsTest_adjust.java
@@ -18,16 +18,16 @@
*/
package org.apache.isis.core.metamodel.commons;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-
public class ListUtilsTest_adjust {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/ListUtilsTest_insert.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/ListUtilsTest_insert.java
index 979c774..c3e40fe 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/ListUtilsTest_insert.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/ListUtilsTest_insert.java
@@ -18,14 +18,14 @@
*/
package org.apache.isis.core.metamodel.commons;
-import java.util.List;
-
-import org.junit.Test;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
+import java.util.List;
+
+import org.junit.Test;
+
import org.apache.isis.commons.internal.collections._Lists;
public class ListUtilsTest_insert {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/ListUtilsTest_mutableCopy.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/ListUtilsTest_mutableCopy.java
index 8082cb9..8fcbdb4 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/ListUtilsTest_mutableCopy.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/ListUtilsTest_mutableCopy.java
@@ -18,16 +18,16 @@
*/
package org.apache.isis.core.metamodel.commons;
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.Test;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Test;
+
public class ListUtilsTest_mutableCopy {
@Test
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/LocaleUtilsTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/LocaleUtilsTest.java
index ed89252..f3e6d0c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/LocaleUtilsTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/LocaleUtilsTest.java
@@ -19,13 +19,13 @@
package org.apache.isis.core.metamodel.commons;
-import org.junit.Test;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.junit.Test;
+
public class LocaleUtilsTest {
@Test
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtilsTest_enumTitle.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtilsTest_enumTitle.java
index 1650e5a..9ea908a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtilsTest_enumTitle.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtilsTest_enumTitle.java
@@ -19,11 +19,11 @@
package org.apache.isis.core.metamodel.commons;
-import org.junit.Test;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.junit.Test;
+
public class StringUtilsTest_enumTitle {
@Test
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtils_NaturalNameTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtils_NaturalNameTest.java
index f1b927f..c3654b5 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtils_NaturalNameTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtils_NaturalNameTest.java
@@ -19,11 +19,11 @@
package org.apache.isis.core.metamodel.commons;
-import org.junit.Test;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.junit.Test;
+
public class StringUtils_NaturalNameTest {
@Test
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtils_NaturalizeTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtils_NaturalizeTest.java
index 18074fd..4c02627 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtils_NaturalizeTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtils_NaturalizeTest.java
@@ -19,11 +19,11 @@
package org.apache.isis.core.metamodel.commons;
-import org.junit.Test;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.junit.Test;
+
public class StringUtils_NaturalizeTest {
@Test
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtils_NormalizedTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtils_NormalizedTest.java
index 90dd220..e7bb302 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtils_NormalizedTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtils_NormalizedTest.java
@@ -19,6 +19,9 @@
package org.apache.isis.core.metamodel.commons;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import java.util.Arrays;
import java.util.Collection;
@@ -27,9 +30,6 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
@RunWith(Parameterized.class)
public class StringUtils_NormalizedTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtils_StripLeadingSlashTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtils_StripLeadingSlashTest.java
index c0ab285..4a99667 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtils_StripLeadingSlashTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtils_StripLeadingSlashTest.java
@@ -19,11 +19,11 @@
package org.apache.isis.core.metamodel.commons;
-import org.junit.Test;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.junit.Test;
+
public class StringUtils_StripLeadingSlashTest {
@Test
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtils_StripNewLinesTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtils_StripNewLinesTest.java
index 66e7c50..a2b484e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtils_StripNewLinesTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtils_StripNewLinesTest.java
@@ -19,11 +19,11 @@
package org.apache.isis.core.metamodel.commons;
-import org.junit.Test;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.junit.Test;
+
public class StringUtils_StripNewLinesTest {
@Test
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtils_camelLowerFirst.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtils_camelLowerFirst.java
index ed42ad5..526cabe 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtils_camelLowerFirst.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtils_camelLowerFirst.java
@@ -19,11 +19,11 @@
package org.apache.isis.core.metamodel.commons;
-import org.junit.Test;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.junit.Test;
+
public class StringUtils_camelLowerFirst {
@Test
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtils_toLineSeparated.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtils_toLineSeparated.java
index d779c67..84be7dd 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtils_toLineSeparated.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtils_toLineSeparated.java
@@ -19,13 +19,13 @@
package org.apache.isis.core.metamodel.commons;
-import org.junit.Test;
-
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import static org.junit.Assume.assumeThat;
+import org.junit.Test;
+
public class StringUtils_toLineSeparated {
@Test
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtils_toLowerDashed.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtils_toLowerDashed.java
index f97bcb1..8b144ac 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtils_toLowerDashed.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtils_toLowerDashed.java
@@ -19,11 +19,11 @@
package org.apache.isis.core.metamodel.commons;
-import org.junit.Test;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.junit.Test;
+
public class StringUtils_toLowerDashed {
@Test
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/TypesTest_filteredList.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/TypesTest_filteredList.java
index 7cf6f21..845f654 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/TypesTest_filteredList.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/TypesTest_filteredList.java
@@ -19,6 +19,9 @@
package org.apache.isis.core.metamodel.commons;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -27,9 +30,6 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
public class TypesTest_filteredList {
private List<Object> shapes;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/matchers/IsisMatchers_NonEmptyStringTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/matchers/IsisMatchers_NonEmptyStringTest.java
index 7258ddb..7c2e8a0 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/matchers/IsisMatchers_NonEmptyStringTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/matchers/IsisMatchers_NonEmptyStringTest.java
@@ -19,13 +19,13 @@
package org.apache.isis.core.metamodel.commons.matchers;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import org.hamcrest.Matcher;
import org.junit.Before;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
public class IsisMatchers_NonEmptyStringTest {
private Matcher<String> fooMatcher;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/consent/InteractionResultTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/consent/InteractionResultTest.java
index acce8ba..6885e03 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/consent/InteractionResultTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/consent/InteractionResultTest.java
@@ -19,14 +19,14 @@
package org.apache.isis.core.metamodel.consent;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.isis.core.metamodel.interactions.InteractionAdvisorFacet;
public class InteractionResultTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FeatureTypeTest_identifierFor.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FeatureTypeTest_identifierFor.java
index 1da5ef4..aaf1935 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FeatureTypeTest_identifierFor.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FeatureTypeTest_identifierFor.java
@@ -19,14 +19,14 @@
package org.apache.isis.core.metamodel.facetapi;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import java.lang.reflect.Method;
import java.math.BigDecimal;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.id.LogicalType;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AnnotationsTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AnnotationsTest.java
index 452b1e2..00e8449 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AnnotationsTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AnnotationsTest.java
@@ -18,15 +18,15 @@
*/
package org.apache.isis.core.metamodel.facets;
-import java.util.List;
-
-import org.junit.Test;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
+import java.util.List;
+
+import org.junit.Test;
+
public class AnnotationsTest {
@Test
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/Annotations_getAnnotations_on_Class_Test.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/Annotations_getAnnotations_on_Class_Test.java
index 07f1a8a..6900489 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/Annotations_getAnnotations_on_Class_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/Annotations_getAnnotations_on_Class_Test.java
@@ -18,6 +18,10 @@
*/
package org.apache.isis.core.metamodel.facets;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
@@ -26,10 +30,6 @@ import java.lang.annotation.Target;
import org.junit.jupiter.api.Test;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import org.apache.isis.applib.events.ui.TitleUiEvent;
import org.apache.isis.commons.internal.reflection._Annotations;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/Annotations_getAnnotations_on_Field_Test.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/Annotations_getAnnotations_on_Field_Test.java
index b549a24..9b81e7c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/Annotations_getAnnotations_on_Field_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/Annotations_getAnnotations_on_Field_Test.java
@@ -18,6 +18,9 @@
*/
package org.apache.isis.core.metamodel.facets;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
@@ -26,9 +29,6 @@ import java.lang.annotation.Target;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.commons.internal.reflection._Annotations;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/Annotations_getAnnotations_on_Method_Test.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/Annotations_getAnnotations_on_Method_Test.java
index 2ddc90c..d55f8b1 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/Annotations_getAnnotations_on_Method_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/Annotations_getAnnotations_on_Method_Test.java
@@ -18,6 +18,9 @@
*/
package org.apache.isis.core.metamodel.facets;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
@@ -26,9 +29,6 @@ import java.lang.annotation.Target;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
import org.apache.isis.commons.internal.reflection._Annotations;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/Annotations_getAnnotations_on_Parameter_Test.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/Annotations_getAnnotations_on_Parameter_Test.java
index 86bea91..f4816ca 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/Annotations_getAnnotations_on_Parameter_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/Annotations_getAnnotations_on_Parameter_Test.java
@@ -18,6 +18,9 @@
*/
package org.apache.isis.core.metamodel.facets;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
@@ -26,9 +29,6 @@ import java.lang.annotation.Target;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
import org.apache.isis.commons.internal.reflection._Annotations;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/CollectionFacetUtilsTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/CollectionFacetUtilsTest.java
index 6c9f72d..ed205ce 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/CollectionFacetUtilsTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/CollectionFacetUtilsTest.java
@@ -18,6 +18,11 @@
*/
package org.apache.isis.core.metamodel.facets;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import java.util.AbstractList;
import java.util.AbstractSet;
import java.util.ArrayList;
@@ -39,11 +44,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.core.metamodel.facets.collections.CollectionFacet;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newActionInteractionEvent.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newActionInteractionEvent.java
index 1c0e981..dc2d8d7 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newActionInteractionEvent.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newActionInteractionEvent.java
@@ -18,20 +18,19 @@
*/
package org.apache.isis.core.metamodel.facets;
-import org.junit.Test;
-
+import static junit.framework.Assert.assertEquals;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertSame;
+import org.junit.Test;
+
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.events.domain.ActionDomainEvent;
import org.apache.isis.applib.id.LogicalType;
-import static junit.framework.Assert.assertEquals;
-
public class DomainEventHelperTest_newActionInteractionEvent {
public static class SomeDomainObject {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forAdd.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forAdd.java
index 4451113..192fe0a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forAdd.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forAdd.java
@@ -18,14 +18,14 @@
*/
package org.apache.isis.core.metamodel.facets;
-import java.util.Set;
-
-import org.junit.Test;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertSame;
+import java.util.Set;
+
+import org.junit.Test;
+
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.events.domain.AbstractDomainEvent;
import org.apache.isis.applib.events.domain.CollectionDomainEvent;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forRemove.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forRemove.java
index 913207d..fb7ef11 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forRemove.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forRemove.java
@@ -18,14 +18,14 @@
*/
package org.apache.isis.core.metamodel.facets;
-import java.util.Set;
-
-import org.junit.Test;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertSame;
+import java.util.Set;
+
+import org.junit.Test;
+
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.events.domain.AbstractDomainEvent;
import org.apache.isis.applib.events.domain.CollectionDomainEvent;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forClear.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forClear.java
index 258d5a2..3ff8fc1 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forClear.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forClear.java
@@ -18,21 +18,20 @@
*/
package org.apache.isis.core.metamodel.facets;
-import java.time.LocalDate;
-
-import org.junit.Test;
-
+import static junit.framework.Assert.assertEquals;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
+import java.time.LocalDate;
+
+import org.junit.Test;
+
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.events.domain.PropertyDomainEvent;
import org.apache.isis.applib.id.LogicalType;
-import static junit.framework.Assert.assertEquals;
-
public class DomainEventHelperTest_newPropertyDomainEvent_forClear {
public static class SomeDomainObject {}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forModify.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forModify.java
index 8c130e5..470aae7 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forModify.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forModify.java
@@ -18,13 +18,13 @@
*/
package org.apache.isis.core.metamodel.facets;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import java.time.LocalDate;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.events.domain.PropertyDomainEvent;
import org.apache.isis.applib.id.LogicalType;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/MethodFinderUtilsTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/MethodFinderUtilsTest.java
index 0c57bc7..0ddd0d6 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/MethodFinderUtilsTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/MethodFinderUtilsTest.java
@@ -18,6 +18,11 @@
*/
package org.apache.isis.core.metamodel.facets;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import java.lang.reflect.Method;
import java.util.Optional;
@@ -25,11 +30,6 @@ import javax.annotation.PostConstruct;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-
import org.apache.isis.core.metamodel.methods.MethodByClassMap;
import org.apache.isis.core.metamodel.methods.MethodFinderUtils;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ObjectAdapterUtilsTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ObjectAdapterUtilsTest.java
index f603043..d15072f 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ObjectAdapterUtilsTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ObjectAdapterUtilsTest.java
@@ -19,14 +19,14 @@
package org.apache.isis.core.metamodel.facets;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.core.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Hidden.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Hidden.java
index aaae281..38702b5 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Hidden.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Hidden.java
@@ -18,12 +18,12 @@
*/
package org.apache.isis.core.metamodel.facets.actions.action;
-import org.junit.Assert;
-import org.junit.Test;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.junit.Assert;
+import org.junit.Test;
+
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Invocation.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Invocation.java
index c92d720..bb51b04 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Invocation.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Invocation.java
@@ -18,11 +18,12 @@
*/
package org.apache.isis.core.metamodel.facets.actions.action;
+import static org.apache.isis.core.metamodel.commons.matchers.IsisMatchers.classEqualTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import org.junit.Assert;
import org.junit.Test;
-import static org.hamcrest.MatcherAssert.assertThat;
-
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.events.domain.ActionDomainEvent;
import org.apache.isis.core.metamodel.facetapi.Facet;
@@ -35,8 +36,6 @@ import org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInv
import org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInvocationFacetForDomainEventFromActionAnnotation;
import org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInvocationFacetForDomainEventFromDefault;
-import static org.apache.isis.core.metamodel.commons.matchers.IsisMatchers.classEqualTo;
-
import lombok.val;
public class ActionAnnotationFacetFactoryTest_Invocation extends ActionAnnotationFacetFactoryTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_RestrictTo.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_RestrictTo.java
index 467bc6d..c5677f4 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_RestrictTo.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_RestrictTo.java
@@ -18,11 +18,11 @@
*/
package org.apache.isis.core.metamodel.facets.actions.action;
+import static org.junit.Assert.assertNull;
+
import org.junit.Assert;
import org.junit.Test;
-import static org.junit.Assert.assertNull;
-
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Semantics.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Semantics.java
index 3cd0b86..0f0f15f 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Semantics.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Semantics.java
@@ -18,12 +18,12 @@
*/
package org.apache.isis.core.metamodel.facets.actions.action;
-import org.junit.Assert;
-import org.junit.Test;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.junit.Assert;
+import org.junit.Test;
+
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_TypeOf.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_TypeOf.java
index cf2d529..40a4233 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_TypeOf.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_TypeOf.java
@@ -18,13 +18,14 @@
*/
package org.apache.isis.core.metamodel.facets.actions.action;
+import static org.apache.isis.core.metamodel.commons.matchers.IsisMatchers.classEqualTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import java.util.Collection;
import org.junit.Assert;
import org.junit.Test;
-import static org.hamcrest.MatcherAssert.assertThat;
-
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
@@ -32,8 +33,6 @@ import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacetInferredF
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacetInferredFromGenerics;
import org.apache.isis.core.metamodel.facets.actions.action.typeof.TypeOfFacetForActionAnnotation;
-import static org.apache.isis.core.metamodel.commons.matchers.IsisMatchers.classEqualTo;
-
import lombok.val;
public class ActionAnnotationFacetFactoryTest_TypeOf extends ActionAnnotationFacetFactoryTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_commandPublishing.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_commandPublishing.java
index 11d1c99..3030236 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_commandPublishing.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_commandPublishing.java
@@ -18,14 +18,14 @@
*/
package org.apache.isis.core.metamodel.facets.actions.action;
-import java.lang.reflect.Method;
-
-import org.junit.Test;
-
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import java.lang.reflect.Method;
+
+import org.junit.Test;
+
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.core.metamodel.facetapi.Facet;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_executionPublishing.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_executionPublishing.java
index 219cae9..d47bf5c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_executionPublishing.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_executionPublishing.java
@@ -18,14 +18,14 @@
*/
package org.apache.isis.core.metamodel.facets.actions.action;
-import java.lang.reflect.Method;
-
-import org.junit.Test;
-
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import java.lang.reflect.Method;
+
+import org.junit.Test;
+
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.commons.internal.base._Blackhole;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutXmlLayoutAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutXmlLayoutAnnotationFacetFactoryTest.java
index 868fc0a..0e160b5 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutXmlLayoutAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutXmlLayoutAnnotationFacetFactoryTest.java
@@ -17,6 +17,12 @@
package org.apache.isis.core.metamodel.facets.actions.layout;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+
import java.lang.reflect.Method;
import org.jmock.Expectations;
@@ -24,12 +30,6 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.layout.component.CssClassFaPosition;
import org.apache.isis.core.metamodel.facetapi.Facet;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest.java
index a452adc..a574d48 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest.java
@@ -18,14 +18,14 @@
*/
package org.apache.isis.core.metamodel.facets.actions.notinservicemenu.derived;
-import org.jmock.Expectations;
-import org.junit.Before;
-import org.junit.Test;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.jmock.Expectations;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.core.metamodel.facetapi.Facet;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstractTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstractTest.java
index c5dc269..f117f96 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstractTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstractTest.java
@@ -18,12 +18,12 @@
*/
package org.apache.isis.core.metamodel.facets.actions.prototype;
+import static org.junit.Assert.assertEquals;
+
import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
import org.apache.isis.core.config.environment.DeploymentType;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/JavaCollectionFacetTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/JavaCollectionFacetTest.java
index 7e0619e..a93bf0b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/JavaCollectionFacetTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/JavaCollectionFacetTest.java
@@ -19,6 +19,9 @@
package org.apache.isis.core.metamodel.facets.collections;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import java.util.Collection;
import java.util.Optional;
import java.util.stream.Stream;
@@ -30,9 +33,6 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.core.metamodel._testing.MetaModelContext_forTesting;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
index c5f8b9c..8da529c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
@@ -16,6 +16,9 @@
* under the License. */
package org.apache.isis.core.metamodel.facets.collections.collection;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import java.lang.reflect.Method;
import java.util.List;
@@ -26,17 +29,10 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.events.domain.CollectionDomainEvent;
import org.apache.isis.core.metamodel.commons.matchers.IsisMatchers;
-import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
import org.apache.isis.core.metamodel.facets.FacetFactory;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
@@ -44,12 +40,7 @@ import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacetInferredF
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacetInferredFromGenerics;
import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
import org.apache.isis.core.metamodel.facets.collections.collection.hidden.HiddenFacetForCollectionAnnotation;
-import org.apache.isis.core.metamodel.facets.collections.collection.modify.CollectionDomainEventFacet;
-import org.apache.isis.core.metamodel.facets.collections.collection.modify.CollectionDomainEventFacetDefault;
-import org.apache.isis.core.metamodel.facets.collections.collection.modify.CollectionDomainEventFacetForCollectionAnnotation;
import org.apache.isis.core.metamodel.facets.collections.collection.typeof.TypeOfFacetOnCollectionFromCollectionAnnotation;
-import org.apache.isis.core.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacetAbstract;
-import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/layout/annotation/NamedFacetForCollectionLayoutAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/layout/annotation/NamedFacetForCollectionLayoutAnnotationFactoryTest.java
index 8128035..d2cb061 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/layout/annotation/NamedFacetForCollectionLayoutAnnotationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/layout/annotation/NamedFacetForCollectionLayoutAnnotationFactoryTest.java
@@ -19,16 +19,16 @@
package org.apache.isis.core.metamodel.facets.collections.layout.annotation;
-import java.lang.reflect.Method;
-import java.util.Set;
-import java.util.SortedSet;
-
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
+import java.lang.reflect.Method;
+import java.util.Set;
+import java.util.SortedSet;
+
import org.apache.isis.applib.annotation.CollectionLayout;
import org.apache.isis.commons.internal.collections._Sets;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/CssClassFaFacetAbstractTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/CssClassFaFacetAbstractTest.java
index cbf4068..6882bb5 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/CssClassFaFacetAbstractTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/CssClassFaFacetAbstractTest.java
@@ -18,11 +18,11 @@
*/
package org.apache.isis.core.metamodel.facets.members.cssclassfa;
-import org.junit.Test;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.junit.Test;
+
public class CssClassFaFacetAbstractTest {
public static class Sanitize extends CssClassFaFacetAbstractTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
index 69cf9eb..c1e53c5 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
@@ -18,15 +18,15 @@
*/
package org.apache.isis.core.metamodel.facets.object;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
import org.apache.isis.applib.RecreatableDomainObject;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.services.inject.ServiceInjector;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
index b915730..b4caa42 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
@@ -19,6 +19,11 @@
package org.apache.isis.core.metamodel.facets.object.domainobject;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertFalse;
+
import java.util.UUID;
import org.jmock.Expectations;
@@ -27,11 +32,6 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertFalse;
-
import org.apache.isis.applib.annotation.Bounding;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.mixins.system.HasInteractionId;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/ObjectTypeAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/ObjectTypeAnnotationFacetFactoryTest.java
index 634d467..3d1958d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/ObjectTypeAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/ObjectTypeAnnotationFacetFactoryTest.java
@@ -19,14 +19,14 @@
package org.apache.isis.core.metamodel.facets.object.domainobject;
-import org.junit.Before;
-import org.junit.Test;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
import org.apache.isis.core.metamodel.facets.ObjectSpecIdFacetFactory.ProcessObjectSpecIdContext;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
index eee7e5a..858f413 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
@@ -19,13 +19,6 @@
package org.apache.isis.core.metamodel.facets.object.domainobjectlayout;
-import org.assertj.core.api.Assertions;
-import org.jmock.auto.Mock;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -33,6 +26,13 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import org.assertj.core.api.Assertions;
+import org.jmock.auto.Mock;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.isis.applib.annotation.BookmarkPolicy;
import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.layout.component.CssClassFaPosition;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/annotation/DomainServiceLayoutFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/annotation/DomainServiceLayoutFacetFactoryTest.java
index db8f8d7..57ea578 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/annotation/DomainServiceLayoutFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/annotation/DomainServiceLayoutFacetFactoryTest.java
@@ -19,10 +19,10 @@
package org.apache.isis.core.metamodel.facets.object.domainservicelayout.annotation;
-import org.junit.Assert;
-
import static org.hamcrest.Matchers.is;
+import org.junit.Assert;
+
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.DomainServiceLayout;
import org.apache.isis.core.metamodel.facetapi.Facet;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/cssclass/CssClassFacetMethodFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/cssclass/CssClassFacetMethodFactoryTest.java
index 29b8305..d252475 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/cssclass/CssClassFacetMethodFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/cssclass/CssClassFacetMethodFactoryTest.java
@@ -19,13 +19,13 @@
package org.apache.isis.core.metamodel.facets.object.ident.cssclass;
-import java.lang.reflect.Method;
-
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
+import java.lang.reflect.Method;
+
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/cssclass/CssClassFacetMethodTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/cssclass/CssClassFacetMethodTest.java
index 59a646e..51cfe79 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/cssclass/CssClassFacetMethodTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/cssclass/CssClassFacetMethodTest.java
@@ -19,6 +19,10 @@
package org.apache.isis.core.metamodel.facets.object.ident.cssclass;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import java.lang.reflect.Method;
import org.jmock.Expectations;
@@ -28,10 +32,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.cssclass.method.CssClassFacetMethod;
import org.apache.isis.core.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/cssclass/CssClassFacetMethodWithProblemTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/cssclass/CssClassFacetMethodWithProblemTest.java
index 1b12055..32bf2ce 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/cssclass/CssClassFacetMethodWithProblemTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/cssclass/CssClassFacetMethodWithProblemTest.java
@@ -19,6 +19,10 @@
package org.apache.isis.core.metamodel.facets.object.ident.cssclass;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import java.lang.reflect.Method;
import org.jmock.Expectations;
@@ -28,10 +32,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.cssclass.method.CssClassFacetMethod;
import org.apache.isis.core.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/icon/IconFacetMethodFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/icon/IconFacetMethodFactoryTest.java
index e32cd73..a19ec83 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/icon/IconFacetMethodFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/icon/IconFacetMethodFactoryTest.java
@@ -19,13 +19,13 @@
package org.apache.isis.core.metamodel.facets.object.ident.icon;
-import java.lang.reflect.Method;
-
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
+import java.lang.reflect.Method;
+
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/icon/IconFacetMethodTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/icon/IconFacetMethodTest.java
index 58f7ddb..75c4d13 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/icon/IconFacetMethodTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/icon/IconFacetMethodTest.java
@@ -19,6 +19,10 @@
package org.apache.isis.core.metamodel.facets.object.ident.icon;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import java.lang.reflect.Method;
import org.jmock.Expectations;
@@ -28,10 +32,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.icon.method.IconFacetMethod;
import org.apache.isis.core.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/layout/LayoutFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/layout/LayoutFacetFactoryTest.java
index ba554b8..51921c5 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/layout/LayoutFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/layout/LayoutFacetFactoryTest.java
@@ -19,13 +19,13 @@
package org.apache.isis.core.metamodel.facets.object.ident.layout;
-import java.lang.reflect.Method;
-
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
+import java.lang.reflect.Method;
+
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/layout/LayoutFacetMethodTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/layout/LayoutFacetMethodTest.java
index c382125..7a06255 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/layout/LayoutFacetMethodTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/layout/LayoutFacetMethodTest.java
@@ -19,6 +19,10 @@
package org.apache.isis.core.metamodel.facets.object.ident.layout;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import java.lang.reflect.Method;
import org.jmock.Expectations;
@@ -28,10 +32,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.layout.LayoutFacetMethod;
import org.apache.isis.core.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/TitleFacetViaMethodTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/TitleFacetViaMethodTest.java
index 98d99ae..f6ac699 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/TitleFacetViaMethodTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/TitleFacetViaMethodTest.java
@@ -19,6 +19,9 @@
package org.apache.isis.core.metamodel.facets.object.ident.title;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import java.lang.reflect.Method;
import org.jmock.Expectations;
@@ -30,9 +33,6 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
import org.apache.isis.core.metamodel._testing.MetaModelContext_forTesting;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
index 9a1f70e..2b13135 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
@@ -18,6 +18,9 @@
*/
package org.apache.isis.core.metamodel.facets.object.ident.title.annotation;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.List;
@@ -31,9 +34,6 @@ import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java
index db9763c..2ee116a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java
@@ -19,6 +19,9 @@
package org.apache.isis.core.metamodel.facets.object.ident.title.annotation;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import java.util.List;
import org.jmock.Expectations;
@@ -28,9 +31,6 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/layoutxml/GridFacetDefaultTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/layoutxml/GridFacetDefaultTest.java
index 3384449..e83ca30 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/layoutxml/GridFacetDefaultTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/layoutxml/GridFacetDefaultTest.java
@@ -18,14 +18,14 @@
*/
package org.apache.isis.core.metamodel.facets.object.layoutxml;
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.junit.Test;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.junit.Test;
+
import org.apache.isis.applib.layout.component.FieldSet;
public class GridFacetDefaultTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAs.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAs.java
index a7d6132..a4dca28 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAs.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAs.java
@@ -18,13 +18,13 @@
*/
package org.apache.isis.core.metamodel.facets.object.mixin;
+import static org.mockito.Mockito.when;
+
import java.lang.reflect.Method;
import org.mockito.ArgumentMatchers;
import org.mockito.Mockito;
-import static org.mockito.Mockito.when;
-
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.id.LogicalType;
import org.apache.isis.applib.services.i18n.Mode;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAsActionTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAsActionTest.java
index 2e0d983..2e99924 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAsActionTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAsActionTest.java
@@ -18,15 +18,15 @@
*/
package org.apache.isis.core.metamodel.facets.object.mixin;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
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.assertTrue;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.applib.annotation.DomainObject;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/navparent/NavigableParentFacetMethodTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/navparent/NavigableParentFacetMethodTest.java
index f31b654..5354d98 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/navparent/NavigableParentFacetMethodTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/navparent/NavigableParentFacetMethodTest.java
@@ -19,6 +19,10 @@
package org.apache.isis.core.metamodel.facets.object.navparent;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import java.lang.reflect.Method;
import org.jmock.Expectations;
@@ -28,10 +32,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.navparent.method.NavigableParentFacetMethod;
import org.apache.isis.core.metamodel.spec.ManagedObject;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectSpecIdFacetDerivedFromClassNameFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectSpecIdFacetDerivedFromClassNameFactoryTest.java
index 751f834..6af091e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectSpecIdFacetDerivedFromClassNameFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectSpecIdFacetDerivedFromClassNameFactoryTest.java
@@ -19,15 +19,15 @@
package org.apache.isis.core.metamodel.facets.object.objectspecid;
-import org.datanucleus.testing.dom.CustomerAsProxiedByDataNucleus;
-import org.junit.Before;
-import org.junit.Test;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.datanucleus.testing.dom.CustomerAsProxiedByDataNucleus;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
import org.apache.isis.core.metamodel.facets.ObjectSpecIdFacetFactory;
import org.apache.isis.core.metamodel.facets.object.objectspecid.classname.ObjectSpecIdFacetDerivedFromClassName;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/layout/annotation/LabelAtFacetForParameterLayoutAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/layout/annotation/LabelAtFacetForParameterLayoutAnnotationFactoryTest.java
index cc909de..a31cc82 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/layout/annotation/LabelAtFacetForParameterLayoutAnnotationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/layout/annotation/LabelAtFacetForParameterLayoutAnnotationFactoryTest.java
@@ -19,13 +19,13 @@
package org.apache.isis.core.metamodel.facets.param.layout.annotation;
-import java.lang.reflect.Method;
-
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
+import java.lang.reflect.Method;
+
import org.apache.isis.applib.annotation.LabelPosition;
import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.core.metamodel.facetapi.Facet;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/layout/annotation/NamedFacetForParameterLayoutAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/layout/annotation/NamedFacetForParameterLayoutAnnotationFactoryTest.java
index c1d651cb61..7cfe286 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/layout/annotation/NamedFacetForParameterLayoutAnnotationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/layout/annotation/NamedFacetForParameterLayoutAnnotationFactoryTest.java
@@ -19,14 +19,14 @@
package org.apache.isis.core.metamodel.facets.param.layout.annotation;
-import java.lang.reflect.Method;
-
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
+import java.lang.reflect.Method;
+
import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.FacetFactory;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/name/ParameterNameFacetTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/name/ParameterNameFacetTest.java
index 20a3fce..1e4b1f3 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/name/ParameterNameFacetTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/name/ParameterNameFacetTest.java
@@ -18,6 +18,9 @@
*/
package org.apache.isis.core.metamodel.facets.param.name;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
import java.lang.reflect.Method;
import org.junit.After;
@@ -25,9 +28,6 @@ import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.commons.internal.reflection._Reflect;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactoryTest.java
index 93fd457..122ad52 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactoryTest.java
@@ -18,6 +18,10 @@
*/
package org.apache.isis.core.metamodel.facets.param.parameter;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertTrue;
+
import java.lang.reflect.Method;
import java.util.List;
import java.util.regex.Pattern;
@@ -29,10 +33,6 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertTrue;
-
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.applib.spec.Specification;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java
index b3ce526..cecf97b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java
@@ -18,6 +18,9 @@
*/
package org.apache.isis.core.metamodel.facets.properties.promptstyle;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+
import java.util.Optional;
import org.hamcrest.Description;
@@ -29,9 +32,6 @@ import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.core.config.IsisConfiguration;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/DisabledAnnotationOnPropertyFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/DisabledAnnotationOnPropertyFacetFactoryTest.java
index 3edb00c..2230a64 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/DisabledAnnotationOnPropertyFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/DisabledAnnotationOnPropertyFacetFactoryTest.java
@@ -19,11 +19,11 @@
package org.apache.isis.core.metamodel.facets.properties.property;
-import java.lang.reflect.Method;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import java.lang.reflect.Method;
+
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.core.metamodel.facetapi.Facet;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/NotPersistedAnnotationOnPropertyFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/NotPersistedAnnotationOnPropertyFacetFactoryTest.java
index b19f01a..8ebd682 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/NotPersistedAnnotationOnPropertyFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/NotPersistedAnnotationOnPropertyFacetFactoryTest.java
@@ -21,8 +21,8 @@ package org.apache.isis.core.metamodel.facets.properties.property;
import java.lang.reflect.Method;
-import org.apache.isis.applib.annotation.Snapshot;
import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.Snapshot;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.FacetFactory;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
index 0692b73..f00cb70 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
@@ -18,6 +18,10 @@
*/
package org.apache.isis.core.metamodel.facets.properties.property;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertTrue;
+
import java.lang.reflect.Method;
import java.util.List;
import java.util.regex.Pattern;
@@ -29,13 +33,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertTrue;
-
-import org.apache.isis.applib.annotation.Snapshot;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.Snapshot;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.events.domain.PropertyDomainEvent;
import org.apache.isis.applib.spec.Specification;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/specification/SpecificationAndTests.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/specification/SpecificationAndTests.java
index 90783a9..3320bab 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/specification/SpecificationAndTests.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/specification/SpecificationAndTests.java
@@ -19,13 +19,13 @@
package org.apache.isis.core.metamodel.facets.propparam.specification;
-import org.junit.Test;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.junit.Test;
+
import org.apache.isis.applib.spec.Specification;
import org.apache.isis.applib.spec.SpecificationAnd;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/specification/SpecificationNotTests.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/specification/SpecificationNotTests.java
index 9d9ebb1..685b568 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/specification/SpecificationNotTests.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/specification/SpecificationNotTests.java
@@ -19,13 +19,13 @@
package org.apache.isis.core.metamodel.facets.propparam.specification;
-import org.junit.Test;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.junit.Test;
+
import org.apache.isis.applib.spec.Specification;
import org.apache.isis.applib.spec.SpecificationNot;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/specification/SpecificationOrTests.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/specification/SpecificationOrTests.java
index 378b615..a65b37a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/specification/SpecificationOrTests.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/specification/SpecificationOrTests.java
@@ -19,13 +19,13 @@
package org.apache.isis.core.metamodel.facets.propparam.specification;
-import org.junit.Test;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.junit.Test;
+
import org.apache.isis.applib.spec.Specification;
import org.apache.isis.applib.spec.SpecificationOr;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
index adf3035..8ae9a57 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
@@ -19,14 +19,14 @@
package org.apache.isis.core.metamodel.facets.value;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
import java.math.BigDecimal;
import org.junit.Before;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
import org.apache.isis.applib.exceptions.recoverable.TextEntryParseException;
import org.apache.isis.core.metamodel.context.MetaModelContextAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigIntValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigIntValueSemanticsProviderTest.java
index f458a8a..3d5dbf7 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigIntValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigIntValueSemanticsProviderTest.java
@@ -19,14 +19,14 @@
package org.apache.isis.core.metamodel.facets.value;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
import java.math.BigInteger;
import org.junit.Before;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
import org.apache.isis.applib.exceptions.recoverable.TextEntryParseException;
import org.apache.isis.core.metamodel.context.MetaModelContextAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BlobValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BlobValueSemanticsProviderTest.java
index 3eae91a..12b512e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BlobValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BlobValueSemanticsProviderTest.java
@@ -19,13 +19,13 @@
package org.apache.isis.core.metamodel.facets.value;
-import org.junit.Before;
-import org.junit.Test;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.isis.applib.value.Blob;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BooleanValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BooleanValueSemanticsProviderTest.java
index 74c3aad..14f5e0a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BooleanValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BooleanValueSemanticsProviderTest.java
@@ -19,12 +19,12 @@
package org.apache.isis.core.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.junit.Before;
+import org.junit.Test;
+
import org.apache.isis.applib.exceptions.recoverable.TextEntryParseException;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java
index aa2edff..f47e51c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java
@@ -19,12 +19,12 @@
package org.apache.isis.core.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.junit.Before;
+import org.junit.Test;
+
import org.apache.isis.applib.exceptions.recoverable.TextEntryParseException;
import org.apache.isis.core.metamodel.context.MetaModelContextAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/CharacterValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/CharacterValueSemanticsProviderTest.java
index 3c6b6bd..dad010c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/CharacterValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/CharacterValueSemanticsProviderTest.java
@@ -19,12 +19,12 @@
package org.apache.isis.core.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.junit.Before;
+import org.junit.Test;
+
import org.apache.isis.applib.exceptions.recoverable.InvalidEntryException;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ClobValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ClobValueSemanticsProviderTest.java
index 6e93cb8..1b4fe6e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ClobValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ClobValueSemanticsProviderTest.java
@@ -19,13 +19,13 @@
package org.apache.isis.core.metamodel.facets.value;
-import org.junit.Before;
-import org.junit.Test;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.isis.applib.value.Clob;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
index a932e22..fbf6cc9 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
@@ -19,12 +19,12 @@
package org.apache.isis.core.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.junit.Before;
+import org.junit.Test;
+
import org.apache.isis.applib.exceptions.recoverable.TextEntryParseException;
import org.apache.isis.core.metamodel.context.MetaModelContextAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java
index 08d4d16..f5bb7da 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java
@@ -19,12 +19,12 @@
package org.apache.isis.core.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.junit.Before;
+import org.junit.Test;
+
import org.apache.isis.applib.exceptions.recoverable.TextEntryParseException;
import org.apache.isis.core.metamodel.context.MetaModelContextAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java
index 0b02214..c170d11 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java
@@ -19,12 +19,12 @@
package org.apache.isis.core.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.junit.Before;
+import org.junit.Test;
+
import org.apache.isis.applib.exceptions.recoverable.TextEntryParseException;
import org.apache.isis.core.metamodel.context.MetaModelContextAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
index 722c9cc..23530ac 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
@@ -19,6 +19,9 @@
package org.apache.isis.core.metamodel.facets.value;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
import java.sql.Date;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
@@ -28,9 +31,6 @@ import java.util.TimeZone;
import org.junit.Before;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
import org.apache.isis.applib.exceptions.recoverable.TextEntryParseException;
import org.apache.isis.core.metamodel.context.MetaModelContextAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java
index ecdb072..287a3fd 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java
@@ -19,6 +19,8 @@
package org.apache.isis.core.metamodel.facets.value;
+import static org.junit.Assert.assertEquals;
+
import java.sql.Time;
import java.util.Calendar;
import java.util.TimeZone;
@@ -27,8 +29,6 @@ import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
import org.apache.isis.core.metamodel.context.MetaModelContextAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
index 7c5d57a..fc1a476 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
@@ -19,6 +19,9 @@
package org.apache.isis.core.metamodel.facets.value;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Calendar;
@@ -28,9 +31,6 @@ import java.util.TimeZone;
import org.junit.Before;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
import org.apache.isis.applib.exceptions.recoverable.TextEntryParseException;
import org.apache.isis.core.metamodel.context.MetaModelContextAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java
index 9b94271..82be18a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java
@@ -19,12 +19,12 @@
package org.apache.isis.core.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.junit.Before;
+import org.junit.Test;
+
import org.apache.isis.applib.exceptions.recoverable.TextEntryParseException;
import org.apache.isis.core.metamodel.context.MetaModelContextAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/PasswordValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/PasswordValueSemanticsProviderTest.java
index 5d3a432..498fa3b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/PasswordValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/PasswordValueSemanticsProviderTest.java
@@ -19,11 +19,11 @@
package org.apache.isis.core.metamodel.facets.value;
+import static org.junit.Assert.assertEquals;
+
import org.junit.Before;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
import org.apache.isis.applib.value.Password;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java
index 881ec0b..2b7887e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java
@@ -19,12 +19,12 @@
package org.apache.isis.core.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.junit.Before;
+import org.junit.Test;
+
import org.apache.isis.applib.exceptions.recoverable.TextEntryParseException;
import org.apache.isis.core.metamodel.context.MetaModelContextAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/StringValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/StringValueSemanticsProviderTest.java
index 7151092..d1cac8e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/StringValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/StringValueSemanticsProviderTest.java
@@ -19,11 +19,11 @@
package org.apache.isis.core.metamodel.facets.value;
+import static org.junit.Assert.assertEquals;
+
import org.junit.Before;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.value.string.StringValueSemanticsProvider;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
index 3898429..1f8c84b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
@@ -19,6 +19,13 @@
package org.apache.isis.core.metamodel.facets.value;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
import java.util.Locale;
import org.jmock.Expectations;
@@ -29,13 +36,6 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2.Mode;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java
index 4f13a87..b2ec104 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java
@@ -18,6 +18,10 @@
*/
package org.apache.isis.core.metamodel.facets.value.datetimejodalocal;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.joda.time.LocalDateTime;
@@ -25,10 +29,6 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.metamodel._testing.MetaModelContext_forTesting;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/temporal/TemporalAdjustTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/temporal/TemporalAdjustTest.java
index 25da330..85230a4 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/temporal/TemporalAdjustTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/temporal/TemporalAdjustTest.java
@@ -18,6 +18,9 @@
*/
package org.apache.isis.core.metamodel.facets.value.temporal;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
@@ -29,9 +32,6 @@ import java.time.temporal.ChronoUnit;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
class TemporalAdjustTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/feature/ObjectAssociationPredicatesTest_visibleWhere.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/feature/ObjectAssociationPredicatesTest_visibleWhere.java
index 1340046..df1c2d6 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/feature/ObjectAssociationPredicatesTest_visibleWhere.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/feature/ObjectAssociationPredicatesTest_visibleWhere.java
@@ -18,6 +18,9 @@
*/
package org.apache.isis.core.metamodel.feature;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
@@ -33,9 +36,6 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/interactions/InteractionUtils_isA_Test.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/interactions/InteractionUtils_isA_Test.java
index f174dbd..1e45b4b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/interactions/InteractionUtils_isA_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/interactions/InteractionUtils_isA_Test.java
@@ -25,9 +25,8 @@ import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
-import lombok.val;
-
import junit.framework.TestCase;
+import lombok.val;
public class InteractionUtils_isA_Test extends TestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/ObjectActionLayoutXmlDefaultTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/ObjectActionLayoutXmlDefaultTest.java
index dd65ab2..848bea7 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/ObjectActionLayoutXmlDefaultTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/ObjectActionLayoutXmlDefaultTest.java
@@ -18,17 +18,17 @@
*/
package org.apache.isis.core.metamodel.objects;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertEquals;
+
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertEquals;
-
import org.apache.isis.applib.Identifier;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2.Mode;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/OneToManyAssociationDefaultTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/OneToManyAssociationDefaultTest.java
index 4d0d0e7..7d0dadd 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/OneToManyAssociationDefaultTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/OneToManyAssociationDefaultTest.java
@@ -19,23 +19,21 @@
package org.apache.isis.core.metamodel.objects;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertNotNull;
-
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.core.metamodel._testing.MetaModelContext_forTesting;
-import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.core.metamodel.id.TypeIdentifierTestFactory;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/TypeExtractorMethodReturnTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/TypeExtractorMethodReturnTest.java
index 4d507f8..ca59e8b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/TypeExtractorMethodReturnTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/TypeExtractorMethodReturnTest.java
@@ -19,15 +19,15 @@
package org.apache.isis.core.metamodel.objects;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.lang.reflect.Method;
import java.util.List;
import java.util.stream.Collectors;
import org.junit.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import org.apache.isis.core.metamodel.specloader.typeextract.TypeExtractor;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/TypeExtractorMethodsParametersTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/TypeExtractorMethodsParametersTest.java
index d10b94d..22f6917 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/TypeExtractorMethodsParametersTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/TypeExtractorMethodsParametersTest.java
@@ -19,15 +19,15 @@
package org.apache.isis.core.metamodel.objects;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.lang.reflect.Method;
import java.util.List;
import java.util.stream.Collectors;
import org.junit.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import org.apache.isis.core.metamodel.specloader.typeextract.TypeExtractor;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefaultTest_usingFields.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefaultTest_usingFields.java
index 1c79df1..914b63d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefaultTest_usingFields.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefaultTest_usingFields.java
@@ -19,6 +19,9 @@
package org.apache.isis.core.metamodel.services;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.any;
+
import javax.inject.Inject;
import javax.inject.Singleton;
@@ -32,9 +35,6 @@ import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.annotation.DirtiesContext.ClassMode;
import org.springframework.test.context.ActiveProfiles;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.any;
-
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.core.config.IsisModuleCoreConfig;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefaultTest_validateServices.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefaultTest_validateServices.java
index 529d522..25806e3 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefaultTest_validateServices.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefaultTest_validateServices.java
@@ -19,6 +19,9 @@
package org.apache.isis.core.metamodel.services;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
import javax.inject.Inject;
import org.junit.jupiter.api.BeforeEach;
@@ -29,9 +32,6 @@ import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Component;
import org.springframework.test.context.ActiveProfiles;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
-
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.commons.internal.context._Context;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefaultTest_validateServices_happy.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefaultTest_validateServices_happy.java
index 3a6aff5..003eff4 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefaultTest_validateServices_happy.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefaultTest_validateServices_happy.java
@@ -19,6 +19,8 @@
package org.apache.isis.core.metamodel.services;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import javax.inject.Inject;
import org.junit.jupiter.api.BeforeEach;
@@ -30,8 +32,6 @@ import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.annotation.DirtiesContext.ClassMode;
import org.springframework.test.context.ActiveProfiles;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.core.config.IsisModuleCoreConfig;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureIdTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureIdTest.java
index c560dad..e9ba363 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureIdTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureIdTest.java
@@ -18,14 +18,6 @@
*/
package org.apache.isis.core.metamodel.services.appfeat;
-import java.util.Arrays;
-import java.util.List;
-import java.util.function.Function;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
@@ -35,6 +27,14 @@ import static org.hamcrest.Matchers.emptyCollectionOf;
import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.lessThan;
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Function;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
import org.apache.isis.applib.services.appfeat.ApplicationFeatureId;
import org.apache.isis.applib.services.appfeat.ApplicationFeatureSort;
import org.apache.isis.core.internaltestsupport.contract.ValueTypeContractTestAbstract;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java
index bfa50bc..ff3d3bf 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java
@@ -18,6 +18,13 @@
*/
package org.apache.isis.core.metamodel.services.appfeat;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+
import java.util.List;
import org.hamcrest.Matchers;
@@ -30,13 +37,6 @@ import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.appfeat.ApplicationFeature;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureTest.java
index 65abb37..bade341 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureTest.java
@@ -19,14 +19,14 @@
package org.apache.isis.core.metamodel.services.appfeat;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsInAnyOrder;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
import org.apache.isis.applib.services.appfeat.ApplicationFeatureId;
import org.apache.isis.applib.services.appfeat.ApplicationMemberSort;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureTypeTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureTypeTest.java
index 9c060f9..be893ac 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureTypeTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureTypeTest.java
@@ -18,14 +18,14 @@
*/
package org.apache.isis.core.metamodel.services.appfeat;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
import org.apache.isis.applib.services.appfeat.ApplicationFeatureId;
import org.apache.isis.applib.services.appfeat.ApplicationFeatureSort;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/exceprecog/ExceptionRecognizerForRecoverableException_recognizes_Test.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/exceprecog/ExceptionRecognizerForRecoverableException_recognizes_Test.java
index 805078b..595991e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/exceprecog/ExceptionRecognizerForRecoverableException_recognizes_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/exceprecog/ExceptionRecognizerForRecoverableException_recognizes_Test.java
@@ -19,15 +19,15 @@
package org.apache.isis.core.metamodel.services.exceprecog;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import java.util.Optional;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2.Mode;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/BS3GridTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/BS3GridTest.java
index 4309f65..c2d34b7 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/BS3GridTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/BS3GridTest.java
@@ -18,6 +18,10 @@
*/
package org.apache.isis.core.metamodel.services.grid;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import java.util.Map;
import javax.xml.bind.Marshaller;
@@ -26,10 +30,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
import org.apache.isis.applib.layout.component.ActionLayoutData;
import org.apache.isis.applib.layout.component.CollectionLayoutData;
import org.apache.isis.applib.layout.component.DomainObjectLayoutData;
@@ -42,7 +42,6 @@ import org.apache.isis.applib.layout.grid.bootstrap3.BS3Tab;
import org.apache.isis.applib.layout.grid.bootstrap3.BS3TabGroup;
import org.apache.isis.applib.services.jaxb.IsisSchemas;
import org.apache.isis.applib.services.jaxb.JaxbService;
-import org.apache.isis.applib.services.jaxb.JaxbService.Simple;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.core.metamodel.services.grid.bootstrap3.GridSystemServiceBS3;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault_resourceNameFor_Test.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault_resourceNameFor_Test.java
index 90132bf..5017e7a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault_resourceNameFor_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault_resourceNameFor_Test.java
@@ -18,13 +18,13 @@
*/
package org.apache.isis.core.metamodel.services.grid;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-
public class GridLoaderServiceDefault_resourceNameFor_Test {
private GridLoaderServiceDefault gridLoaderServiceDefault;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefaultTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefaultTest.java
index 237762b..77c7b8c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefaultTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefaultTest.java
@@ -18,15 +18,15 @@
*/
package org.apache.isis.core.metamodel.services.title;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.when;
+
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentMatchers;
import org.mockito.Mockito;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.when;
-
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.metamodel._testing.MetaModelContext_forTesting;
import org.apache.isis.core.metamodel.context.MetaModelContext;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefaultTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefaultTest.java
index c5aedef..994688b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefaultTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefaultTest.java
@@ -18,6 +18,11 @@
*/
package org.apache.isis.core.metamodel.specloader;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.After;
@@ -25,11 +30,6 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertSame;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-
import org.apache.isis.applib.id.LogicalType;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2.Mode;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java
index 82b4aa5..76514b1 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java
@@ -19,19 +19,19 @@
package org.apache.isis.core.metamodel.specloader;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.mockito.Mockito.when;
+
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.springframework.core.env.ConfigurableEnvironment;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.mockito.Mockito.when;
-
import org.apache.isis.applib.services.grid.GridService;
-import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.i18n.Mode;
+import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.applib.services.title.TitleService;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_array.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_array.java
index 35bcb89..884e31b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_array.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_array.java
@@ -19,12 +19,12 @@
package org.apache.isis.core.metamodel.specloader;
-import org.junit.jupiter.api.Test;
-
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.junit.jupiter.api.Test;
+
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.core.metamodel.facets.collections.CollectionFacet;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_collection.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_collection.java
index 08cb998..49df6bb 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_collection.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_collection.java
@@ -19,14 +19,14 @@
package org.apache.isis.core.metamodel.specloader;
-import java.util.Vector;
-
-import org.junit.jupiter.api.Test;
-
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 java.util.Vector;
+
+import org.junit.jupiter.api.Test;
+
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.core.metamodel.facets.collections.CollectionFacet;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_value.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_value.java
index c669865..e4b1f41 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_value.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_value.java
@@ -19,11 +19,11 @@
package org.apache.isis.core.metamodel.specloader;
-import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
+
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
class SpecificationLoaderTest_value extends SpecificationLoaderTestAbstract {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorTest_getClass.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorTest_getClass.java
index ad065ba..6fb8846 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorTest_getClass.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorTest_getClass.java
@@ -19,11 +19,11 @@
package org.apache.isis.core.metamodel.specloader.classsubstitutor;
+import static org.junit.Assert.assertEquals;
+
import org.junit.Before;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.core.metamodel.services.classsubstitutor.ClassSubstitutor;
import org.apache.isis.core.metamodel.services.classsubstitutor.ClassSubstitutorDefault;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/IntrospectionState_comparable_Test.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/IntrospectionState_comparable_Test.java
index 66f80c0..0439a34 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/IntrospectionState_comparable_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/IntrospectionState_comparable_Test.java
@@ -18,14 +18,14 @@
*/
package org.apache.isis.core.metamodel.specloader.specimpl;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import org.hamcrest.Description;
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
public class IntrospectionState_comparable_Test {
@Test
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedInTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedInTest.java
index d94fd77..3171e81 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedInTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedInTest.java
@@ -18,11 +18,11 @@
*/
package org.apache.isis.core.metamodel.specloader.specimpl;
-import org.junit.Test;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.junit.Test;
+
import org.apache.isis.core.metamodel.commons.StringExtensions;
public class ObjectActionMixedInTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
index 5ffde69..9d99808 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
@@ -19,6 +19,9 @@
package org.apache.isis.core.metamodel.specloader.specimpl;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import java.util.function.Predicate;
import org.jmock.Expectations;
@@ -27,9 +30,6 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
index 2f08b70..3fd804e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
@@ -19,15 +19,15 @@
package org.apache.isis.core.metamodel.specloader.specimpl;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.commons.collections.Can;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
index 51bbcbd..be64592 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
@@ -19,17 +19,17 @@
package org.apache.isis.core.metamodel.specloader.specimpl;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.commons.collections.Can;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstractTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstractTest.java
index 3e3ae49..eb558e9 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstractTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstractTest.java
@@ -18,12 +18,12 @@
*/
package org.apache.isis.core.metamodel.specloader.specimpl;
+import static org.hamcrest.CoreMatchers.equalTo;
+
import org.hamcrest.CoreMatchers;
import org.junit.Assert;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.equalTo;
-
public class ObjectMemberAbstractTest {
@Test
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationAbstractTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationAbstractTest.java
index 79716b5..03551a5 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationAbstractTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationAbstractTest.java
@@ -19,15 +19,15 @@
package org.apache.isis.core.metamodel.specloader.specimpl;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.commons.collections.Can;