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 2020/01/04 13:50:33 UTC
[isis] branch master updated (42d9e1b -> 22a2243)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 42d9e1b ISIS-2158: sync adoc
new 72c82ba ISIS-2158: new import order settings (eclipse)
new 22a2243 ISIS-2158: auto organize imports (/core)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../isis/applib/events/InteractionEventTest.java | 6 +++---
...ropertyLayoutData_renderedAsDayBefore_Test.java | 4 ++--
.../component/PropertyLayoutData_repaint_Test.java | 4 ++--
.../bootstrap3/BS3MenuBars_roundtrip_Test.java | 6 +++---
.../ExceptionRecognizerCompositeTest.java | 8 ++++----
.../services/i18n/TranslatableStringTest.java | 4 ++--
.../interaction/InteractionDefaultTest_next.java | 4 ++--
.../applib/services/urlencoding/MementosTest.java | 8 ++++----
.../XmlSnapshotServiceAbstractTest.java | 4 ++--
.../applib/spec/AbstractSpecification2Test.java | 8 ++++----
.../applib/spec/AbstractSpecificationTest.java | 6 +++---
.../org/apache/isis/applib/util/EnumsTest.java | 4 ++--
.../applib/util/ObjectContractsTest_toString.java | 6 +++---
.../applib/util/schema/CommandDtoUtils_Test.java | 6 +++---
.../applib/util/schema/CommonDtoUtils_Test.java | 10 ++++-----
.../schema/CommonDtoUtils_setValueOn_Test.java | 8 ++++----
...eractionDtoUtilsTest_deriveLogicalMemberId.java | 4 ++--
.../apache/isis/applib/util/schema/Roundtrip.java | 10 ++++-----
.../handlers/ChainOfResponsibilityTest.java | 4 ++--
.../isis/commons/internal/base/BytesTest.java | 4 ++--
.../isis/commons/internal/base/ReductionTest.java | 4 ++--
.../isis/commons/internal/base/StringsTest.java | 4 ++--
.../apache/isis/commons/internal/cdi/CDITest.java | 4 ++--
.../internal/cdi/ValidQualifierForTesting.java | 4 ++--
.../commons/internal/collections/_MapsTest.java | 4 ++--
.../commons/internal/compare/ComparatorsTest.java | 4 ++--
.../config/IsisConfiguration_createSubsetTest.java | 4 ++--
.../isis/config/IsisConfiguration_primingTest.java | 4 ++--
.../config/IsisConfiguration_specialCharTest.java | 4 ++--
.../config/IsisConfiguration_whitespaceTest.java | 4 ++--
.../commons/internal/reflection/ReflectTest.java | 5 +++--
.../facets/object/mixin/MixinIntendedAs.java | 4 ++--
.../object/mixin/MixinIntendedAsActionTest.java | 10 ++++-----
.../facets/param/name/ParameterNameFacetTest.java | 6 +++---
.../ImposteriserTestUsingCodegenPlugin.java | 6 +++---
...IsisActionsTest_returnNewTransientInstance.java | 4 ++--
.../jmocking/JMockActionsTest_returnArgument.java | 4 ++--
.../jmocking/JMockActionsTest_returnEach.java | 4 ++--
..._autoWiring_constructorInjection_happyCase.java | 6 +++---
...2Test_autoWiring_setterInjection_happyCase.java | 6 +++---
.../services/appfeat/ApplicationFeatureId.java | 8 ++++----
.../specloader/validator/ValidationFailure.java | 4 ++--
.../metamodel/MetaModelContext_configTest.java | 6 +++---
.../metamodel/MetaModelContext_forTesting.java | 4 ++--
.../isis/metamodel/ServiceInjector_forTesting.java | 4 ++--
.../adapter/oid/OidMarshallerTest_marshall.java | 6 +++---
.../oid/OidMarshallerTest_roundtripping.java | 6 +++---
.../adapter/oid/OidMarshallerTest_unmarshal.java | 4 ++--
.../isis/metamodel/adapter/oid/OidVersionTest.java | 6 +++---
.../metamodel/adapter/oid/RootOidTest_create.java | 6 +++---
.../metamodel/commons/ListUtilsTest_insert.java | 4 ++--
.../metamodel/consent/InteractionResultTest.java | 4 ++--
.../facetapi/FeatureTypeTest_identifierFor.java | 4 ++--
.../Annotations_getAnnotations_on_Class_Test.java | 6 +++---
.../Annotations_getAnnotations_on_Field_Test.java | 6 +++---
.../Annotations_getAnnotations_on_Method_Test.java | 4 ++--
...notations_getAnnotations_on_Parameter_Test.java | 4 ++--
.../isis/metamodel/facets/CollectionUtilsTest.java | 4 ++--
...nEventHelperTest_newActionInteractionEvent.java | 9 ++++----
...HelperTest_newCollectionDomainEvent_forAdd.java | 8 ++++----
...perTest_newCollectionDomainEvent_forRemove.java | 8 ++++----
...HelperTest_newPropertyDomainEvent_forClear.java | 9 ++++----
...elperTest_newPropertyDomainEvent_forModify.java | 6 +++---
.../metamodel/facets/MethodFinderUtilsTest.java | 4 ++--
.../metamodel/facets/ObjectAdapterUtilsTest.java | 6 +++---
.../ActionAnnotationFacetFactoryTest_Command.java | 12 +++++------
.../ActionAnnotationFacetFactoryTest_Hidden.java | 6 +++---
...ctionAnnotationFacetFactoryTest_Invocation.java | 3 ++-
...ctionAnnotationFacetFactoryTest_Publishing.java | 8 ++++----
...ctionAnnotationFacetFactoryTest_RestrictTo.java | 4 ++--
...ActionAnnotationFacetFactoryTest_Semantics.java | 6 +++---
.../ActionAnnotationFacetFactoryTest_TypeOf.java | 3 ++-
...tionLayoutAnnotationFacetFactoryJunit4Test.java | 10 ++++-----
...nLayoutXmlLayoutAnnotationFacetFactoryTest.java | 12 +++++------
...etDerivedFromDomainServiceFacetFactoryTest.java | 12 +++++------
...etDerivedFromDomainServiceFacetFactoryTest.java | 12 +++++------
.../prototype/PrototypeFacetAbstractTest.java | 4 ++--
.../collections/JavaCollectionFacetTest.java | 8 ++++----
.../CollectionAnnotationFacetFactoryTest.java | 5 +++--
...bledAnnotationOnCollectionFacetFactoryTest.java | 6 +++---
...etForCollectionLayoutAnnotationFactoryTest.java | 12 +++++------
.../ViewModelSemanticCheckingFacetFactoryTest.java | 8 ++++----
...okmarkableAnnotationFacetFactoryTest_class.java | 6 +++---
.../DomainObjectAnnotationFacetFactoryTest.java | 8 ++++----
.../ObjectTypeAnnotationFacetFactoryTest.java | 10 ++++-----
.../DomainObjectLayoutFactoryTest.java | 14 ++++++-------
.../DomainServiceLayoutFacetFactoryTest.java | 4 ++--
.../cssclass/CssClassFacetMethodFactoryTest.java | 10 ++++-----
.../ident/cssclass/CssClassFacetMethodTest.java | 8 ++++----
.../CssClassFacetMethodWithProblemTest.java | 8 ++++----
.../ident/icon/IconFacetMethodFactoryTest.java | 10 ++++-----
.../object/ident/icon/IconFacetMethodTest.java | 8 ++++----
.../ident/layout/LayoutFacetFactoryTest.java | 10 ++++-----
.../object/ident/layout/LayoutFacetMethodTest.java | 8 ++++----
.../ident/title/TitleFacetViaMethodTest.java | 6 +++---
.../TitleAnnotationFacetFactoryTest.java | 6 +++---
.../TitleFacetViaTitleAnnotationTest.java | 6 +++---
.../object/layoutxml/GridFacetDefaultTest.java | 4 ++--
.../navparent/NavigableParentFacetMethodTest.java | 8 ++++----
...SpecIdFacetDerivedFromClassNameFactoryTest.java | 10 ++++-----
...cetForParameterLayoutAnnotationFactoryTest.java | 10 ++++-----
...cetForParameterLayoutAnnotationFactoryTest.java | 12 +++++------
.../ParameterAnnotationFacetFactoryTest.java | 8 ++++----
...romptStyleFacetFromPropertyAnnotation_Test.java | 6 +++---
...sabledAnnotationOnPropertyFacetFactoryTest.java | 6 +++---
.../PropertyAnnotationFacetFactoryTest.java | 7 ++++---
...acetForPropertyLayoutAnnotationFactoryTest.java | 12 +++++------
...acetForPropertyLayoutAnnotationFactoryTest.java | 10 ++++-----
.../specification/SpecificationAndTests.java | 6 +++---
.../specification/SpecificationNotTests.java | 6 +++---
.../specification/SpecificationOrTests.java | 6 +++---
.../BigDecimalValueSemanticsProviderTest.java | 6 +++---
.../value/BigIntValueSemanticsProviderTest.java | 6 +++---
.../value/BlobValueSemanticsProviderTest.java | 8 ++++----
.../value/BooleanValueSemanticsProviderTest.java | 6 +++---
.../value/ByteValueSemanticsProviderTest.java | 6 +++---
.../value/CharacterValueSemanticsProviderTest.java | 6 +++---
.../value/ClobValueSemanticsProviderTest.java | 8 ++++----
.../value/DoubleValueSemanticsProviderTest.java | 6 +++---
.../value/FloatValueSemanticsProviderTest.java | 6 +++---
.../ImageValueSemanticsProviderAbstractTest.java | 4 ++--
.../value/IntValueSemanticsProviderTest.java | 6 +++---
.../JavaSqlDateValueSemanticsProviderTest.java | 6 +++---
.../JavaSqlTimeValueSemanticsProviderTest.java | 4 ++--
.../JavaUtilDateValueSemanticsProviderTest.java | 6 +++---
.../value/LongValueSemanticsProviderTest.java | 6 +++---
.../value/PasswordValueSemanticsProviderTest.java | 4 ++--
.../value/ShortValueSemanticsProviderTest.java | 6 +++---
.../value/StringValueSemanticsProviderTest.java | 4 ++--
.../ValueSemanticsProviderAbstractTestCase.java | 14 ++++++-------
...odaLocalDateTimeValueSemanticsProviderTest.java | 8 ++++----
...jectAssociationPredicatesTest_visibleWhere.java | 6 +++---
.../ServiceInjectorDefaultTest_usingFields.java | 6 +++---
...erviceInjectorDefaultTest_validateServices.java | 6 +++---
...InjectorDefaultTest_validateServices_happy.java | 4 ++--
.../services/ServiceInjectorLegacyTest.java | 6 +++---
.../services/appfeat/ApplicationFeatureIdTest.java | 8 ++++----
.../ApplicationFeatureRepositoryDefaultTest.java | 14 ++++++-------
.../services/appfeat/ApplicationFeatureTest.java | 4 ++--
...eptionRecognizerDocDefault_recognizes_Test.java | 6 +++---
.../isis/metamodel/services/grid/BS3GridTest.java | 8 ++++----
.../specloader/SpecificationCacheDefaultTest.java | 10 ++++-----
.../SpecificationLoaderTestAbstract.java | 8 ++++----
.../specloader/SpecificationLoaderTest_array.java | 8 ++++----
.../SpecificationLoaderTest_collection.java | 8 ++++----
.../specloader/SpecificationLoaderTest_value.java | 4 ++--
.../ClassSubstitutorTest_getClass.java | 4 ++--
.../IntrospectionState_comparable_Test.java | 5 +++--
.../specimpl/ObjectActionMixedInTest.java | 4 ++--
...ionParameterAbstractTest_getId_and_getName.java | 6 +++---
.../specimpl/ObjectAssociationAbstractTest.java | 6 +++---
...ObjectAssociationAbstractTest_alwaysHidden.java | 10 ++++-----
.../persistence/PersistenceSession5.java | 3 ++-
.../ObjectReflectorDefaultTest_object.java | 10 ++++-----
...onRecognizerCompositeForJdoObjectStoreTest.java | 6 +++---
...AnnotationFacetFactoryTest_refineMetaModel.java | 6 +++---
...vedFromJdoColumnAnnotationFacetFactoryTest.java | 6 +++---
...vedFromJdoColumnAnnotationFacetFactoryTest.java | 6 +++---
.../adapterfactory/pojo/PojoAdapterTest.java | 4 ++--
.../WrapperFactoryDefault_wrappedObject_Test.java | 8 ++++----
...actoryDefault_wrappedObject_transient_Test.java | 5 +++--
.../runtime/system/ObjectMemberAbstractTest.java | 18 ++++++++--------
.../userreg/EmailNotificationServiceDefault.java | 6 +++---
.../changes/PreAndPostValues_shouldAudit_Test.java | 6 +++---
.../email/EmailServiceDefaultTest_actually.java | 4 ++--
.../runtime/services/i18n/po/PoReaderTest.java | 8 ++++----
.../wrapper/WrapperFactoryDefaultTest.java | 10 ++++-----
.../system/ObjectActionLayoutXmlDefaultTest.java | 10 ++++-----
.../system/OneToManyAssociationDefaultTest.java | 8 ++++----
.../system/TypeExtractorMethodReturnTest.java | 7 ++++---
.../system/TypeExtractorMethodsParametersTest.java | 4 ++--
.../isis/security/EncodabilityContractTest.java | 10 ++++-----
.../AuthenticationManager_authenticators_Test.java | 8 ++++----
.../SimpleSessionEncodabilityTestAbstract.java | 6 +++---
...rdAuthenticationManager_AuthenticationTest.java | 6 +++---
.../shiro/IsisPermissionTest_setParts.java | 4 ++--
.../shiro/IsisPermissionTest_typicalUsage.java | 4 ++--
...AuthenticatorOrAuthorizorTest_authenticate.java | 10 ++++-----
...ticatorOrAuthorizorTest_isVisibleInAnyRole.java | 6 +++---
.../PermissionToRoleMapperFromIniTest.java | 4 ++--
.../PermissionToRoleMapperFromStringTest.java | 4 ++--
...irectionalRelationshipContractTestAbstract.java | 9 ++++----
.../comparable/ComparableContractTester.java | 4 ++--
...rviceMethodMustBeFinalContractTestAbstract.java | 5 +++--
.../jmocking/JUnitRuleMockery2.java | 9 ++++----
.../sortedsets/SortedSetsContractTestAbstract.java | 5 +++--
...resentationTest_arrayGet_arraySetElementAt.java | 3 ++-
.../JsonRepresentationTest_asInputStream.java | 9 ++++----
.../applib/JsonRepresentationTest_getArray.java | 3 ++-
.../JsonRepresentationTest_getBigDecimal.java | 3 ++-
.../JsonRepresentationTest_getBigInteger.java | 3 ++-
.../applib/JsonRepresentationTest_getBoolean.java | 3 ++-
.../applib/JsonRepresentationTest_getDouble.java | 3 ++-
.../applib/JsonRepresentationTest_getInt.java | 3 ++-
.../JsonRepresentationTest_getLink_isLink.java | 3 ++-
.../applib/JsonRepresentationTest_getLong.java | 3 ++-
.../JsonRepresentationTest_getNull_isNull.java | 3 ++-
.../JsonRepresentationTest_getRepresentation.java | 3 ++-
.../JsonRepresentationTest_getString_isString.java | 3 ++-
...onRepresentationTest_isArray_isMap_isValue.java | 3 ++-
.../applib/JsonRepresentationTest_mapHas.java | 3 ++-
.../applib/JsonRepresentationTest_size.java | 3 ++-
...JsonRepresentationTest_streamArrayElements.java | 3 ++-
.../JsonRepresentationTest_streamMapEntries.java | 3 ++-
...RepresentationTypeTest_parser_ContractTest.java | 4 ++--
.../RestfulRequest_DomainModelTest_parser.java | 4 ++--
...equestParameterTest_valueOf_xrodomainmodel.java | 6 +++---
...equestParameterTest_valueOf_xrofollowlinks.java | 6 +++---
.../client/RestfulResponse_HttpStatusCodeTest.java | 4 ++--
...mainObjectRepresentationTest_getCollection.java | 7 ++++---
...ainObjectRepresentationTest_getCollections.java | 5 +++--
...mainObjectRepresentationTest_getProperties.java | 5 +++--
...DomainObjectRepresentationTest_getProperty.java | 7 ++++---
.../Parser_forJaxRsMediaType_ContractTest.java | 4 ++--
.../rendering/LinkFollowSpecsTest_follow.java | 6 +++---
.../JsonValueEncoderTest_appendValueAndFormat.java | 8 ++++----
.../JsonValueEncoderTest_asAdapter.java | 10 ++++-----
.../JsonValueEncoderTest_asObject.java | 6 +++---
..._ensureCompatibleAcceptHeader_ContractTest.java | 6 +++---
.../context/ResourceContext_getArg_Test.java | 6 +++---
...tsApplicationExceptionMapper_Test_Contract.java | 10 ++++-----
.../viewer/util/UrlParserUtils_Test.java | 4 ++--
...ulObjectsSessionFilter_lookupPassThru_Test.java | 4 ++--
.../wicket/model/models/EntityModel_hintsTest.java | 8 ++++----
.../models/LowestCommonSuperclassClosureTest.java | 4 ++--
.../ScalarModel_isScalarSubtypingAnyOf_Test.java | 8 ++++----
.../datepicker/TextFieldWithDateTimePicker.java | 4 ++--
...ollectionContentsSelectorDropdownPanelTest.java | 6 +++---
.../jdkdates/DateConverterForJavaSqlDateTest.java | 6 +++---
.../jdkdates/DateConverterForJavaUtilDateTest.java | 6 +++---
.../jodatime/DateConverterForJodaDateTimeTest.java | 6 +++---
.../DateConverterForJodaLocalDateTest.java | 6 +++---
.../DateConverterForJodaLocalDateTimeTest.java | 6 +++---
.../DateConverterForJdk8LocalDateTest.java | 6 +++---
.../DateConverterForJdk8LocalDateTimeTest.java | 6 +++---
.../DateConverterForJdk8OffsetDateTimeTest.java | 6 +++---
...tAdapterMementoProviderForValueChoicesTest.java | 4 ++--
.../viewer/wicket/ui/pages/PageAbstractTest.java | 4 ++--
.../wicket/viewer/webmodule/WebModuleWicket.java | 4 ++--
.../viewer/wicketapp/IsisWicketApplication.java | 3 ++-
...uthenticatedWebSessionForIsis_Authenticate.java | 10 ++++-----
.../AuthenticatedWebSessionForIsis_SignIn.java | 6 +++---
...ageClassListDefault_RegistrationAndCaching.java | 8 ++++----
.../wicketapp/IsisWicketApplication_Defaults.java | 10 ++++-----
.../wicketapp/IsisWicketApplication_Pages.java | 6 +++---
ide-settings/eclipse/eclipse-settings.importorder | 24 ++++++++++++++--------
246 files changed, 794 insertions(+), 748 deletions(-)
[isis] 02/02: ISIS-2158: auto organize imports (/core)
Posted by ah...@apache.org.
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
commit 22a22438c86100ad77c40c1148601fb63dee22d3
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Jan 4 14:50:19 2020 +0100
ISIS-2158: auto organize imports (/core)
---
.../isis/applib/events/InteractionEventTest.java | 6 +++---
.../PropertyLayoutData_renderedAsDayBefore_Test.java | 4 ++--
.../component/PropertyLayoutData_repaint_Test.java | 4 ++--
.../bootstrap3/BS3MenuBars_roundtrip_Test.java | 6 +++---
.../exceprecog/ExceptionRecognizerCompositeTest.java | 8 ++++----
.../applib/services/i18n/TranslatableStringTest.java | 4 ++--
.../interaction/InteractionDefaultTest_next.java | 4 ++--
.../isis/applib/services/urlencoding/MementosTest.java | 8 ++++----
.../xmlsnapshot/XmlSnapshotServiceAbstractTest.java | 4 ++--
.../isis/applib/spec/AbstractSpecification2Test.java | 8 ++++----
.../isis/applib/spec/AbstractSpecificationTest.java | 6 +++---
.../java/org/apache/isis/applib/util/EnumsTest.java | 4 ++--
.../isis/applib/util/ObjectContractsTest_toString.java | 6 +++---
.../isis/applib/util/schema/CommandDtoUtils_Test.java | 6 +++---
.../isis/applib/util/schema/CommonDtoUtils_Test.java | 10 +++++-----
.../util/schema/CommonDtoUtils_setValueOn_Test.java | 8 ++++----
.../InteractionDtoUtilsTest_deriveLogicalMemberId.java | 4 ++--
.../org/apache/isis/applib/util/schema/Roundtrip.java | 10 +++++-----
.../commons/handlers/ChainOfResponsibilityTest.java | 4 ++--
.../apache/isis/commons/internal/base/BytesTest.java | 4 ++--
.../isis/commons/internal/base/ReductionTest.java | 4 ++--
.../apache/isis/commons/internal/base/StringsTest.java | 4 ++--
.../org/apache/isis/commons/internal/cdi/CDITest.java | 4 ++--
.../commons/internal/cdi/ValidQualifierForTesting.java | 4 ++--
.../isis/commons/internal/collections/_MapsTest.java | 4 ++--
.../isis/commons/internal/compare/ComparatorsTest.java | 4 ++--
.../config/IsisConfiguration_createSubsetTest.java | 4 ++--
.../isis/config/IsisConfiguration_primingTest.java | 4 ++--
.../isis/config/IsisConfiguration_specialCharTest.java | 4 ++--
.../isis/config/IsisConfiguration_whitespaceTest.java | 4 ++--
.../isis/commons/internal/reflection/ReflectTest.java | 5 +++--
.../metamodel/facets/object/mixin/MixinIntendedAs.java | 4 ++--
.../facets/object/mixin/MixinIntendedAsActionTest.java | 10 +++++-----
.../facets/param/name/ParameterNameFacetTest.java | 6 +++---
.../jmocking/ImposteriserTestUsingCodegenPlugin.java | 6 +++---
.../IsisActionsTest_returnNewTransientInstance.java | 4 ++--
.../jmocking/JMockActionsTest_returnArgument.java | 4 ++--
.../jmocking/JMockActionsTest_returnEach.java | 4 ++--
...Test_autoWiring_constructorInjection_happyCase.java | 6 +++---
...kery2Test_autoWiring_setterInjection_happyCase.java | 6 +++---
.../services/appfeat/ApplicationFeatureId.java | 8 ++++----
.../specloader/validator/ValidationFailure.java | 4 ++--
.../isis/metamodel/MetaModelContext_configTest.java | 6 +++---
.../isis/metamodel/MetaModelContext_forTesting.java | 4 ++--
.../isis/metamodel/ServiceInjector_forTesting.java | 4 ++--
.../adapter/oid/OidMarshallerTest_marshall.java | 6 +++---
.../adapter/oid/OidMarshallerTest_roundtripping.java | 6 +++---
.../adapter/oid/OidMarshallerTest_unmarshal.java | 4 ++--
.../isis/metamodel/adapter/oid/OidVersionTest.java | 6 +++---
.../isis/metamodel/adapter/oid/RootOidTest_create.java | 6 +++---
.../isis/metamodel/commons/ListUtilsTest_insert.java | 4 ++--
.../isis/metamodel/consent/InteractionResultTest.java | 4 ++--
.../facetapi/FeatureTypeTest_identifierFor.java | 4 ++--
.../Annotations_getAnnotations_on_Class_Test.java | 6 +++---
.../Annotations_getAnnotations_on_Field_Test.java | 6 +++---
.../Annotations_getAnnotations_on_Method_Test.java | 4 ++--
.../Annotations_getAnnotations_on_Parameter_Test.java | 4 ++--
.../isis/metamodel/facets/CollectionUtilsTest.java | 4 ++--
...omainEventHelperTest_newActionInteractionEvent.java | 9 +++++----
...ventHelperTest_newCollectionDomainEvent_forAdd.java | 8 ++++----
...tHelperTest_newCollectionDomainEvent_forRemove.java | 8 ++++----
...ventHelperTest_newPropertyDomainEvent_forClear.java | 9 +++++----
...entHelperTest_newPropertyDomainEvent_forModify.java | 6 +++---
.../isis/metamodel/facets/MethodFinderUtilsTest.java | 4 ++--
.../isis/metamodel/facets/ObjectAdapterUtilsTest.java | 6 +++---
.../ActionAnnotationFacetFactoryTest_Command.java | 12 ++++++------
.../ActionAnnotationFacetFactoryTest_Hidden.java | 6 +++---
.../ActionAnnotationFacetFactoryTest_Invocation.java | 3 ++-
.../ActionAnnotationFacetFactoryTest_Publishing.java | 8 ++++----
.../ActionAnnotationFacetFactoryTest_RestrictTo.java | 4 ++--
.../ActionAnnotationFacetFactoryTest_Semantics.java | 6 +++---
.../ActionAnnotationFacetFactoryTest_TypeOf.java | 3 ++-
.../ActionLayoutAnnotationFacetFactoryJunit4Test.java | 10 +++++-----
...ctionLayoutXmlLayoutAnnotationFacetFactoryTest.java | 12 ++++++------
...dFacetDerivedFromDomainServiceFacetFactoryTest.java | 12 ++++++------
...uFacetDerivedFromDomainServiceFacetFactoryTest.java | 12 ++++++------
.../actions/prototype/PrototypeFacetAbstractTest.java | 4 ++--
.../facets/collections/JavaCollectionFacetTest.java | 8 ++++----
.../CollectionAnnotationFacetFactoryTest.java | 5 +++--
...DisabledAnnotationOnCollectionFacetFactoryTest.java | 6 +++---
...dFacetForCollectionLayoutAnnotationFactoryTest.java | 12 ++++++------
.../ViewModelSemanticCheckingFacetFactoryTest.java | 8 ++++----
.../BookmarkableAnnotationFacetFactoryTest_class.java | 6 +++---
.../DomainObjectAnnotationFacetFactoryTest.java | 8 ++++----
.../ObjectTypeAnnotationFacetFactoryTest.java | 10 +++++-----
.../DomainObjectLayoutFactoryTest.java | 14 +++++++-------
.../DomainServiceLayoutFacetFactoryTest.java | 4 ++--
.../ident/cssclass/CssClassFacetMethodFactoryTest.java | 10 +++++-----
.../object/ident/cssclass/CssClassFacetMethodTest.java | 8 ++++----
.../cssclass/CssClassFacetMethodWithProblemTest.java | 8 ++++----
.../object/ident/icon/IconFacetMethodFactoryTest.java | 10 +++++-----
.../facets/object/ident/icon/IconFacetMethodTest.java | 8 ++++----
.../object/ident/layout/LayoutFacetFactoryTest.java | 10 +++++-----
.../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 | 4 ++--
.../navparent/NavigableParentFacetMethodTest.java | 8 ++++----
...jectSpecIdFacetDerivedFromClassNameFactoryTest.java | 10 +++++-----
...AtFacetForParameterLayoutAnnotationFactoryTest.java | 10 +++++-----
...edFacetForParameterLayoutAnnotationFactoryTest.java | 12 ++++++------
.../parameter/ParameterAnnotationFacetFactoryTest.java | 8 ++++----
.../PromptStyleFacetFromPropertyAnnotation_Test.java | 6 +++---
.../DisabledAnnotationOnPropertyFacetFactoryTest.java | 6 +++---
.../property/PropertyAnnotationFacetFactoryTest.java | 7 ++++---
...lAtFacetForPropertyLayoutAnnotationFactoryTest.java | 12 ++++++------
...medFacetForPropertyLayoutAnnotationFactoryTest.java | 10 +++++-----
.../propparam/specification/SpecificationAndTests.java | 6 +++---
.../propparam/specification/SpecificationNotTests.java | 6 +++---
.../propparam/specification/SpecificationOrTests.java | 6 +++---
.../value/BigDecimalValueSemanticsProviderTest.java | 6 +++---
.../facets/value/BigIntValueSemanticsProviderTest.java | 6 +++---
.../facets/value/BlobValueSemanticsProviderTest.java | 8 ++++----
.../value/BooleanValueSemanticsProviderTest.java | 6 +++---
.../facets/value/ByteValueSemanticsProviderTest.java | 6 +++---
.../value/CharacterValueSemanticsProviderTest.java | 6 +++---
.../facets/value/ClobValueSemanticsProviderTest.java | 8 ++++----
.../facets/value/DoubleValueSemanticsProviderTest.java | 6 +++---
.../facets/value/FloatValueSemanticsProviderTest.java | 6 +++---
.../value/ImageValueSemanticsProviderAbstractTest.java | 4 ++--
.../facets/value/IntValueSemanticsProviderTest.java | 6 +++---
.../value/JavaSqlDateValueSemanticsProviderTest.java | 6 +++---
.../value/JavaSqlTimeValueSemanticsProviderTest.java | 4 ++--
.../value/JavaUtilDateValueSemanticsProviderTest.java | 6 +++---
.../facets/value/LongValueSemanticsProviderTest.java | 6 +++---
.../value/PasswordValueSemanticsProviderTest.java | 4 ++--
.../facets/value/ShortValueSemanticsProviderTest.java | 6 +++---
.../facets/value/StringValueSemanticsProviderTest.java | 4 ++--
.../value/ValueSemanticsProviderAbstractTestCase.java | 14 +++++++-------
.../JodaLocalDateTimeValueSemanticsProviderTest.java | 8 ++++----
.../ObjectAssociationPredicatesTest_visibleWhere.java | 6 +++---
.../ServiceInjectorDefaultTest_usingFields.java | 6 +++---
.../ServiceInjectorDefaultTest_validateServices.java | 6 +++---
...viceInjectorDefaultTest_validateServices_happy.java | 4 ++--
.../metamodel/services/ServiceInjectorLegacyTest.java | 6 +++---
.../services/appfeat/ApplicationFeatureIdTest.java | 8 ++++----
.../ApplicationFeatureRepositoryDefaultTest.java | 14 +++++++-------
.../services/appfeat/ApplicationFeatureTest.java | 4 ++--
.../ExceptionRecognizerDocDefault_recognizes_Test.java | 6 +++---
.../isis/metamodel/services/grid/BS3GridTest.java | 8 ++++----
.../specloader/SpecificationCacheDefaultTest.java | 10 +++++-----
.../specloader/SpecificationLoaderTestAbstract.java | 8 ++++----
.../specloader/SpecificationLoaderTest_array.java | 8 ++++----
.../specloader/SpecificationLoaderTest_collection.java | 8 ++++----
.../specloader/SpecificationLoaderTest_value.java | 4 ++--
.../ClassSubstitutorTest_getClass.java | 4 ++--
.../specimpl/IntrospectionState_comparable_Test.java | 5 +++--
.../specloader/specimpl/ObjectActionMixedInTest.java | 4 ++--
...tActionParameterAbstractTest_getId_and_getName.java | 6 +++---
.../specimpl/ObjectAssociationAbstractTest.java | 6 +++---
.../ObjectAssociationAbstractTest_alwaysHidden.java | 10 +++++-----
.../datanucleus5/persistence/PersistenceSession5.java | 3 ++-
.../specloader/ObjectReflectorDefaultTest_object.java | 10 +++++-----
...eptionRecognizerCompositeForJdoObjectStoreTest.java | 6 +++---
...sionAnnotationFacetFactoryTest_refineMetaModel.java | 6 +++---
...DerivedFromJdoColumnAnnotationFacetFactoryTest.java | 6 +++---
...DerivedFromJdoColumnAnnotationFacetFactoryTest.java | 6 +++---
.../adapterfactory/pojo/PojoAdapterTest.java | 4 ++--
.../WrapperFactoryDefault_wrappedObject_Test.java | 8 ++++----
...perFactoryDefault_wrappedObject_transient_Test.java | 5 +++--
.../isis/runtime/system/ObjectMemberAbstractTest.java | 18 +++++++++---------
.../userreg/EmailNotificationServiceDefault.java | 6 +++---
.../changes/PreAndPostValues_shouldAudit_Test.java | 6 +++---
.../email/EmailServiceDefaultTest_actually.java | 4 ++--
.../isis/runtime/services/i18n/po/PoReaderTest.java | 8 ++++----
.../services/wrapper/WrapperFactoryDefaultTest.java | 10 +++++-----
.../system/ObjectActionLayoutXmlDefaultTest.java | 10 +++++-----
.../system/OneToManyAssociationDefaultTest.java | 8 ++++----
.../runtime/system/TypeExtractorMethodReturnTest.java | 7 ++++---
.../system/TypeExtractorMethodsParametersTest.java | 4 ++--
.../apache/isis/security/EncodabilityContractTest.java | 10 +++++-----
.../AuthenticationManager_authenticators_Test.java | 8 ++++----
.../SimpleSessionEncodabilityTestAbstract.java | 6 +++---
...andardAuthenticationManager_AuthenticationTest.java | 6 +++---
.../security/shiro/IsisPermissionTest_setParts.java | 4 ++--
.../shiro/IsisPermissionTest_typicalUsage.java | 4 ++--
...hiroAuthenticatorOrAuthorizorTest_authenticate.java | 10 +++++-----
...thenticatorOrAuthorizorTest_isVisibleInAnyRole.java | 6 +++---
.../PermissionToRoleMapperFromIniTest.java | 4 ++--
.../PermissionToRoleMapperFromStringTest.java | 4 ++--
.../BidirectionalRelationshipContractTestAbstract.java | 9 +++++----
.../comparable/ComparableContractTester.java | 4 ++--
...ctServiceMethodMustBeFinalContractTestAbstract.java | 5 +++--
.../unittestsupport/jmocking/JUnitRuleMockery2.java | 9 +++++----
.../sortedsets/SortedSetsContractTestAbstract.java | 5 +++--
...nRepresentationTest_arrayGet_arraySetElementAt.java | 3 ++-
.../applib/JsonRepresentationTest_asInputStream.java | 9 +++++----
.../applib/JsonRepresentationTest_getArray.java | 3 ++-
.../applib/JsonRepresentationTest_getBigDecimal.java | 3 ++-
.../applib/JsonRepresentationTest_getBigInteger.java | 3 ++-
.../applib/JsonRepresentationTest_getBoolean.java | 3 ++-
.../applib/JsonRepresentationTest_getDouble.java | 3 ++-
.../applib/JsonRepresentationTest_getInt.java | 3 ++-
.../applib/JsonRepresentationTest_getLink_isLink.java | 3 ++-
.../applib/JsonRepresentationTest_getLong.java | 3 ++-
.../applib/JsonRepresentationTest_getNull_isNull.java | 3 ++-
.../JsonRepresentationTest_getRepresentation.java | 3 ++-
.../JsonRepresentationTest_getString_isString.java | 3 ++-
.../JsonRepresentationTest_isArray_isMap_isValue.java | 3 ++-
.../applib/JsonRepresentationTest_mapHas.java | 3 ++-
.../applib/JsonRepresentationTest_size.java | 3 ++-
.../JsonRepresentationTest_streamArrayElements.java | 3 ++-
.../JsonRepresentationTest_streamMapEntries.java | 3 ++-
.../RepresentationTypeTest_parser_ContractTest.java | 4 ++--
.../client/RestfulRequest_DomainModelTest_parser.java | 4 ++--
...st_RequestParameterTest_valueOf_xrodomainmodel.java | 6 +++---
...st_RequestParameterTest_valueOf_xrofollowlinks.java | 6 +++---
.../client/RestfulResponse_HttpStatusCodeTest.java | 4 ++--
.../DomainObjectRepresentationTest_getCollection.java | 7 ++++---
.../DomainObjectRepresentationTest_getCollections.java | 5 +++--
.../DomainObjectRepresentationTest_getProperties.java | 5 +++--
.../DomainObjectRepresentationTest_getProperty.java | 7 ++++---
.../util/Parser_forJaxRsMediaType_ContractTest.java | 4 ++--
.../rendering/LinkFollowSpecsTest_follow.java | 6 +++---
.../JsonValueEncoderTest_appendValueAndFormat.java | 8 ++++----
.../domainobjects/JsonValueEncoderTest_asAdapter.java | 10 +++++-----
.../domainobjects/JsonValueEncoderTest_asObject.java | 6 +++---
...text_ensureCompatibleAcceptHeader_ContractTest.java | 6 +++---
.../viewer/context/ResourceContext_getArg_Test.java | 6 +++---
...bjectsApplicationExceptionMapper_Test_Contract.java | 10 +++++-----
.../viewer/util/UrlParserUtils_Test.java | 4 ++--
...estfulObjectsSessionFilter_lookupPassThru_Test.java | 4 ++--
.../wicket/model/models/EntityModel_hintsTest.java | 8 ++++----
.../models/LowestCommonSuperclassClosureTest.java | 4 ++--
.../ScalarModel_isScalarSubtypingAnyOf_Test.java | 8 ++++----
.../datepicker/TextFieldWithDateTimePicker.java | 4 ++--
.../CollectionContentsSelectorDropdownPanelTest.java | 6 +++---
.../jdkdates/DateConverterForJavaSqlDateTest.java | 6 +++---
.../jdkdates/DateConverterForJavaUtilDateTest.java | 6 +++---
.../jodatime/DateConverterForJodaDateTimeTest.java | 6 +++---
.../jodatime/DateConverterForJodaLocalDateTest.java | 6 +++---
.../DateConverterForJodaLocalDateTimeTest.java | 6 +++---
.../jdk8time/DateConverterForJdk8LocalDateTest.java | 6 +++---
.../DateConverterForJdk8LocalDateTimeTest.java | 6 +++---
.../DateConverterForJdk8OffsetDateTimeTest.java | 6 +++---
...bjectAdapterMementoProviderForValueChoicesTest.java | 4 ++--
.../isis/viewer/wicket/ui/pages/PageAbstractTest.java | 4 ++--
.../wicket/viewer/webmodule/WebModuleWicket.java | 4 ++--
.../wicket/viewer/wicketapp/IsisWicketApplication.java | 3 ++-
.../AuthenticatedWebSessionForIsis_Authenticate.java | 10 +++++-----
.../AuthenticatedWebSessionForIsis_SignIn.java | 6 +++---
.../PageClassListDefault_RegistrationAndCaching.java | 8 ++++----
.../wicketapp/IsisWicketApplication_Defaults.java | 10 +++++-----
.../viewer/wicketapp/IsisWicketApplication_Pages.java | 6 +++---
245 files changed, 778 insertions(+), 740 deletions(-)
diff --git a/core/applib/src/test/java/org/apache/isis/applib/events/InteractionEventTest.java b/core/applib/src/test/java/org/apache/isis/applib/events/InteractionEventTest.java
index 8c2db83..e945085 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/events/InteractionEventTest.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/events/InteractionEventTest.java
@@ -24,14 +24,14 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.services.wrapper.events.InteractionEvent;
-
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.services.wrapper.events.InteractionEvent;
+
public class InteractionEventTest {
@Rule
diff --git a/core/applib/src/test/java/org/apache/isis/applib/layout/component/PropertyLayoutData_renderedAsDayBefore_Test.java b/core/applib/src/test/java/org/apache/isis/applib/layout/component/PropertyLayoutData_renderedAsDayBefore_Test.java
index a818792..aa13fdb 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/layout/component/PropertyLayoutData_renderedAsDayBefore_Test.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/layout/component/PropertyLayoutData_renderedAsDayBefore_Test.java
@@ -19,12 +19,12 @@ package org.apache.isis.applib.layout.component;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.applib.annotation.RenderDay;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
+import org.apache.isis.applib.annotation.RenderDay;
+
public class PropertyLayoutData_renderedAsDayBefore_Test {
PropertyLayoutData data;
diff --git a/core/applib/src/test/java/org/apache/isis/applib/layout/component/PropertyLayoutData_repaint_Test.java b/core/applib/src/test/java/org/apache/isis/applib/layout/component/PropertyLayoutData_repaint_Test.java
index c2eb2a3..202d62a 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/layout/component/PropertyLayoutData_repaint_Test.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/layout/component/PropertyLayoutData_repaint_Test.java
@@ -19,12 +19,12 @@ package org.apache.isis.applib.layout.component;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.applib.annotation.Repainting;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
+import org.apache.isis.applib.annotation.Repainting;
+
public class PropertyLayoutData_repaint_Test {
PropertyLayoutData data;
diff --git a/core/applib/src/test/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBars_roundtrip_Test.java b/core/applib/src/test/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBars_roundtrip_Test.java
index 5290976..103850a 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBars_roundtrip_Test.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBars_roundtrip_Test.java
@@ -20,13 +20,13 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.applib.layout.component.ServiceActionLayoutData;
-import org.apache.isis.applib.services.jaxb.JaxbService;
-
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.applib.layout.component.ServiceActionLayoutData;
+import org.apache.isis.applib.services.jaxb.JaxbService;
+
public class BS3MenuBars_roundtrip_Test {
private JaxbService jaxbService;
diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerCompositeTest.java b/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerCompositeTest.java
index 23ffa90..b30efbe 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerCompositeTest.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerCompositeTest.java
@@ -23,14 +23,14 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
+import org.apache.isis.applib.services.i18n.TranslationService;
+import org.apache.isis.applib.services.registry.ServiceRegistry;
+import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+
public class ExceptionRecognizerCompositeTest {
private ExceptionRecognizerComposite composite;
diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/i18n/TranslatableStringTest.java b/core/applib/src/test/java/org/apache/isis/applib/services/i18n/TranslatableStringTest.java
index ea0af64..77b354b 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/services/i18n/TranslatableStringTest.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/services/i18n/TranslatableStringTest.java
@@ -23,11 +23,11 @@ import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+
public class TranslatableStringTest {
public static class GetText extends TranslatableStringTest {
diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/interaction/InteractionDefaultTest_next.java b/core/applib/src/test/java/org/apache/isis/applib/services/interaction/InteractionDefaultTest_next.java
index be130aa..787d75c 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/services/interaction/InteractionDefaultTest_next.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/services/interaction/InteractionDefaultTest_next.java
@@ -21,11 +21,11 @@ package org.apache.isis.applib.services.interaction;
import org.junit.Test;
-import org.apache.isis.applib.services.iactn.Interaction;
-
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.applib.services.iactn.Interaction;
+
public class InteractionDefaultTest_next {
@Test
diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/urlencoding/MementosTest.java b/core/applib/src/test/java/org/apache/isis/applib/services/urlencoding/MementosTest.java
index 88238a6..bc8c6df 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/services/urlencoding/MementosTest.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/services/urlencoding/MementosTest.java
@@ -28,16 +28,16 @@ import org.joda.time.LocalDate;
import org.junit.Before;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.memento._Mementos;
import org.apache.isis.commons.internal.memento._Mementos.Memento;
import org.apache.isis.commons.internal.memento._Mementos.SerializingAdapter;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
public class MementosTest {
static enum DOW {
diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstractTest.java b/core/applib/src/test/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstractTest.java
index 661e2b0..01ba575 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstractTest.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstractTest.java
@@ -27,11 +27,11 @@ import org.junit.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.apache.isis.commons.internal.resources._Resources;
-
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.commons.internal.resources._Resources;
+
public class XmlSnapshotServiceAbstractTest {
private XmlSnapshotServiceAbstract xmlSnapshotService;
diff --git a/core/applib/src/test/java/org/apache/isis/applib/spec/AbstractSpecification2Test.java b/core/applib/src/test/java/org/apache/isis/applib/spec/AbstractSpecification2Test.java
index 16f9a4c..f10283a 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/spec/AbstractSpecification2Test.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/spec/AbstractSpecification2Test.java
@@ -21,15 +21,15 @@ package org.apache.isis.applib.spec;
import org.junit.Test;
-import org.apache.isis.applib.services.i18n.TranslatableString;
-import org.apache.isis.applib.spec.AbstractSpecification2.Nullability;
-import org.apache.isis.applib.spec.AbstractSpecification2.TypeChecking;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
+import org.apache.isis.applib.services.i18n.TranslatableString;
+import org.apache.isis.applib.spec.AbstractSpecification2.Nullability;
+import org.apache.isis.applib.spec.AbstractSpecification2.TypeChecking;
+
public class AbstractSpecification2Test {
private AbstractSpecification2<String> specAbstractSomeDomainObject;
diff --git a/core/applib/src/test/java/org/apache/isis/applib/spec/AbstractSpecificationTest.java b/core/applib/src/test/java/org/apache/isis/applib/spec/AbstractSpecificationTest.java
index 365d603..b4f2c27 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/spec/AbstractSpecificationTest.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/spec/AbstractSpecificationTest.java
@@ -21,14 +21,14 @@ package org.apache.isis.applib.spec;
import org.junit.Test;
-import org.apache.isis.applib.spec.AbstractSpecification.Nullability;
-import org.apache.isis.applib.spec.AbstractSpecification.TypeChecking;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
+import org.apache.isis.applib.spec.AbstractSpecification.Nullability;
+import org.apache.isis.applib.spec.AbstractSpecification.TypeChecking;
+
public class AbstractSpecificationTest {
private static class SomeDomainObject {
diff --git a/core/applib/src/test/java/org/apache/isis/applib/util/EnumsTest.java b/core/applib/src/test/java/org/apache/isis/applib/util/EnumsTest.java
index 536af97..cdd63c3 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/util/EnumsTest.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/util/EnumsTest.java
@@ -21,11 +21,11 @@ package org.apache.isis.applib.util;
import org.junit.Test;
-import org.apache.isis.applib.annotation.Where;
-
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.applib.annotation.Where;
+
public class EnumsTest {
@Test
diff --git a/core/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_toString.java b/core/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_toString.java
index 97751bf..e7d373d 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_toString.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_toString.java
@@ -19,12 +19,12 @@ package org.apache.isis.applib.util;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.applib.util.ObjectContracts.ObjectContract;
-import org.apache.isis.applib.util.ObjectContracts.ToStringEvaluator;
-
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.applib.util.ObjectContracts.ObjectContract;
+import org.apache.isis.applib.util.ObjectContracts.ToStringEvaluator;
+
public class ObjectContractsTest_toString {
private Invoice inv;
diff --git a/core/applib/src/test/java/org/apache/isis/applib/util/schema/CommandDtoUtils_Test.java b/core/applib/src/test/java/org/apache/isis/applib/util/schema/CommandDtoUtils_Test.java
index 9e4db76..8d78bad 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/util/schema/CommandDtoUtils_Test.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/util/schema/CommandDtoUtils_Test.java
@@ -21,13 +21,13 @@ package org.apache.isis.applib.util.schema;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.schema.cmd.v1.CommandDto;
-import org.apache.isis.schema.cmd.v1.MapDto;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
+import org.apache.isis.schema.cmd.v1.CommandDto;
+import org.apache.isis.schema.cmd.v1.MapDto;
+
public class CommandDtoUtils_Test {
CommandDto dto;
diff --git a/core/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_Test.java b/core/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_Test.java
index ea6d1ec..1ca795c 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_Test.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_Test.java
@@ -23,17 +23,17 @@ import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.schema.cmd.v1.MapDto;
import org.apache.isis.schema.common.v1.ValueDto;
import org.apache.isis.schema.common.v1.ValueType;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
public class CommonDtoUtils_Test {
@Rule
diff --git a/core/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_setValueOn_Test.java b/core/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_setValueOn_Test.java
index 00b461f..83c8e44 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_setValueOn_Test.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_setValueOn_Test.java
@@ -24,6 +24,10 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.CoreMatchers.nullValue;
+
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
@@ -33,10 +37,6 @@ import org.apache.isis.schema.common.v1.ValueDto;
import org.apache.isis.schema.common.v1.ValueType;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.hamcrest.CoreMatchers.nullValue;
-
public class CommonDtoUtils_setValueOn_Test {
@Rule
diff --git a/core/applib/src/test/java/org/apache/isis/applib/util/schema/InteractionDtoUtilsTest_deriveLogicalMemberId.java b/core/applib/src/test/java/org/apache/isis/applib/util/schema/InteractionDtoUtilsTest_deriveLogicalMemberId.java
index 24a7148..0e4b653 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/util/schema/InteractionDtoUtilsTest_deriveLogicalMemberId.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/util/schema/InteractionDtoUtilsTest_deriveLogicalMemberId.java
@@ -18,12 +18,12 @@ package org.apache.isis.applib.util.schema;
import org.junit.Test;
-import org.apache.isis.applib.services.bookmark.Bookmark;
-
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.applib.services.bookmark.Bookmark;
+
public class InteractionDtoUtilsTest_deriveLogicalMemberId {
@Test
diff --git a/core/applib/src/test/java/org/apache/isis/applib/util/schema/Roundtrip.java b/core/applib/src/test/java/org/apache/isis/applib/util/schema/Roundtrip.java
index 230794f..923d65c 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/util/schema/Roundtrip.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/util/schema/Roundtrip.java
@@ -33,6 +33,11 @@ import org.joda.time.LocalDateTime;
import org.joda.time.LocalTime;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.schema.cmd.v1.ParamDto;
import org.apache.isis.schema.common.v1.InteractionType;
@@ -43,11 +48,6 @@ import org.apache.isis.schema.ixn.v1.ActionInvocationDto;
import org.apache.isis.schema.ixn.v1.InteractionDto;
import org.apache.isis.schema.ixn.v1.MemberExecutionDto;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-
public class Roundtrip {
private static InteractionDto newInteractionDtoWithActionInvocation(
diff --git a/core/commons/src/test/java/org/apache/isis/commons/handlers/ChainOfResponsibilityTest.java b/core/commons/src/test/java/org/apache/isis/commons/handlers/ChainOfResponsibilityTest.java
index 84cf4eb..1b16849 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/handlers/ChainOfResponsibilityTest.java
+++ b/core/commons/src/test/java/org/apache/isis/commons/handlers/ChainOfResponsibilityTest.java
@@ -22,11 +22,11 @@ import java.util.Arrays;
import org.junit.jupiter.api.Test;
-import org.apache.isis.commons.handler.ChainOfResponsibility;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import org.apache.isis.commons.handler.ChainOfResponsibility;
+
import lombok.val;
class ChainOfResponsibilityTest {
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/base/BytesTest.java b/core/commons/src/test/java/org/apache/isis/commons/internal/base/BytesTest.java
index 76de051..27b1c00 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/base/BytesTest.java
+++ b/core/commons/src/test/java/org/apache/isis/commons/internal/base/BytesTest.java
@@ -30,10 +30,10 @@ import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameter;
import org.junit.runners.Parameterized.Parameters;
-import org.apache.isis.commons.internal._Constants;
-
import static org.hamcrest.Matchers.lessThan;
+import org.apache.isis.commons.internal._Constants;
+
public class BytesTest {
final int n = 256;
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/base/ReductionTest.java b/core/commons/src/test/java/org/apache/isis/commons/internal/base/ReductionTest.java
index 9e00b3a..438858e 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/base/ReductionTest.java
+++ b/core/commons/src/test/java/org/apache/isis/commons/internal/base/ReductionTest.java
@@ -24,10 +24,10 @@ import java.util.List;
import org.junit.Assert;
import org.junit.Test;
-import org.apache.isis.commons.internal.collections._Lists;
-
import static org.hamcrest.CoreMatchers.is;
+import org.apache.isis.commons.internal.collections._Lists;
+
public class ReductionTest {
@Test
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/base/StringsTest.java b/core/commons/src/test/java/org/apache/isis/commons/internal/base/StringsTest.java
index 171a94b..0a93335 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/base/StringsTest.java
+++ b/core/commons/src/test/java/org/apache/isis/commons/internal/base/StringsTest.java
@@ -25,11 +25,11 @@ import java.util.stream.Collectors;
import org.junit.Assert;
import org.junit.Test;
-import org.apache.isis.commons.internal._Constants;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
+import org.apache.isis.commons.internal._Constants;
+
public class StringsTest {
@Test
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/cdi/CDITest.java b/core/commons/src/test/java/org/apache/isis/commons/internal/cdi/CDITest.java
index ab0f569..5cb8f3c 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/cdi/CDITest.java
+++ b/core/commons/src/test/java/org/apache/isis/commons/internal/cdi/CDITest.java
@@ -29,12 +29,12 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.apache.isis.commons.internal.ioc.cdi._CDI;
-
import static org.junit.Assert.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.apache.isis.commons.internal.ioc.cdi._CDI;
+
class CDITest {
private Field stringField1;
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/cdi/ValidQualifierForTesting.java b/core/commons/src/test/java/org/apache/isis/commons/internal/cdi/ValidQualifierForTesting.java
index a891321..47316ef 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/cdi/ValidQualifierForTesting.java
+++ b/core/commons/src/test/java/org/apache/isis/commons/internal/cdi/ValidQualifierForTesting.java
@@ -21,11 +21,11 @@ package org.apache.isis.commons.internal.cdi;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
-
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import javax.inject.Qualifier;
+
@Qualifier
@Retention(RUNTIME)
@Target(FIELD)
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/collections/_MapsTest.java b/core/commons/src/test/java/org/apache/isis/commons/internal/collections/_MapsTest.java
index 4cbcafd..e452534 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/collections/_MapsTest.java
+++ b/core/commons/src/test/java/org/apache/isis/commons/internal/collections/_MapsTest.java
@@ -22,14 +22,14 @@ import java.util.HashMap;
import org.junit.jupiter.api.Test;
-import org.apache.isis.commons.collections.Can;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.apache.isis.commons.collections.Can;
+
import lombok.val;
class _MapsTest {
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/compare/ComparatorsTest.java b/core/commons/src/test/java/org/apache/isis/commons/internal/compare/ComparatorsTest.java
index f0803aa..66b9fc6 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/compare/ComparatorsTest.java
+++ b/core/commons/src/test/java/org/apache/isis/commons/internal/compare/ComparatorsTest.java
@@ -30,10 +30,10 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import org.apache.isis.commons.internal.collections._Lists;
-
import static org.hamcrest.CoreMatchers.is;
+import org.apache.isis.commons.internal.collections._Lists;
+
public class ComparatorsTest {
@Rule
diff --git a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_createSubsetTest.java b/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_createSubsetTest.java
index 6ba7038..d715cb5 100644
--- a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_createSubsetTest.java
+++ b/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_createSubsetTest.java
@@ -21,11 +21,11 @@ package org.apache.isis.config;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
import org.apache.isis.unittestsupport.config.internal._Config;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import lombok.val;
class IsisConfiguration_createSubsetTest {
diff --git a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_primingTest.java b/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_primingTest.java
index c27a677..a8dec28 100644
--- a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_primingTest.java
+++ b/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_primingTest.java
@@ -21,11 +21,11 @@ package org.apache.isis.config;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.apache.isis.unittestsupport.config.internal._Config;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.apache.isis.unittestsupport.config.internal._Config;
+
import lombok.val;
class IsisConfiguration_primingTest {
diff --git a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_specialCharTest.java b/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_specialCharTest.java
index d529d9f..9e81dcb 100644
--- a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_specialCharTest.java
+++ b/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_specialCharTest.java
@@ -21,11 +21,11 @@ package org.apache.isis.config;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
import org.apache.isis.unittestsupport.config.internal._Config;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
class IsisConfiguration_specialCharTest {
IsisConfigurationLegacy configuration;
diff --git a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_whitespaceTest.java b/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_whitespaceTest.java
index 9af4a48..3b5078a 100644
--- a/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_whitespaceTest.java
+++ b/core/config/src/test/java/org/apache/isis/config/IsisConfiguration_whitespaceTest.java
@@ -21,11 +21,11 @@ package org.apache.isis.config;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
import org.apache.isis.unittestsupport.config.internal._Config;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
class IsisConfiguration_whitespaceTest {
IsisConfigurationLegacy configuration;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/commons/internal/reflection/ReflectTest.java b/core/detached-tests/src/test/java/org/apache/isis/commons/internal/reflection/ReflectTest.java
index e010079..438b6c2 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/commons/internal/reflection/ReflectTest.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/commons/internal/reflection/ReflectTest.java
@@ -28,6 +28,9 @@ import javax.xml.bind.JAXBContext;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.jaxb.JaxbServiceDefault;
import org.apache.isis.commons.internal.reflection._Reflect.InterfacePolicy;
@@ -36,8 +39,6 @@ import org.apache.isis.metamodel.services.user.UserServiceDefault;
import static org.apache.isis.commons.internal.reflection._Reflect.getAnnotation;
import static org.apache.isis.commons.internal.reflection._Reflect.streamAllMethods;
import static org.apache.isis.commons.internal.reflection._Reflect.streamTypeHierarchy;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
//TODO we are using real world classes from the framework, we could instead isolate these tests
// if we provide some custom classes for hierarchy traversal here (could be nested);
diff --git a/core/detached-tests/src/test/java/org/apache/isis/metamodel/facets/object/mixin/MixinIntendedAs.java b/core/detached-tests/src/test/java/org/apache/isis/metamodel/facets/object/mixin/MixinIntendedAs.java
index 1af4a8e..bcae195 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/metamodel/facets/object/mixin/MixinIntendedAs.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/metamodel/facets/object/mixin/MixinIntendedAs.java
@@ -23,6 +23,8 @@ 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.services.i18n.TranslationService;
import org.apache.isis.applib.services.i18n.TranslationService.Mode;
@@ -41,8 +43,6 @@ import org.apache.isis.metamodel.progmodel.ProgrammingModelInitFilterDefault;
import org.apache.isis.metamodel.progmodels.dflt.ProgrammingModelFacetsJava8;
import org.apache.isis.metamodel.services.title.TitleServiceDefault;
-import static org.mockito.Mockito.when;
-
import lombok.val;
abstract class MixinIntendedAs {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/metamodel/facets/object/mixin/MixinIntendedAsActionTest.java b/core/detached-tests/src/test/java/org/apache/isis/metamodel/facets/object/mixin/MixinIntendedAsActionTest.java
index e9aff9a..209a924 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/metamodel/facets/object/mixin/MixinIntendedAsActionTest.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/metamodel/facets/object/mixin/MixinIntendedAsActionTest.java
@@ -22,17 +22,17 @@ 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.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Mixin;
import org.apache.isis.applib.annotation.Property;
-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 lombok.Data;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/metamodel/facets/param/name/ParameterNameFacetTest.java b/core/detached-tests/src/test/java/org/apache/isis/metamodel/facets/param/name/ParameterNameFacetTest.java
index 4cc6bc5..b9aedd3 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/metamodel/facets/param/name/ParameterNameFacetTest.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/metamodel/facets/param/name/ParameterNameFacetTest.java
@@ -26,6 +26,9 @@ import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.metamodel.MetaModelContext_forTesting;
@@ -36,9 +39,6 @@ import org.apache.isis.metamodel.progmodel.ProgrammingModelAbstract;
import org.apache.isis.metamodel.progmodel.ProgrammingModelInitFilterDefault;
import org.apache.isis.metamodel.progmodels.dflt.ProgrammingModelFacetsJava8;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import lombok.val;
/**
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java
index dbdedfc..1f448c6 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java
@@ -37,15 +37,15 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.commons.internal.plugins.codegen.ProxyFactoryPlugin;
-
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 static org.junit.jupiter.api.Assertions.fail;
+import org.apache.isis.commons.internal.context._Context;
+import org.apache.isis.commons.internal.plugins.codegen.ProxyFactoryPlugin;
+
class ImposteriserTestUsingCodegenPlugin {
private Imposteriser imposteriser = Imposterisers.getDefault();
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/IsisActionsTest_returnNewTransientInstance.java b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/IsisActionsTest_returnNewTransientInstance.java
index 8f3b5ca..f5e4627 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/IsisActionsTest_returnNewTransientInstance.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/IsisActionsTest_returnNewTransientInstance.java
@@ -26,13 +26,13 @@ import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
+import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+
public class IsisActionsTest_returnNewTransientInstance {
// we can't use the 'real' DomainObjectConainter because applib depends on this module, not vice versa
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JMockActionsTest_returnArgument.java b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JMockActionsTest_returnArgument.java
index 3794b98..1f09a5b 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JMockActionsTest_returnArgument.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JMockActionsTest_returnArgument.java
@@ -24,11 +24,11 @@ import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+
public class JMockActionsTest_returnArgument {
@Rule
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JMockActionsTest_returnEach.java b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JMockActionsTest_returnEach.java
index b6abe14..8916a61 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JMockActionsTest_returnEach.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JMockActionsTest_returnEach.java
@@ -24,11 +24,11 @@ import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+
public class JMockActionsTest_returnEach {
@Rule
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java
index 638f042..395e5d1 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java
@@ -23,14 +23,14 @@ import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.nullValue;
import static org.junit.Assert.assertThat;
+import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+
public class JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase {
@Rule
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java
index ee88053..59e21d3 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java
@@ -23,14 +23,14 @@ import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.nullValue;
import static org.junit.Assert.assertThat;
+import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+
public class JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase {
@Rule
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureId.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureId.java
index 22224f6..ce08670 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureId.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureId.java
@@ -27,6 +27,10 @@ import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
+import static java.util.Comparator.comparing;
+import static java.util.Comparator.naturalOrder;
+import static java.util.Comparator.nullsFirst;
+
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.annotation.Value;
import org.apache.isis.applib.services.appfeat.ApplicationMemberType;
@@ -40,10 +44,6 @@ import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.metamodel.spec.ObjectSpecId;
-import static java.util.Comparator.comparing;
-import static java.util.Comparator.naturalOrder;
-import static java.util.Comparator.nullsFirst;
-
/**
* Value type representing a package, class or member.
*
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/ValidationFailure.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/ValidationFailure.java
index d463d4a..baf122e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/ValidationFailure.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/ValidationFailure.java
@@ -20,11 +20,11 @@ package org.apache.isis.metamodel.specloader.validator;
import java.util.Comparator;
-import org.apache.isis.applib.Identifier;
-
import static java.util.Comparator.naturalOrder;
import static java.util.Comparator.nullsFirst;
+import org.apache.isis.applib.Identifier;
+
import lombok.NonNull;
import lombok.Value;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/MetaModelContext_configTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/MetaModelContext_configTest.java
index 4f0d2d8..2949c9a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/MetaModelContext_configTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/MetaModelContext_configTest.java
@@ -21,13 +21,13 @@ package org.apache.isis.metamodel;
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.assertThrows;
+
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
import org.apache.isis.unittestsupport.config.internal._Config;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
import lombok.val;
class MetaModelContext_configTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/MetaModelContext_forTesting.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/MetaModelContext_forTesting.java
index d3669ff..709eb69 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/MetaModelContext_forTesting.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/MetaModelContext_forTesting.java
@@ -22,6 +22,8 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Stream;
+import static java.util.Objects.requireNonNull;
+
import org.springframework.core.env.AbstractEnvironment;
import org.apache.isis.applib.services.i18n.TranslationService;
@@ -53,8 +55,6 @@ import org.apache.isis.security.api.authorization.manager.AuthorizationManager;
import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
import org.apache.isis.unittestsupport.config.internal._Config;
-import static java.util.Objects.requireNonNull;
-
import lombok.Builder;
import lombok.Getter;
import lombok.Singular;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/ServiceInjector_forTesting.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/ServiceInjector_forTesting.java
index 91a1692..6b93703 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/ServiceInjector_forTesting.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/ServiceInjector_forTesting.java
@@ -20,6 +20,8 @@ package org.apache.isis.metamodel;
import java.util.function.Consumer;
+import static java.util.Objects.requireNonNull;
+
import org.springframework.beans.factory.InjectionPoint;
import org.apache.isis.applib.services.inject.ServiceInjector;
@@ -27,8 +29,6 @@ import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.metamodel.services.ServiceInjectorLegacy;
import org.apache.isis.metamodel.specloader.InjectorMethodEvaluatorDefault;
-import static java.util.Objects.requireNonNull;
-
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/oid/OidMarshallerTest_marshall.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/oid/OidMarshallerTest_marshall.java
index da09dc0..66d3e29 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/oid/OidMarshallerTest_marshall.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/oid/OidMarshallerTest_marshall.java
@@ -21,12 +21,12 @@ package org.apache.isis.metamodel.adapter.oid;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.metamodel.adapter.oid.Oid.Factory;
-import org.apache.isis.metamodel.spec.ObjectSpecId;
-
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertThat;
+import org.apache.isis.metamodel.adapter.oid.Oid.Factory;
+import org.apache.isis.metamodel.spec.ObjectSpecId;
+
public class OidMarshallerTest_marshall {
private Oid_Marshaller oidMarshaller;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/oid/OidMarshallerTest_roundtripping.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/oid/OidMarshallerTest_roundtripping.java
index f216608..9bc2138 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/oid/OidMarshallerTest_roundtripping.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/oid/OidMarshallerTest_roundtripping.java
@@ -21,12 +21,12 @@ package org.apache.isis.metamodel.adapter.oid;
import org.junit.Test;
-import org.apache.isis.metamodel.adapter.oid.Oid.Factory;
-import org.apache.isis.metamodel.spec.ObjectSpecId;
-
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.metamodel.adapter.oid.Oid.Factory;
+import org.apache.isis.metamodel.spec.ObjectSpecId;
+
public class OidMarshallerTest_roundtripping {
@Test
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/oid/OidMarshallerTest_unmarshal.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/oid/OidMarshallerTest_unmarshal.java
index be00610..ab54612 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/oid/OidMarshallerTest_unmarshal.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/oid/OidMarshallerTest_unmarshal.java
@@ -21,12 +21,12 @@ package org.apache.isis.metamodel.adapter.oid;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.metamodel.spec.ObjectSpecId;
-
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.metamodel.spec.ObjectSpecId;
+
/**
* <dt>CUS:123</dt>
* <dd>persistent root</dd>
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/oid/OidVersionTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/oid/OidVersionTest.java
index f6c0c34..817926f 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/oid/OidVersionTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/oid/OidVersionTest.java
@@ -20,14 +20,14 @@ package org.apache.isis.metamodel.adapter.oid;
import org.junit.Test;
-import org.apache.isis.metamodel.adapter.oid.Oid.Factory;
-import org.apache.isis.metamodel.spec.ObjectSpecId;
-
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.junit.Assert.assertThat;
+import org.apache.isis.metamodel.adapter.oid.Oid.Factory;
+import org.apache.isis.metamodel.spec.ObjectSpecId;
+
public class OidVersionTest {
private ObjectSpecId cusObjectSpecId = ObjectSpecId.of("CUS");
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/oid/RootOidTest_create.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/oid/RootOidTest_create.java
index 238d9f9..d952c32 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/oid/RootOidTest_create.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/oid/RootOidTest_create.java
@@ -20,12 +20,12 @@ package org.apache.isis.metamodel.adapter.oid;
import org.junit.Test;
-import org.apache.isis.metamodel.adapter.oid.Oid.Factory;
-import org.apache.isis.metamodel.spec.ObjectSpecId;
-
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.metamodel.adapter.oid.Oid.Factory;
+import org.apache.isis.metamodel.spec.ObjectSpecId;
+
public class RootOidTest_create {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/ListUtilsTest_insert.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/ListUtilsTest_insert.java
index d8af1e1..afffed6 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/ListUtilsTest_insert.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/ListUtilsTest_insert.java
@@ -22,12 +22,12 @@ import java.util.List;
import org.junit.Test;
-import org.apache.isis.commons.internal.collections._Lists;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
+import org.apache.isis.commons.internal.collections._Lists;
+
public class ListUtilsTest_insert {
@Test
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/consent/InteractionResultTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/consent/InteractionResultTest.java
index 2141f40..8f8e9e9 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/consent/InteractionResultTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/consent/InteractionResultTest.java
@@ -23,12 +23,12 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.metamodel.interactions.InteractionAdvisorFacet;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import org.apache.isis.metamodel.interactions.InteractionAdvisorFacet;
+
public class InteractionResultTest {
private InteractionResult result;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facetapi/FeatureTypeTest_identifierFor.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facetapi/FeatureTypeTest_identifierFor.java
index 4748c7b..fb63849 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facetapi/FeatureTypeTest_identifierFor.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facetapi/FeatureTypeTest_identifierFor.java
@@ -24,11 +24,11 @@ import java.math.BigDecimal;
import org.junit.Test;
-import org.apache.isis.applib.Identifier;
-
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.applib.Identifier;
+
public class FeatureTypeTest_identifierFor {
public static class SomeDomainClass {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/Annotations_getAnnotations_on_Class_Test.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/Annotations_getAnnotations_on_Class_Test.java
index 0e133f9..5ed7625 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/Annotations_getAnnotations_on_Class_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/Annotations_getAnnotations_on_Class_Test.java
@@ -26,13 +26,13 @@ import java.lang.annotation.Target;
import org.junit.jupiter.api.Test;
-import org.apache.isis.applib.events.ui.TitleUiEvent;
-import org.apache.isis.commons.internal.reflection._Annotations;
-
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.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;
+
import lombok.val;
public class Annotations_getAnnotations_on_Class_Test {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/Annotations_getAnnotations_on_Field_Test.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/Annotations_getAnnotations_on_Field_Test.java
index 4376853..c4cc923 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/Annotations_getAnnotations_on_Field_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/Annotations_getAnnotations_on_Field_Test.java
@@ -26,13 +26,13 @@ import java.lang.annotation.Target;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.commons.internal.reflection._Annotations;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import lombok.val;
@SuppressWarnings("unused")
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/Annotations_getAnnotations_on_Method_Test.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/Annotations_getAnnotations_on_Method_Test.java
index 139e004..d34fdf8 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/Annotations_getAnnotations_on_Method_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/Annotations_getAnnotations_on_Method_Test.java
@@ -26,11 +26,11 @@ import java.lang.annotation.Target;
import org.junit.Test;
-import org.apache.isis.commons.internal.reflection._Annotations;
-
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.commons.internal.reflection._Annotations;
+
import lombok.val;
public class Annotations_getAnnotations_on_Method_Test {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/Annotations_getAnnotations_on_Parameter_Test.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/Annotations_getAnnotations_on_Parameter_Test.java
index 40c11b0..4e1ffc9 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/Annotations_getAnnotations_on_Parameter_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/Annotations_getAnnotations_on_Parameter_Test.java
@@ -26,11 +26,11 @@ import java.lang.annotation.Target;
import org.junit.Test;
-import org.apache.isis.commons.internal.reflection._Annotations;
-
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.commons.internal.reflection._Annotations;
+
import lombok.val;
@SuppressWarnings("unused")
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/CollectionUtilsTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/CollectionUtilsTest.java
index fa285d0..5a74efc 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/CollectionUtilsTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/CollectionUtilsTest.java
@@ -39,13 +39,13 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import org.apache.isis.commons.internal.collections._Lists;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
+import org.apache.isis.commons.internal.collections._Lists;
+
public class CollectionUtilsTest {
@Rule
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/DomainEventHelperTest_newActionInteractionEvent.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/DomainEventHelperTest_newActionInteractionEvent.java
index 5569d99..5069693 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/DomainEventHelperTest_newActionInteractionEvent.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/DomainEventHelperTest_newActionInteractionEvent.java
@@ -20,16 +20,17 @@ package org.apache.isis.metamodel.facets;
import org.junit.Test;
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.domain.ActionDomainEvent;
-
-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.junit.Assert.assertSame;
import static org.junit.Assert.assertThat;
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.events.domain.ActionDomainEvent;
+
+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/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forAdd.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forAdd.java
index ab1e56c..181fc01 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forAdd.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forAdd.java
@@ -22,14 +22,14 @@ 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;
-
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertThat;
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.events.domain.AbstractDomainEvent;
+import org.apache.isis.applib.events.domain.CollectionDomainEvent;
+
public class DomainEventHelperTest_newCollectionDomainEvent_forAdd {
public static class SomeDomainObject {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forRemove.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forRemove.java
index d6c65f4..448c720 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forRemove.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forRemove.java
@@ -22,14 +22,14 @@ 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;
-
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertThat;
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.events.domain.AbstractDomainEvent;
+import org.apache.isis.applib.events.domain.CollectionDomainEvent;
+
public class DomainEventHelperTest_newCollectionDomainEvent_forRemove {
public static class SomeDomainObject {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forClear.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forClear.java
index 8ea8979..48d7d2e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forClear.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forClear.java
@@ -21,15 +21,16 @@ package org.apache.isis.metamodel.facets;
import org.joda.time.LocalDate;
import org.junit.Test;
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.domain.PropertyDomainEvent;
-
-import static junit.framework.Assert.assertEquals;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertThat;
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.events.domain.PropertyDomainEvent;
+
+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/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forModify.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forModify.java
index be0843d..528b97a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forModify.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forModify.java
@@ -21,12 +21,12 @@ package org.apache.isis.metamodel.facets;
import org.joda.time.LocalDate;
import org.junit.Test;
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.domain.PropertyDomainEvent;
-
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.events.domain.PropertyDomainEvent;
+
public class DomainEventHelperTest_newPropertyDomainEvent_forModify {
public static class SomeDomainObject {}
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/MethodFinderUtilsTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/MethodFinderUtilsTest.java
index 4c2f7c6..887de82 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/MethodFinderUtilsTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/MethodFinderUtilsTest.java
@@ -26,13 +26,13 @@ import javax.annotation.PostConstruct;
import org.junit.Test;
-import org.apache.isis.commons.internal.collections._Maps;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
+import org.apache.isis.commons.internal.collections._Maps;
+
public class MethodFinderUtilsTest {
public static class NoPostConstruct {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/ObjectAdapterUtilsTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/ObjectAdapterUtilsTest.java
index ff9c3f0..ca9c99f 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/ObjectAdapterUtilsTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/ObjectAdapterUtilsTest.java
@@ -24,13 +24,13 @@ 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.metamodel.spec.ManagedObject;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
public class ObjectAdapterUtilsTest {
@Rule
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Command.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Command.java
index 51627a6..1691dd0 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Command.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Command.java
@@ -22,6 +22,12 @@ import java.lang.reflect.Method;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.CommandExecuteIn;
import org.apache.isis.applib.annotation.CommandPersistence;
@@ -37,12 +43,6 @@ import org.apache.isis.metamodel.facets.actions.command.CommandFacet;
import org.apache.isis.metamodel.facets.actions.publish.PublishedActionFacet;
import org.apache.isis.metamodel.facets.actions.semantics.ActionSemanticsFacetAbstract;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
import lombok.val;
public class ActionAnnotationFacetFactoryTest_Command extends ActionAnnotationFacetFactoryTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Hidden.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Hidden.java
index 733caef..55e58cd 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Hidden.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Hidden.java
@@ -21,15 +21,15 @@ package org.apache.isis.metamodel.facets.actions.action;
import org.junit.Assert;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.metamodel.facets.actions.action.hidden.HiddenFacetForActionAnnotation;
import org.apache.isis.metamodel.facets.all.hide.HiddenFacet;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import lombok.val;
public class ActionAnnotationFacetFactoryTest_Hidden extends ActionAnnotationFacetFactoryTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Invocation.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Invocation.java
index 6199696..0c2c95d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Invocation.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Invocation.java
@@ -21,6 +21,8 @@ package org.apache.isis.metamodel.facets.actions.action;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.events.domain.ActionDomainEvent;
import org.apache.isis.metamodel.facetapi.Facet;
@@ -34,7 +36,6 @@ import org.apache.isis.metamodel.facets.actions.action.invocation.ActionInvocati
import org.apache.isis.metamodel.facets.actions.action.invocation.ActionInvocationFacetForDomainEventFromDefault;
import static org.apache.isis.metamodel.commons.matchers.IsisMatchers.classEqualTo;
-import static org.junit.Assert.assertThat;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Publishing.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Publishing.java
index f35afb4..53833af 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Publishing.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Publishing.java
@@ -22,6 +22,10 @@ import java.lang.reflect.Method;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.commons.internal.base._Blackhole;
@@ -33,10 +37,6 @@ import org.apache.isis.metamodel.facets.actions.action.publishing.PublishedActio
import org.apache.isis.metamodel.facets.actions.publish.PublishedActionFacet;
import org.apache.isis.metamodel.facets.actions.semantics.ActionSemanticsFacetAbstract;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
import lombok.val;
public class ActionAnnotationFacetFactoryTest_Publishing extends ActionAnnotationFacetFactoryTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_RestrictTo.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_RestrictTo.java
index 46cf7cf..352aed6 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_RestrictTo.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_RestrictTo.java
@@ -21,12 +21,12 @@ package org.apache.isis.metamodel.facets.actions.action;
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.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.metamodel.facets.actions.prototype.PrototypeFacet;
-import static org.junit.Assert.assertNull;
-
import lombok.val;
public class ActionAnnotationFacetFactoryTest_RestrictTo extends ActionAnnotationFacetFactoryTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Semantics.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Semantics.java
index 772203f..015fb35 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Semantics.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Semantics.java
@@ -21,14 +21,14 @@ package org.apache.isis.metamodel.facets.actions.action;
import org.junit.Assert;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.metamodel.facets.actions.semantics.ActionSemanticsFacet;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import lombok.val;
public class ActionAnnotationFacetFactoryTest_Semantics extends ActionAnnotationFacetFactoryTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_TypeOf.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_TypeOf.java
index 0dcf065..f4ef3ff 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_TypeOf.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_TypeOf.java
@@ -23,6 +23,8 @@ import java.util.Collection;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
@@ -31,7 +33,6 @@ import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacetInferredFromGe
import org.apache.isis.metamodel.facets.actions.action.typeof.TypeOfFacetForActionAnnotation;
import static org.apache.isis.metamodel.commons.matchers.IsisMatchers.classEqualTo;
-import static org.junit.Assert.assertThat;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryJunit4Test.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryJunit4Test.java
index 1114f38..f1bf73d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryJunit4Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryJunit4Test.java
@@ -24,6 +24,11 @@ import org.jmock.Expectations;
import org.junit.Before;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.Contributed;
import org.apache.isis.applib.annotation.DomainObject;
@@ -38,11 +43,6 @@ import org.apache.isis.metamodel.facets.object.domainservice.DomainServiceFacet;
import org.apache.isis.metamodel.facets.object.domainservice.DomainServiceFacetAbstract;
import org.apache.isis.metamodel.facets.object.mixin.MixinFacet;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.junit.Assert.assertThat;
-
public class ActionLayoutAnnotationFacetFactoryJunit4Test extends AbstractFacetFactoryJUnit4TestCase {
ActionLayoutFacetFactory facetFactory;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/layout/ActionLayoutXmlLayoutAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/layout/ActionLayoutXmlLayoutAnnotationFacetFactoryTest.java
index c3d9c71..4f531e2 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/layout/ActionLayoutXmlLayoutAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/layout/ActionLayoutXmlLayoutAnnotationFacetFactoryTest.java
@@ -24,6 +24,12 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+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 static org.junit.Assert.assertThat;
+
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
@@ -35,12 +41,6 @@ import org.apache.isis.metamodel.facets.members.cssclassfa.CssClassFaPosition;
import org.apache.isis.metamodel.facets.object.domainservice.DomainServiceFacet;
import org.apache.isis.metamodel.facets.object.mixin.MixinFacet;
-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 static org.junit.Assert.assertThat;
-
public class ActionLayoutXmlLayoutAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4TestCase {
ActionLayoutFacetFactory facetFactory;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactoryTest.java
index 48c07fb..aab4558 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactoryTest.java
@@ -22,6 +22,12 @@ import org.jmock.Expectations;
import org.junit.Before;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.metamodel.facetapi.Facet;
@@ -32,12 +38,6 @@ import org.apache.isis.metamodel.facets.actions.notcontributed.NotContributedFac
import org.apache.isis.metamodel.facets.object.domainservice.DomainServiceFacet;
import org.apache.isis.metamodel.facets.object.domainservice.DomainServiceFacetAbstract;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
public class NotContributedFacetDerivedFromDomainServiceFacetFactoryTest extends AbstractFacetFactoryJUnit4TestCase {
private NotContributedFacetDerivedFromDomainServiceFacetFactory facetFactory;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest.java
index 7931f1f..d56df9f 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest.java
@@ -22,6 +22,12 @@ import org.jmock.Expectations;
import org.junit.Before;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.metamodel.facetapi.Facet;
@@ -32,12 +38,6 @@ import org.apache.isis.metamodel.facets.actions.notinservicemenu.NotInServiceMen
import org.apache.isis.metamodel.facets.object.domainservice.DomainServiceFacet;
import org.apache.isis.metamodel.facets.object.domainservice.DomainServiceFacetAbstract;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
public class NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest
extends AbstractFacetFactoryJUnit4TestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeFacetAbstractTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeFacetAbstractTest.java
index 4f17548..d6c1cf1 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeFacetAbstractTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeFacetAbstractTest.java
@@ -22,13 +22,13 @@ import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
import org.apache.isis.commons.internal.environment.DeploymentType;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.interactions.VisibilityContext;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import static org.junit.Assert.assertEquals;
-
public class PrototypeFacetAbstractTest {
@Rule
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/collections/JavaCollectionFacetTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/collections/JavaCollectionFacetTest.java
index b7be27c..0c967ec 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/collections/JavaCollectionFacetTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/collections/JavaCollectionFacetTest.java
@@ -29,6 +29,10 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.metamodel.MetaModelContext_forTesting;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.adapter.ObjectAdapterProvider;
@@ -37,10 +41,6 @@ import org.apache.isis.metamodel.facets.collections.javautilcollection.JavaColle
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
public class JavaCollectionFacetTest {
private JavaCollectionFacet facet;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
index 2593b0a..43ed160 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
@@ -26,6 +26,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.events.domain.CollectionDomainEvent;
@@ -60,8 +63,6 @@ import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import static org.apache.isis.metamodel.commons.matchers.IsisMatchers.classEqualTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/collections/collection/DisabledAnnotationOnCollectionFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/collections/collection/DisabledAnnotationOnCollectionFacetFactoryTest.java
index 9cad775..df4ab2f 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/collections/collection/DisabledAnnotationOnCollectionFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/collections/collection/DisabledAnnotationOnCollectionFacetFactoryTest.java
@@ -21,6 +21,9 @@ package org.apache.isis.metamodel.facets.collections.collection;
import java.lang.reflect.Method;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.metamodel.facetapi.Facet;
@@ -29,9 +32,6 @@ import org.apache.isis.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.metamodel.facets.members.disabled.DisabledFacet;
import org.apache.isis.metamodel.facets.members.disabled.DisabledFacetAbstract;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import lombok.val;
public class DisabledAnnotationOnCollectionFacetFactoryTest extends AbstractFacetFactoryTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/collections/layout/annotation/NamedFacetForCollectionLayoutAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/collections/layout/annotation/NamedFacetForCollectionLayoutAnnotationFactoryTest.java
index aefd530..7d6353c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/collections/layout/annotation/NamedFacetForCollectionLayoutAnnotationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/collections/layout/annotation/NamedFacetForCollectionLayoutAnnotationFactoryTest.java
@@ -23,6 +23,12 @@ import java.lang.reflect.Method;
import java.util.Set;
import java.util.SortedSet;
+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 static org.junit.Assert.assertThat;
+
import org.apache.isis.applib.annotation.CollectionLayout;
import org.apache.isis.commons.internal.collections._Sets;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
@@ -31,12 +37,6 @@ import org.apache.isis.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.metamodel.facets.collections.layout.CollectionLayoutFacetFactory;
import org.apache.isis.metamodel.facets.collections.layout.NamedFacetForCollectionLayoutAnnotation;
-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 static org.junit.Assert.assertThat;
-
import lombok.val;
public class NamedFacetForCollectionLayoutAnnotationFactoryTest extends AbstractFacetFactoryTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
index cba41e0..d9aa2f1 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
@@ -23,6 +23,10 @@ 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.junit.Assert.assertThat;
+
import org.apache.isis.applib.RecreatableDomainObject;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.services.inject.ServiceInjector;
@@ -40,10 +44,6 @@ import org.apache.isis.metamodel.specloader.validator.ValidationFailures;
import org.apache.isis.unittestsupport.config.internal._Config;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import lombok.val;
public class ViewModelSemanticCheckingFacetFactoryTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/bookmarkpolicy/BookmarkableAnnotationFacetFactoryTest_class.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/bookmarkpolicy/BookmarkableAnnotationFacetFactoryTest_class.java
index 2e096ce..abd6a20 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/bookmarkpolicy/BookmarkableAnnotationFacetFactoryTest_class.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/bookmarkpolicy/BookmarkableAnnotationFacetFactoryTest_class.java
@@ -19,15 +19,15 @@
package org.apache.isis.metamodel.facets.object.bookmarkpolicy;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.applib.annotation.BookmarkPolicy;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.isis.metamodel.facets.object.bookmarkpolicy.bookmarkable.BookmarkPolicyFacetFallbackFactory;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
public class BookmarkableAnnotationFacetFactoryTest_class extends AbstractFacetFactoryTest {
private BookmarkPolicyFacetFallbackFactory facetFactory;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
index 47527d6..7f2af35 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
@@ -27,6 +27,10 @@ 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.junit.Assert.assertThat;
+
import org.apache.isis.applib.annotation.Bounding;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.services.HasUniqueId;
@@ -58,10 +62,6 @@ import org.apache.isis.metamodel.facets.objectvalue.choices.ChoicesFacet;
import org.apache.isis.metamodel.spec.ObjectSpecId;
import org.apache.isis.unittestsupport.config.internal._Config;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
-
import lombok.val;
public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4TestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/ObjectTypeAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/ObjectTypeAnnotationFacetFactoryTest.java
index cdcac61..d3eb125 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/ObjectTypeAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/ObjectTypeAnnotationFacetFactoryTest.java
@@ -22,6 +22,11 @@ package org.apache.isis.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.junit.Assert.assertThat;
+
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
import org.apache.isis.metamodel.facets.ObjectSpecIdFacetFactory.ProcessObjectSpecIdContext;
@@ -29,11 +34,6 @@ import org.apache.isis.metamodel.facets.object.domainobject.objectspecid.ObjectS
import org.apache.isis.metamodel.facets.object.objectspecid.ObjectSpecIdFacet;
import org.apache.isis.metamodel.spec.ObjectSpecId;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
public class ObjectTypeAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4TestCase {
private DomainObjectAnnotationFacetFactory facetFactory;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
index dc5a0a2..156567e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
@@ -25,6 +25,13 @@ 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.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
import org.apache.isis.applib.annotation.BookmarkPolicy;
import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.annotation.ViewModelLayout;
@@ -42,13 +49,6 @@ import org.apache.isis.metamodel.facets.object.paged.PagedFacet;
import org.apache.isis.metamodel.facets.object.plural.PluralFacet;
import org.apache.isis.unittestsupport.config.internal._Config;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
public class DomainObjectLayoutFactoryTest extends AbstractFacetFactoryJUnit4TestCase {
DomainObjectLayoutFacetFactory facetFactory;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainservicelayout/annotation/DomainServiceLayoutFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainservicelayout/annotation/DomainServiceLayoutFacetFactoryTest.java
index 415df97..83076b0 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainservicelayout/annotation/DomainServiceLayoutFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainservicelayout/annotation/DomainServiceLayoutFacetFactoryTest.java
@@ -21,6 +21,8 @@ package org.apache.isis.metamodel.facets.object.domainservicelayout.annotation;
import org.junit.Assert;
+import static org.hamcrest.Matchers.is;
+
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.DomainServiceLayout;
import org.apache.isis.metamodel.facetapi.Facet;
@@ -29,8 +31,6 @@ import org.apache.isis.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.isis.metamodel.facets.object.domainservicelayout.DomainServiceLayoutFacet;
import org.apache.isis.metamodel.facets.object.domainservicelayout.DomainServiceLayoutFacetFactory;
-import static org.hamcrest.Matchers.is;
-
public class DomainServiceLayoutFacetFactoryTest extends AbstractFacetFactoryTest {
private DomainServiceLayoutFacetFactory facetFactory;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/cssclass/CssClassFacetMethodFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/cssclass/CssClassFacetMethodFactoryTest.java
index f71296c..ce7e45d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/cssclass/CssClassFacetMethodFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/cssclass/CssClassFacetMethodFactoryTest.java
@@ -21,6 +21,11 @@ package org.apache.isis.metamodel.facets.object.ident.cssclass;
import java.lang.reflect.Method;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessClassContext;
@@ -28,11 +33,6 @@ import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacet;
import org.apache.isis.metamodel.facets.object.cssclass.method.CssClassFacetMethod;
import org.apache.isis.metamodel.facets.object.cssclass.method.CssClassFacetMethodFactory;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.junit.Assert.assertThat;
-
public class CssClassFacetMethodFactoryTest extends AbstractFacetFactoryTest {
private CssClassFacetMethodFactory facetFactory;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/cssclass/CssClassFacetMethodTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/cssclass/CssClassFacetMethodTest.java
index 4cb2de8..9c00302 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/cssclass/CssClassFacetMethodTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/cssclass/CssClassFacetMethodTest.java
@@ -28,14 +28,14 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facetapi.FacetHolder;
-import org.apache.isis.metamodel.facets.object.cssclass.method.CssClassFacetMethod;
-
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.metamodel.facetapi.FacetHolder;
+import org.apache.isis.metamodel.facets.object.cssclass.method.CssClassFacetMethod;
+
public class CssClassFacetMethodTest {
public static final String CSS_CLASS = "someCssClass";
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/cssclass/CssClassFacetMethodWithProblemTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/cssclass/CssClassFacetMethodWithProblemTest.java
index 5e09420..52d2187 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/cssclass/CssClassFacetMethodWithProblemTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/cssclass/CssClassFacetMethodWithProblemTest.java
@@ -28,14 +28,14 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facetapi.FacetHolder;
-import org.apache.isis.metamodel.facets.object.cssclass.method.CssClassFacetMethod;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
+import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.metamodel.facetapi.FacetHolder;
+import org.apache.isis.metamodel.facets.object.cssclass.method.CssClassFacetMethod;
+
public class CssClassFacetMethodWithProblemTest {
private final Mockery mockery = new JUnit4Mockery();
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/icon/IconFacetMethodFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/icon/IconFacetMethodFactoryTest.java
index d713984..c16339d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/icon/IconFacetMethodFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/icon/IconFacetMethodFactoryTest.java
@@ -21,6 +21,11 @@ package org.apache.isis.metamodel.facets.object.ident.icon;
import java.lang.reflect.Method;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessClassContext;
@@ -28,11 +33,6 @@ import org.apache.isis.metamodel.facets.object.icon.IconFacet;
import org.apache.isis.metamodel.facets.object.icon.method.IconFacetMethod;
import org.apache.isis.metamodel.facets.object.icon.method.IconFacetMethodFactory;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.junit.Assert.assertThat;
-
public class IconFacetMethodFactoryTest extends AbstractFacetFactoryTest {
private IconFacetMethodFactory facetFactory;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/icon/IconFacetMethodTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/icon/IconFacetMethodTest.java
index 52187d0..ea9a345 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/icon/IconFacetMethodTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/icon/IconFacetMethodTest.java
@@ -28,14 +28,14 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facetapi.FacetHolder;
-import org.apache.isis.metamodel.facets.object.icon.method.IconFacetMethod;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
+import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.metamodel.facetapi.FacetHolder;
+import org.apache.isis.metamodel.facets.object.icon.method.IconFacetMethod;
+
public class IconFacetMethodTest {
private final Mockery mockery = new JUnit4Mockery();
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/layout/LayoutFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/layout/LayoutFacetFactoryTest.java
index 25a9850..4478483 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/layout/LayoutFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/layout/LayoutFacetFactoryTest.java
@@ -21,6 +21,11 @@ package org.apache.isis.metamodel.facets.object.ident.layout;
import java.lang.reflect.Method;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessClassContext;
@@ -28,11 +33,6 @@ import org.apache.isis.metamodel.facets.object.layout.LayoutFacet;
import org.apache.isis.metamodel.facets.object.layout.LayoutFacetFactory;
import org.apache.isis.metamodel.facets.object.layout.LayoutFacetMethod;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.junit.Assert.assertThat;
-
public class LayoutFacetFactoryTest extends AbstractFacetFactoryTest {
private LayoutFacetFactory facetFactory;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/layout/LayoutFacetMethodTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/layout/LayoutFacetMethodTest.java
index cbadf95..18dccf1 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/layout/LayoutFacetMethodTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/layout/LayoutFacetMethodTest.java
@@ -28,14 +28,14 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facetapi.FacetHolder;
-import org.apache.isis.metamodel.facets.object.layout.LayoutFacetMethod;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
+import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.metamodel.facetapi.FacetHolder;
+import org.apache.isis.metamodel.facets.object.layout.LayoutFacetMethod;
+
public class LayoutFacetMethodTest {
private final Mockery mockery = new JUnit4Mockery();
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacetViaMethodTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacetViaMethodTest.java
index aa67a95..d91aa68 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacetViaMethodTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacetViaMethodTest.java
@@ -30,15 +30,15 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.metamodel.MetaModelContext_forTesting;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.title.methods.TitleFacetViaTitleMethod;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
@RunWith(JMock.class)
public class TitleFacetViaMethodTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
index 7e431f3..99600fa 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
@@ -31,6 +31,9 @@ import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facetapi.Facet;
@@ -44,9 +47,6 @@ import org.apache.isis.metamodel.facets.object.title.annotation.TitleFacetViaTit
import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
public class TitleAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4TestCase {
private TitleAnnotationFacetFactory facetFactory;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java
index 57693dd..8972dcc 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java
@@ -28,6 +28,9 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.metamodel.MetaModelContext_forTesting;
@@ -42,9 +45,6 @@ import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
public class TitleFacetViaTitleAnnotationTest {
@Rule
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/layoutxml/GridFacetDefaultTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/layoutxml/GridFacetDefaultTest.java
index f9d2a7a..2cf9df9 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/layoutxml/GridFacetDefaultTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/layoutxml/GridFacetDefaultTest.java
@@ -22,12 +22,12 @@ import java.util.concurrent.atomic.AtomicReference;
import org.junit.Test;
-import org.apache.isis.applib.layout.component.FieldSet;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
+import org.apache.isis.applib.layout.component.FieldSet;
+
public class GridFacetDefaultTest {
@Test
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/navparent/NavigableParentFacetMethodTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/navparent/NavigableParentFacetMethodTest.java
index 407a77d..e0f3b49 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/navparent/NavigableParentFacetMethodTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/navparent/NavigableParentFacetMethodTest.java
@@ -28,14 +28,14 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facetapi.FacetHolder;
-import org.apache.isis.metamodel.facets.object.navparent.method.NavigableParentFacetMethod;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
+import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.metamodel.facetapi.FacetHolder;
+import org.apache.isis.metamodel.facets.object.navparent.method.NavigableParentFacetMethod;
+
public class NavigableParentFacetMethodTest {
private final Mockery mockery = new JUnit4Mockery();
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/objectspecid/ObjectSpecIdFacetDerivedFromClassNameFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/objectspecid/ObjectSpecIdFacetDerivedFromClassNameFactoryTest.java
index 3c546d3..6c7c576 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/objectspecid/ObjectSpecIdFacetDerivedFromClassNameFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/objectspecid/ObjectSpecIdFacetDerivedFromClassNameFactoryTest.java
@@ -23,17 +23,17 @@ 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.junit.Assert.assertThat;
+
import org.apache.isis.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
import org.apache.isis.metamodel.facets.ObjectSpecIdFacetFactory;
import org.apache.isis.metamodel.facets.object.objectspecid.classname.ObjectSpecIdFacetDerivedFromClassName;
import org.apache.isis.metamodel.facets.object.objectspecid.classname.ObjectSpecIdFacetDerivedFromClassNameFactory;
import org.apache.isis.metamodel.spec.ObjectSpecId;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
public class ObjectSpecIdFacetDerivedFromClassNameFactoryTest extends AbstractFacetFactoryJUnit4TestCase {
private ObjectSpecIdFacetDerivedFromClassNameFactory facetFactory;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/param/layout/annotation/LabelAtFacetForParameterLayoutAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/param/layout/annotation/LabelAtFacetForParameterLayoutAnnotationFactoryTest.java
index ac92c03..63fe885 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/param/layout/annotation/LabelAtFacetForParameterLayoutAnnotationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/param/layout/annotation/LabelAtFacetForParameterLayoutAnnotationFactoryTest.java
@@ -21,6 +21,11 @@ package org.apache.isis.metamodel.facets.param.layout.annotation;
import java.lang.reflect.Method;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.applib.annotation.LabelPosition;
import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.metamodel.facetapi.Facet;
@@ -30,11 +35,6 @@ import org.apache.isis.metamodel.facets.objectvalue.labelat.LabelAtFacet;
import org.apache.isis.metamodel.facets.param.layout.LabelAtFacetForParameterLayoutAnnotation;
import org.apache.isis.metamodel.facets.param.layout.ParameterLayoutFacetFactory;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.junit.Assert.assertThat;
-
public class LabelAtFacetForParameterLayoutAnnotationFactoryTest extends AbstractFacetFactoryTest {
public void testParameterLayoutAnnotationPickedUp() {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/param/layout/annotation/NamedFacetForParameterLayoutAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/param/layout/annotation/NamedFacetForParameterLayoutAnnotationFactoryTest.java
index f262008..6353771 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/param/layout/annotation/NamedFacetForParameterLayoutAnnotationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/param/layout/annotation/NamedFacetForParameterLayoutAnnotationFactoryTest.java
@@ -21,6 +21,12 @@ package org.apache.isis.metamodel.facets.param.layout.annotation;
import java.lang.reflect.Method;
+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 static org.junit.Assert.assertThat;
+
import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.FacetFactory;
@@ -28,12 +34,6 @@ import org.apache.isis.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.metamodel.facets.param.layout.NamedFacetForParameterLayoutAnnotation;
import org.apache.isis.metamodel.facets.param.layout.ParameterLayoutFacetFactory;
-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 static org.junit.Assert.assertThat;
-
public class NamedFacetForParameterLayoutAnnotationFactoryTest extends AbstractFacetFactoryTest {
private static final String NAME = "an action";
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/param/parameter/ParameterAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/param/parameter/ParameterAnnotationFacetFactoryTest.java
index 90e1844..0184aa1 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/param/parameter/ParameterAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/param/parameter/ParameterAnnotationFacetFactoryTest.java
@@ -29,6 +29,10 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.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;
@@ -44,10 +48,6 @@ import org.apache.isis.metamodel.facets.param.parameter.mustsatisfy.MustSatisfyS
import org.apache.isis.metamodel.facets.param.parameter.regex.RegExFacetForParameterAnnotation;
import org.apache.isis.metamodel.spec.ObjectSpecification;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
@SuppressWarnings("unused")
public class ParameterAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4TestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java
index 134fb90..ce4553e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java
@@ -29,6 +29,9 @@ 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.config.IsisConfiguration;
@@ -38,9 +41,6 @@ import org.apache.isis.metamodel.facets.object.promptStyle.PromptStyleFacetAsCon
import org.apache.isis.metamodel.facets.properties.propertylayout.PromptStyleFacetForPropertyLayoutAnnotation;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-
public class PromptStyleFacetFromPropertyAnnotation_Test {
@Rule
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/property/DisabledAnnotationOnPropertyFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/property/DisabledAnnotationOnPropertyFacetFactoryTest.java
index 56e07fb..2e7b705 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/property/DisabledAnnotationOnPropertyFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/property/DisabledAnnotationOnPropertyFacetFactoryTest.java
@@ -21,6 +21,9 @@ package org.apache.isis.metamodel.facets.properties.property;
import java.lang.reflect.Method;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.metamodel.facetapi.Facet;
@@ -29,9 +32,6 @@ import org.apache.isis.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.metamodel.facets.members.disabled.DisabledFacet;
import org.apache.isis.metamodel.facets.members.disabled.DisabledFacetAbstract;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import lombok.val;
public class DisabledAnnotationOnPropertyFacetFactoryTest extends AbstractFacetFactoryTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
index ef852d2..500fa51 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
@@ -29,6 +29,10 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
import org.apache.isis.applib.annotation.MementoSerialization;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
@@ -75,9 +79,6 @@ import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.unittestsupport.config.internal._Config;
import static org.apache.isis.metamodel.commons.matchers.IsisMatchers.classEqualTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/propertylayout/LabelAtFacetForPropertyLayoutAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/propertylayout/LabelAtFacetForPropertyLayoutAnnotationFactoryTest.java
index ecebdeb..4b664bb 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/propertylayout/LabelAtFacetForPropertyLayoutAnnotationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/propertylayout/LabelAtFacetForPropertyLayoutAnnotationFactoryTest.java
@@ -21,6 +21,12 @@ package org.apache.isis.metamodel.facets.properties.propertylayout;
import java.lang.reflect.Method;
+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 static org.junit.Assert.assertThat;
+
import org.apache.isis.applib.annotation.LabelPosition;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.metamodel.facetapi.Facet;
@@ -28,12 +34,6 @@ import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.metamodel.facets.objectvalue.labelat.LabelAtFacet;
-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 static org.junit.Assert.assertThat;
-
import lombok.val;
public class LabelAtFacetForPropertyLayoutAnnotationFactoryTest extends AbstractFacetFactoryTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/propertylayout/NamedFacetForPropertyLayoutAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/propertylayout/NamedFacetForPropertyLayoutAnnotationFactoryTest.java
index e220427..dbc8bb5 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/propertylayout/NamedFacetForPropertyLayoutAnnotationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/propertylayout/NamedFacetForPropertyLayoutAnnotationFactoryTest.java
@@ -21,17 +21,17 @@ package org.apache.isis.metamodel.facets.properties.propertylayout;
import java.lang.reflect.Method;
-import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.FacetFactory.ProcessMethodContext;
-import org.apache.isis.metamodel.facets.all.named.NamedFacet;
-
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 static org.junit.Assert.assertThat;
+import org.apache.isis.applib.annotation.PropertyLayout;
+import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
+import org.apache.isis.metamodel.facets.FacetFactory.ProcessMethodContext;
+import org.apache.isis.metamodel.facets.all.named.NamedFacet;
+
import lombok.val;
public class NamedFacetForPropertyLayoutAnnotationFactoryTest extends AbstractFacetFactoryTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/SpecificationAndTests.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/SpecificationAndTests.java
index 123a8b3..58a496e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/SpecificationAndTests.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/SpecificationAndTests.java
@@ -21,14 +21,14 @@ package org.apache.isis.metamodel.facets.propparam.specification;
import org.junit.Test;
-import org.apache.isis.applib.spec.Specification;
-import org.apache.isis.applib.spec.SpecificationAnd;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
+import org.apache.isis.applib.spec.Specification;
+import org.apache.isis.applib.spec.SpecificationAnd;
+
public class SpecificationAndTests {
private final Specification alwaysSatisfied = new SpecificationAlwaysSatisfied();
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/SpecificationNotTests.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/SpecificationNotTests.java
index e9d40b6..88f143b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/SpecificationNotTests.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/SpecificationNotTests.java
@@ -21,14 +21,14 @@ package org.apache.isis.metamodel.facets.propparam.specification;
import org.junit.Test;
-import org.apache.isis.applib.spec.Specification;
-import org.apache.isis.applib.spec.SpecificationNot;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
+import org.apache.isis.applib.spec.Specification;
+import org.apache.isis.applib.spec.SpecificationNot;
+
public class SpecificationNotTests {
private final Specification alwaysSatisfied = new SpecificationAlwaysSatisfied();
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/SpecificationOrTests.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/SpecificationOrTests.java
index b9ecbc1..576e7b9 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/SpecificationOrTests.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/SpecificationOrTests.java
@@ -21,14 +21,14 @@ package org.apache.isis.metamodel.facets.propparam.specification;
import org.junit.Test;
-import org.apache.isis.applib.spec.Specification;
-import org.apache.isis.applib.spec.SpecificationOr;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
+import org.apache.isis.applib.spec.Specification;
+import org.apache.isis.applib.spec.SpecificationOr;
+
public class SpecificationOrTests {
private final Specification alwaysSatisfied = new SpecificationAlwaysSatisfied();
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
index 5e13ea0..bf7f5bd 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
@@ -24,6 +24,9 @@ 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.metamodel.context.MetaModelContextAware;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
@@ -31,9 +34,6 @@ import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException
import org.apache.isis.metamodel.facets.value.bigdecimal.BigDecimalValueSemanticsProvider;
import org.apache.isis.unittestsupport.config.internal._Config;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
public class BigDecimalValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
private BigDecimalValueSemanticsProvider value;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/BigIntValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/BigIntValueSemanticsProviderTest.java
index a002a4c..f19c113 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/BigIntValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/BigIntValueSemanticsProviderTest.java
@@ -24,6 +24,9 @@ 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.metamodel.context.MetaModelContextAware;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
@@ -31,9 +34,6 @@ import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException
import org.apache.isis.metamodel.facets.value.biginteger.BigIntegerValueSemanticsProvider;
import org.apache.isis.unittestsupport.config.internal._Config;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
public class BigIntValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
private BigInteger bigInt;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/BlobValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/BlobValueSemanticsProviderTest.java
index 81c9624..05d20cc 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/BlobValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/BlobValueSemanticsProviderTest.java
@@ -22,15 +22,15 @@ package org.apache.isis.metamodel.facets.value;
import org.junit.Before;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.applib.value.Blob;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.metamodel.facets.value.blobs.BlobValueSemanticsProvider;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-
public class BlobValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
private BlobValueSemanticsProvider value;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/BooleanValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/BooleanValueSemanticsProviderTest.java
index 6f8cfd0..a466e82 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/BooleanValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/BooleanValueSemanticsProviderTest.java
@@ -22,15 +22,15 @@ package org.apache.isis.metamodel.facets.value;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.metamodel.facets.value.booleans.BooleanValueSemanticsProviderAbstract;
import org.apache.isis.metamodel.facets.value.booleans.BooleanWrapperValueSemanticsProvider;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
public class BooleanValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
private BooleanValueSemanticsProviderAbstract value;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ByteValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ByteValueSemanticsProviderTest.java
index c209f36..10936ab 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ByteValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ByteValueSemanticsProviderTest.java
@@ -22,6 +22,9 @@ package org.apache.isis.metamodel.facets.value;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
import org.apache.isis.metamodel.context.MetaModelContextAware;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
@@ -30,9 +33,6 @@ import org.apache.isis.metamodel.facets.value.bytes.ByteValueSemanticsProviderAb
import org.apache.isis.metamodel.facets.value.bytes.ByteWrapperValueSemanticsProvider;
import org.apache.isis.unittestsupport.config.internal._Config;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
public class ByteValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
private ByteValueSemanticsProviderAbstract value;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/CharacterValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/CharacterValueSemanticsProviderTest.java
index f717723..e3f1f57 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/CharacterValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/CharacterValueSemanticsProviderTest.java
@@ -22,15 +22,15 @@ package org.apache.isis.metamodel.facets.value;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.metamodel.facets.object.parseable.InvalidEntryException;
import org.apache.isis.metamodel.facets.value.chars.CharValueSemanticsProviderAbstract;
import org.apache.isis.metamodel.facets.value.chars.CharWrapperValueSemanticsProvider;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
public class CharacterValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
private CharValueSemanticsProviderAbstract value;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ClobValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ClobValueSemanticsProviderTest.java
index e496760..13463de 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ClobValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ClobValueSemanticsProviderTest.java
@@ -22,15 +22,15 @@ package org.apache.isis.metamodel.facets.value;
import org.junit.Before;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.applib.value.Clob;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.metamodel.facets.value.clobs.ClobValueSemanticsProvider;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-
public class ClobValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
private ClobValueSemanticsProvider value;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/DoubleValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
index bfb0be4..4d86630 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
@@ -22,6 +22,9 @@ package org.apache.isis.metamodel.facets.value;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
import org.apache.isis.metamodel.context.MetaModelContextAware;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
@@ -29,9 +32,6 @@ import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException
import org.apache.isis.metamodel.facets.value.doubles.DoubleWrapperValueSemanticsProvider;
import org.apache.isis.unittestsupport.config.internal._Config;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
public class DoubleValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
private Double doubleObj;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/FloatValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/FloatValueSemanticsProviderTest.java
index bc97a75..1577500 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/FloatValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/FloatValueSemanticsProviderTest.java
@@ -22,6 +22,9 @@ package org.apache.isis.metamodel.facets.value;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
import org.apache.isis.metamodel.context.MetaModelContextAware;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
@@ -30,9 +33,6 @@ import org.apache.isis.metamodel.facets.value.floats.FloatValueSemanticsProvider
import org.apache.isis.metamodel.facets.value.floats.FloatWrapperValueSemanticsProvider;
import org.apache.isis.unittestsupport.config.internal._Config;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
public class FloatValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
private FloatValueSemanticsProviderAbstract value;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ImageValueSemanticsProviderAbstractTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ImageValueSemanticsProviderAbstractTest.java
index 50ad28e..dac31d4 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ImageValueSemanticsProviderAbstractTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ImageValueSemanticsProviderAbstractTest.java
@@ -26,6 +26,8 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.value.image.ImageValueSemanticsProviderAbstract;
@@ -34,8 +36,6 @@ import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import static org.junit.Assert.assertEquals;
-
public class ImageValueSemanticsProviderAbstractTest {
@Rule
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/IntValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/IntValueSemanticsProviderTest.java
index 5d06408..8dcc2ba 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/IntValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/IntValueSemanticsProviderTest.java
@@ -22,6 +22,9 @@ package org.apache.isis.metamodel.facets.value;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
import org.apache.isis.metamodel.context.MetaModelContextAware;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
@@ -30,9 +33,6 @@ import org.apache.isis.metamodel.facets.value.integer.IntValueSemanticsProviderA
import org.apache.isis.metamodel.facets.value.integer.IntWrapperValueSemanticsProvider;
import org.apache.isis.unittestsupport.config.internal._Config;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
public class IntValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
private IntValueSemanticsProviderAbstract value;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
index 7820ebe..0dadff2 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
@@ -28,6 +28,9 @@ 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.metamodel.context.MetaModelContextAware;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
@@ -35,9 +38,6 @@ import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException
import org.apache.isis.metamodel.facets.value.datesql.JavaSqlDateValueSemanticsProvider;
import org.apache.isis.unittestsupport.config.internal._Config;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
public class JavaSqlDateValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
private JavaSqlDateValueSemanticsProvider adapter;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java
index 677082b..b5ae573 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java
@@ -27,14 +27,14 @@ import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
import org.apache.isis.metamodel.context.MetaModelContextAware;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.metamodel.facets.value.timesql.JavaSqlTimeValueSemanticsProvider;
import org.apache.isis.unittestsupport.config.internal._Config;
-import static org.junit.Assert.assertEquals;
-
public class JavaSqlTimeValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
private Time twoOClock;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
index 086d523..de623bc 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
@@ -27,6 +27,9 @@ 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.metamodel.context.MetaModelContextAware;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
@@ -34,9 +37,6 @@ import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException
import org.apache.isis.metamodel.facets.value.dateutil.JavaUtilDateValueSemanticsProvider;
import org.apache.isis.unittestsupport.config.internal._Config;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
public class JavaUtilDateValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
private java.util.Date date;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/LongValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/LongValueSemanticsProviderTest.java
index b43e519..e00b3af 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/LongValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/LongValueSemanticsProviderTest.java
@@ -22,6 +22,9 @@ package org.apache.isis.metamodel.facets.value;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
import org.apache.isis.metamodel.context.MetaModelContextAware;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
@@ -30,9 +33,6 @@ import org.apache.isis.metamodel.facets.value.longs.LongValueSemanticsProviderAb
import org.apache.isis.metamodel.facets.value.longs.LongWrapperValueSemanticsProvider;
import org.apache.isis.unittestsupport.config.internal._Config;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
public class LongValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
private LongValueSemanticsProviderAbstract value;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/PasswordValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/PasswordValueSemanticsProviderTest.java
index 00d4f8a..661e114 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/PasswordValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/PasswordValueSemanticsProviderTest.java
@@ -22,13 +22,13 @@ package org.apache.isis.metamodel.facets.value;
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.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.metamodel.facets.value.password.PasswordValueSemanticsProvider;
-import static org.junit.Assert.assertEquals;
-
public class PasswordValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
private PasswordValueSemanticsProvider adapter;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ShortValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ShortValueSemanticsProviderTest.java
index 93e4f27..3c0df35 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ShortValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ShortValueSemanticsProviderTest.java
@@ -22,6 +22,9 @@ package org.apache.isis.metamodel.facets.value;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
import org.apache.isis.metamodel.context.MetaModelContextAware;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
@@ -30,9 +33,6 @@ import org.apache.isis.metamodel.facets.value.shortint.ShortValueSemanticsProvid
import org.apache.isis.metamodel.facets.value.shortint.ShortWrapperValueSemanticsProvider;
import org.apache.isis.unittestsupport.config.internal._Config;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
public class ShortValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
private ShortValueSemanticsProviderAbstract value;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/StringValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/StringValueSemanticsProviderTest.java
index 3298717..57e362a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/StringValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/StringValueSemanticsProviderTest.java
@@ -22,12 +22,12 @@ package org.apache.isis.metamodel.facets.value;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.metamodel.facets.value.string.StringValueSemanticsProvider;
-import static org.junit.Assert.assertEquals;
-
public class StringValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
private StringValueSemanticsProvider value;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
index 403d7a5..440cd74 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
@@ -29,6 +29,13 @@ 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.metamodel.MetaModelContext_forTesting;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.context.MetaModelContext;
@@ -43,13 +50,6 @@ import org.apache.isis.unittestsupport.config.internal._Config;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-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;
-
public abstract class ValueSemanticsProviderAbstractTestCase {
@Rule
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java
index ba73a12..d7e9b3e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java
@@ -25,16 +25,16 @@ 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.junit.Assert.assertThat;
+
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.metamodel.MetaModelContext_forTesting;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.unittestsupport.config.internal._Config;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
public class JodaLocalDateTimeValueSemanticsProviderTest {
@Rule
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/feature/ObjectAssociationPredicatesTest_visibleWhere.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/feature/ObjectAssociationPredicatesTest_visibleWhere.java
index eff4a9a..32c0d75 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/feature/ObjectAssociationPredicatesTest_visibleWhere.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/feature/ObjectAssociationPredicatesTest_visibleWhere.java
@@ -33,6 +33,9 @@ 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.junit.Assert.assertThat;
+
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.metamodel.facetapi.Facet;
@@ -42,9 +45,6 @@ import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
@RunWith(Parameterized.class)
public class ObjectAssociationPredicatesTest_visibleWhere {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_usingFields.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_usingFields.java
index dd3e6bf..655f58d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_usingFields.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_usingFields.java
@@ -32,15 +32,15 @@ import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.annotation.DirtiesContext.ClassMode;
import org.springframework.test.context.ActiveProfiles;
+import static org.hamcrest.Matchers.any;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.config.IsisModuleConfig;
import org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring;
import org.apache.isis.metamodel.services.registry.ServiceRegistryDefault;
-import static org.hamcrest.Matchers.any;
-import static org.junit.Assert.assertThat;
-
import lombok.Getter;
@ActiveProfiles("test")
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_validateServices.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_validateServices.java
index 665078e..bb26f23 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_validateServices.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_validateServices.java
@@ -29,14 +29,14 @@ 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;
import org.apache.isis.metamodel.services.registry.ServiceRegistryDefault;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
-
@ActiveProfiles("test")
@SpringBootTest(classes = {
ServiceInjectorDefault.class,
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_validateServices_happy.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_validateServices_happy.java
index 0288b42..da60f06 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_validateServices_happy.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest_validateServices_happy.java
@@ -30,14 +30,14 @@ 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.config.IsisModuleConfig;
import org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring;
import org.apache.isis.metamodel.services.registry.ServiceRegistryDefault;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
@ActiveProfiles("test")
@SpringBootTest(classes = {
IsisModuleConfig.class,
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorLegacyTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorLegacyTest.java
index a00237e..9a0e6a9 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorLegacyTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorLegacyTest.java
@@ -32,6 +32,9 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;
import org.springframework.test.context.ActiveProfiles;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.repository.RepositoryService;
@@ -42,9 +45,6 @@ import org.apache.isis.metamodel.services.registry.ServiceRegistryDefault;
import org.apache.isis.metamodel.spec.InjectorMethodEvaluator;
import org.apache.isis.metamodel.specloader.InjectorMethodEvaluatorDefault;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import lombok.Data;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureIdTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureIdTest.java
index c544f87..81a49b2 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureIdTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureIdTest.java
@@ -29,10 +29,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import org.apache.isis.applib.services.appfeat.ApplicationMemberType;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.value.ValueTypeContractTestAbstract;
-
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
@@ -42,6 +38,10 @@ import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.lessThan;
import static org.junit.Assert.assertThat;
+import org.apache.isis.applib.services.appfeat.ApplicationMemberType;
+import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.unittestsupport.value.ValueTypeContractTestAbstract;
+
public class ApplicationFeatureIdTest {
@Rule
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java
index 0443f14..4d53b91 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java
@@ -30,6 +30,13 @@ 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.factory.FactoryService;
@@ -51,13 +58,6 @@ import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-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;
-
public class ApplicationFeatureRepositoryDefaultTest {
@Rule
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureTest.java
index ee0e935..09fa29c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureTest.java
@@ -23,12 +23,12 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import org.apache.isis.applib.services.appfeat.ApplicationMemberType;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.junit.Assert.assertThat;
+import org.apache.isis.applib.services.appfeat.ApplicationMemberType;
+
public class ApplicationFeatureTest {
public static class GetContents_and_AddToContents extends ApplicationFeatureTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/exceprecog/ExceptionRecognizerDocDefault_recognizes_Test.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/exceprecog/ExceptionRecognizerDocDefault_recognizes_Test.java
index f33ce08..31b2611 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/exceprecog/ExceptionRecognizerDocDefault_recognizes_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/exceprecog/ExceptionRecognizerDocDefault_recognizes_Test.java
@@ -23,13 +23,13 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
+import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+
public class ExceptionRecognizerDocDefault_recognizes_Test {
static class SomeRandomException extends Exception {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/grid/BS3GridTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/grid/BS3GridTest.java
index de562c8..b5bc73b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/grid/BS3GridTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/grid/BS3GridTest.java
@@ -26,6 +26,10 @@ 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.junit.Assert.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;
@@ -41,10 +45,6 @@ import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.metamodel.services.grid.bootstrap3.GridSystemServiceBS3;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
public class BS3GridTest {
private JaxbService jaxbService;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationCacheDefaultTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationCacheDefaultTest.java
index a90a2a8..c20adc0 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationCacheDefaultTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationCacheDefaultTest.java
@@ -25,16 +25,16 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.metamodel.spec.ObjectSpecId;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertThat;
+import org.apache.isis.metamodel.spec.ObjectSpecId;
+import org.apache.isis.metamodel.spec.ObjectSpecification;
+import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+
import lombok.val;
public class SpecificationCacheDefaultTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTestAbstract.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTestAbstract.java
index ec03878..4e6dba9 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTestAbstract.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTestAbstract.java
@@ -25,6 +25,10 @@ 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.TranslationService.Mode;
@@ -47,10 +51,6 @@ import org.apache.isis.metamodel.progmodels.dflt.ProgrammingModelFacetsJava8;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.mockito.Mockito.when;
-
import lombok.val;
abstract class SpecificationLoaderTestAbstract {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTest_array.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTest_array.java
index 2a99967..da3f052 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTest_array.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTest_array.java
@@ -21,15 +21,15 @@ package org.apache.isis.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.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.metamodel.spec.ObjectSpecification;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
class SpecificationLoaderTest_array extends SpecificationLoaderTestAbstract {
@Override
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTest_collection.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTest_collection.java
index c52eb43..86fe43e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTest_collection.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTest_collection.java
@@ -23,15 +23,15 @@ 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 org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.metamodel.spec.ObjectSpecification;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
class SpecificationLoaderTest_collection extends SpecificationLoaderTestAbstract {
@Override
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTest_value.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTest_value.java
index 1da52d8..5b450a2 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTest_value.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTest_value.java
@@ -21,11 +21,11 @@ package org.apache.isis.metamodel.specloader;
import org.junit.jupiter.api.Test;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.apache.isis.metamodel.spec.ObjectSpecification;
+
class SpecificationLoaderTest_value extends SpecificationLoaderTestAbstract {
@Override
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/classsubstitutor/ClassSubstitutorTest_getClass.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/classsubstitutor/ClassSubstitutorTest_getClass.java
index 822a03b..5b4f46e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/classsubstitutor/ClassSubstitutorTest_getClass.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/classsubstitutor/ClassSubstitutorTest_getClass.java
@@ -22,11 +22,11 @@ package org.apache.isis.metamodel.specloader.classsubstitutor;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
import org.apache.isis.metamodel.services.classsubstitutor.ClassSubstitutor;
import org.apache.isis.metamodel.services.classsubstitutor.ClassSubstitutorDefault;
-import static org.junit.Assert.assertEquals;
-
public class ClassSubstitutorTest_getClass {
private ClassSubstitutor classSubstitutor;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/specimpl/IntrospectionState_comparable_Test.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/specimpl/IntrospectionState_comparable_Test.java
index 61f9df7..d26d4e2 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/specimpl/IntrospectionState_comparable_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/specimpl/IntrospectionState_comparable_Test.java
@@ -23,11 +23,12 @@ import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
import static org.apache.isis.metamodel.specloader.specimpl.IntrospectionState.MEMBERS_BEING_INTROSPECTED;
import static org.apache.isis.metamodel.specloader.specimpl.IntrospectionState.NOT_INTROSPECTED;
import static org.apache.isis.metamodel.specloader.specimpl.IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
public class IntrospectionState_comparable_Test {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/specimpl/ObjectActionMixedInTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/specimpl/ObjectActionMixedInTest.java
index 1b243cd..3c7186e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/specimpl/ObjectActionMixedInTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/specimpl/ObjectActionMixedInTest.java
@@ -20,11 +20,11 @@ package org.apache.isis.metamodel.specloader.specimpl;
import org.junit.Test;
-import org.apache.isis.metamodel.commons.StringExtensions;
-
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.metamodel.commons.StringExtensions;
+
public class ObjectActionMixedInTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
index 813b3dd..9433537 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
@@ -27,6 +27,9 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
@@ -40,9 +43,6 @@ import org.apache.isis.metamodel.spec.feature.ObjectActionParameter;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
public class ObjectActionParameterAbstractTest_getId_and_getName {
@Rule
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
index e789c38..3d890f1 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
@@ -25,6 +25,9 @@ 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;
@@ -43,9 +46,6 @@ import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
public class ObjectAssociationAbstractTest {
@Rule
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
index dbb4298..92f5662 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
@@ -25,6 +25,11 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+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;
@@ -44,11 +49,6 @@ import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
public class ObjectAssociationAbstractTest_alwaysHidden {
@Rule
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession5.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession5.java
index 64e6b12..20dfc98 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession5.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession5.java
@@ -27,6 +27,8 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
+import static java.util.Objects.requireNonNull;
+
import javax.annotation.Nullable;
import javax.enterprise.inject.Vetoed;
import javax.jdo.FetchGroup;
@@ -92,7 +94,6 @@ import org.apache.isis.persistence.jdo.datanucleus5.persistence.query.Persistenc
import org.apache.isis.persistence.jdo.datanucleus5.persistence.query.PersistenceQueryFindUsingApplibQueryDefault;
import org.apache.isis.security.api.authentication.AuthenticationSession;
-import static java.util.Objects.requireNonNull;
import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
import lombok.Getter;
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/metamodel/specloader/ObjectReflectorDefaultTest_object.java b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/metamodel/specloader/ObjectReflectorDefaultTest_object.java
index b252e02..eda2673 100644
--- a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/metamodel/specloader/ObjectReflectorDefaultTest_object.java
+++ b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/metamodel/specloader/ObjectReflectorDefaultTest_object.java
@@ -22,6 +22,11 @@ package org.apache.isis.metamodel.specloader;
import org.datanucleus.enhancement.Persistable;
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.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacet;
@@ -32,11 +37,6 @@ import org.apache.isis.metamodel.facets.object.plural.PluralFacet;
import org.apache.isis.metamodel.facets.object.title.TitleFacet;
import org.apache.isis.metamodel.spec.ObjectSpecification;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
class ObjectReflectorDefaultTest_object extends SpecificationLoaderTestAbstract {
public abstract static class TestDomainObject implements Persistable {
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java
index 6943d4b..09f5e7f 100644
--- a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java
+++ b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java
@@ -21,12 +21,12 @@ package org.apache.isis.persistence.jdo.datanucleus5.exceprecog;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.unittestsupport.config.internal._Config;
-
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.unittestsupport.config.internal._Config;
+
import lombok.val;
public class ExceptionRecognizerCompositeForJdoObjectStoreTest {
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_refineMetaModel.java b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_refineMetaModel.java
index 331aa72..a0eb9d3 100644
--- a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_refineMetaModel.java
+++ b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_refineMetaModel.java
@@ -26,6 +26,9 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.applib.Identifier;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.metamodel.facets.all.deficiencies.DeficiencyFacet;
@@ -37,9 +40,6 @@ import org.apache.isis.metamodel.specloader.validator.ValidationFailures;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import lombok.val;
public class JdoVersionAnnotationFacetFactoryTest_refineMetaModel {
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactoryTest.java b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactoryTest.java
index bbdc56c..3162f77 100644
--- a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactoryTest.java
+++ b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactoryTest.java
@@ -20,15 +20,15 @@ package org.apache.isis.persistence.jdo.datanucleus5.metamodel.facets.prop.colum
import java.lang.reflect.Method;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.FacetFactory;
import org.apache.isis.metamodel.facets.value.bigdecimal.BigDecimalValueFacet;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import lombok.val;
public class BigDecimalDerivedFromJdoColumnAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/MandatoryDerivedFromJdoColumnAnnotationFacetFactoryTest.java b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/MandatoryDerivedFromJdoColumnAnnotationFacetFactoryTest.java
index 0e71b9b..ee86801 100644
--- a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/MandatoryDerivedFromJdoColumnAnnotationFacetFactoryTest.java
+++ b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/prop/column/MandatoryDerivedFromJdoColumnAnnotationFacetFactoryTest.java
@@ -20,14 +20,14 @@ package org.apache.isis.persistence.jdo.datanucleus5.metamodel.facets.prop.colum
import java.lang.reflect.Method;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.metamodel.facetapi.FeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.FacetFactory;
import org.apache.isis.metamodel.facets.objectvalue.mandatory.MandatoryFacet;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import lombok.val;
public class MandatoryDerivedFromJdoColumnAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
index 0aa3f74..c603a6a 100644
--- a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
+++ b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
@@ -25,6 +25,8 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.adapter.oid.Oid.Factory;
import org.apache.isis.metamodel.spec.ObjectSpecId;
@@ -34,8 +36,6 @@ import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import static org.junit.Assert.assertEquals;
-
public class PojoAdapterTest {
@Rule
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault_wrappedObject_Test.java b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
index d601662..0822142 100644
--- a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
+++ b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
@@ -30,6 +30,10 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.command.CommandContext;
import org.apache.isis.applib.services.factory.FactoryService;
@@ -71,10 +75,6 @@ import org.apache.isis.unittestsupport.config.internal._Config;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
-
public class WrapperFactoryDefault_wrappedObject_Test {
@Rule
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
index 0a8d290..683e842 100644
--- a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
+++ b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
@@ -30,6 +30,9 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.factory.FactoryService;
@@ -66,8 +69,6 @@ import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import static org.apache.isis.unittestsupport.jmocking.PostponedAction.returnValuePostponed;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
/**
* Contract test.
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java
index ba4ebd6..c8da7f0 100644
--- a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java
+++ b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java
@@ -26,6 +26,15 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import static org.hamcrest.Matchers.emptyString;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.metamodel.MetaModelContext_forTesting;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
@@ -59,15 +68,6 @@ import org.apache.isis.security.api.authentication.AuthenticationSessionProvider
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import static org.hamcrest.Matchers.emptyString;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.not;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
public class ObjectMemberAbstractTest {
@Rule
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/userreg/EmailNotificationServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/userreg/EmailNotificationServiceDefault.java
index 20c3fc3..ea50856 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/userreg/EmailNotificationServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/userreg/EmailNotificationServiceDefault.java
@@ -24,6 +24,9 @@ import java.util.Collections;
import java.util.List;
import java.util.regex.Pattern;
+import static java.util.regex.Pattern.compile;
+import static java.util.regex.Pattern.quote;
+
import javax.annotation.PostConstruct;
import javax.inject.Inject;
import javax.inject.Named;
@@ -41,9 +44,6 @@ import org.apache.isis.applib.services.userreg.events.EmailRegistrationEvent;
import org.apache.isis.applib.services.userreg.events.PasswordResetEvent;
import org.apache.isis.commons.internal.resources._Resources;
-import static java.util.regex.Pattern.compile;
-import static java.util.regex.Pattern.quote;
-
import lombok.extern.log4j.Log4j2;
/**
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/changes/PreAndPostValues_shouldAudit_Test.java b/core/runtime-services/src/test/java/org/apache/isis/runtime/services/changes/PreAndPostValues_shouldAudit_Test.java
index c5ae1f0..f90e0c3 100644
--- a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/changes/PreAndPostValues_shouldAudit_Test.java
+++ b/core/runtime-services/src/test/java/org/apache/isis/runtime/services/changes/PreAndPostValues_shouldAudit_Test.java
@@ -20,12 +20,12 @@ package org.apache.isis.runtime.services.changes;
import org.junit.Test;
-import org.apache.isis.runtime.persistence.transaction.IsisTransactionPlaceholder;
-import org.apache.isis.runtime.persistence.transaction.PreAndPostValues;
-
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import org.apache.isis.runtime.persistence.transaction.IsisTransactionPlaceholder;
+import org.apache.isis.runtime.persistence.transaction.PreAndPostValues;
+
public class PreAndPostValues_shouldAudit_Test {
@Test
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/email/EmailServiceDefaultTest_actually.java b/core/runtime-services/src/test/java/org/apache/isis/runtime/services/email/EmailServiceDefaultTest_actually.java
index a9cc761..7a3fcf3 100644
--- a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/email/EmailServiceDefaultTest_actually.java
+++ b/core/runtime-services/src/test/java/org/apache/isis/runtime/services/email/EmailServiceDefaultTest_actually.java
@@ -20,14 +20,14 @@ package org.apache.isis.runtime.services.email;
import org.junit.Test;
-import org.apache.isis.commons.internal.collections._Lists;
-
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
+import org.apache.isis.commons.internal.collections._Lists;
+
public class EmailServiceDefaultTest_actually {
@Test
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/i18n/po/PoReaderTest.java b/core/runtime-services/src/test/java/org/apache/isis/runtime/services/i18n/po/PoReaderTest.java
index 5961de4..3507877 100644
--- a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/i18n/po/PoReaderTest.java
+++ b/core/runtime-services/src/test/java/org/apache/isis/runtime/services/i18n/po/PoReaderTest.java
@@ -28,16 +28,16 @@ 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.junit.Assert.assertThat;
+
import org.apache.isis.applib.services.i18n.LocaleProvider;
import org.apache.isis.applib.services.i18n.TranslationsResolver;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
public class PoReaderTest {
@Rule public JUnitRuleMockery2 context = JUnitRuleMockery2
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefaultTest.java b/core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefaultTest.java
index 379dad8..9bbb6f5 100644
--- a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefaultTest.java
+++ b/core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefaultTest.java
@@ -25,16 +25,16 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.applib.services.wrapper.WrapperFactory;
-import org.apache.isis.applib.services.wrapper.WrappingObject;
-import org.apache.isis.runtime.services.wrapper.proxy.ProxyCreator;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-
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.applib.services.wrapper.WrapperFactory;
+import org.apache.isis.applib.services.wrapper.WrappingObject;
+import org.apache.isis.runtime.services.wrapper.proxy.ProxyCreator;
+import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+
import lombok.RequiredArgsConstructor;
public class WrapperFactoryDefaultTest {
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectActionLayoutXmlDefaultTest.java b/core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectActionLayoutXmlDefaultTest.java
index 027b0e8..cf9f437 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectActionLayoutXmlDefaultTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectActionLayoutXmlDefaultTest.java
@@ -25,6 +25,11 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.applib.Identifier;
import org.apache.isis.metamodel.MetaModelContext_forTesting;
import org.apache.isis.metamodel.context.MetaModelContext;
@@ -37,11 +42,6 @@ import org.apache.isis.security.api.authentication.AuthenticationSessionProvider
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-
public class ObjectActionLayoutXmlDefaultTest {
@Rule
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/OneToManyAssociationDefaultTest.java b/core/runtime/src/test/java/org/apache/isis/runtime/system/OneToManyAssociationDefaultTest.java
index ec91418..1aa4c24 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/OneToManyAssociationDefaultTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/runtime/system/OneToManyAssociationDefaultTest.java
@@ -25,6 +25,10 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.metamodel.MetaModelContext_forTesting;
@@ -42,10 +46,6 @@ import org.apache.isis.security.api.authentication.AuthenticationSessionProvider
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-
public class OneToManyAssociationDefaultTest {
private static final String COLLECTION_ID = "orders";
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/TypeExtractorMethodReturnTest.java b/core/runtime/src/test/java/org/apache/isis/runtime/system/TypeExtractorMethodReturnTest.java
index 71c57d9..4ec0db3 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/TypeExtractorMethodReturnTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/runtime/system/TypeExtractorMethodReturnTest.java
@@ -24,13 +24,14 @@ import java.util.List;
import org.junit.Test;
-import org.apache.isis.metamodel.specloader.traverser.TypeExtractorMethodReturn;
-
-import static org.apache.isis.runtime.system.TypeExtractorMethodsParametersTest.containsElementThat;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.metamodel.specloader.traverser.TypeExtractorMethodReturn;
+
+import static org.apache.isis.runtime.system.TypeExtractorMethodsParametersTest.containsElementThat;
+
public class TypeExtractorMethodReturnTest {
@Test
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/TypeExtractorMethodsParametersTest.java b/core/runtime/src/test/java/org/apache/isis/runtime/system/TypeExtractorMethodsParametersTest.java
index 0e8e443..5faef21 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/TypeExtractorMethodsParametersTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/runtime/system/TypeExtractorMethodsParametersTest.java
@@ -27,12 +27,12 @@ import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
import org.junit.Test;
-import org.apache.isis.metamodel.specloader.traverser.TypeExtractorMethodParameters;
-
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.metamodel.specloader.traverser.TypeExtractorMethodParameters;
+
public class TypeExtractorMethodsParametersTest {
@Test
diff --git a/core/security/api/src/test/java/org/apache/isis/security/EncodabilityContractTest.java b/core/security/api/src/test/java/org/apache/isis/security/EncodabilityContractTest.java
index e5e571c..56e831d 100644
--- a/core/security/api/src/test/java/org/apache/isis/security/EncodabilityContractTest.java
+++ b/core/security/api/src/test/java/org/apache/isis/security/EncodabilityContractTest.java
@@ -28,17 +28,17 @@ import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Before;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+
import org.apache.isis.commons.internal.encoding.DataInputExtended;
import org.apache.isis.commons.internal.encoding.DataInputStreamExtended;
import org.apache.isis.commons.internal.encoding.DataOutputStreamExtended;
import org.apache.isis.commons.internal.encoding.Encodable;
import org.apache.isis.security.api.authentication.AuthenticationSession;
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
-
public abstract class EncodabilityContractTest {
protected final Mockery context = new JUnit4Mockery();
diff --git a/core/security/api/src/test/java/org/apache/isis/security/authentication/standard/AuthenticationManager_authenticators_Test.java b/core/security/api/src/test/java/org/apache/isis/security/authentication/standard/AuthenticationManager_authenticators_Test.java
index e5bce4b..4fefa4f 100644
--- a/core/security/api/src/test/java/org/apache/isis/security/authentication/standard/AuthenticationManager_authenticators_Test.java
+++ b/core/security/api/src/test/java/org/apache/isis/security/authentication/standard/AuthenticationManager_authenticators_Test.java
@@ -28,16 +28,16 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.sameInstance;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
import org.apache.isis.security.api.authentication.standard.Authenticator;
import org.apache.isis.security.api.authentication.standard.NoAuthenticatorException;
import org.apache.isis.security.api.authentication.standard.RandomCodeGeneratorDefault;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.sameInstance;
-import static org.junit.Assert.assertThat;
-
@RunWith(JMock.class)
public class AuthenticationManager_authenticators_Test {
diff --git a/core/security/api/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java b/core/security/api/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java
index 4300fa1..0d93ce0 100644
--- a/core/security/api/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java
+++ b/core/security/api/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java
@@ -19,13 +19,13 @@
package org.apache.isis.security.authentication.standard;
-import org.apache.isis.security.EncodabilityContractTest;
-import org.apache.isis.security.api.authentication.standard.SimpleSession;
-
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.security.EncodabilityContractTest;
+import org.apache.isis.security.api.authentication.standard.SimpleSession;
+
public abstract class SimpleSessionEncodabilityTestAbstract extends EncodabilityContractTest {
@Override
diff --git a/core/security/api/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java b/core/security/api/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
index fca5e7f..679c53f 100644
--- a/core/security/api/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
+++ b/core/security/api/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
@@ -32,6 +32,9 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.security.api.authentication.AuthenticationRequest;
import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
import org.apache.isis.security.api.authentication.AuthenticationSession;
@@ -39,9 +42,6 @@ import org.apache.isis.security.api.authentication.manager.AuthenticationManager
import org.apache.isis.security.api.authentication.standard.Authenticator;
import org.apache.isis.security.api.authentication.standard.RandomCodeGenerator;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
@RunWith(JMock.class)
public class StandardAuthenticationManager_AuthenticationTest {
diff --git a/core/security/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_setParts.java b/core/security/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_setParts.java
index 828cb62..9780479 100644
--- a/core/security/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_setParts.java
+++ b/core/security/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_setParts.java
@@ -21,11 +21,11 @@ package org.apache.isis.security.shiro;
import org.junit.Test;
-import org.apache.isis.security.shiro.authorization.IsisPermission;
-
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.security.shiro.authorization.IsisPermission;
+
public class IsisPermissionTest_setParts {
@Test
diff --git a/core/security/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_typicalUsage.java b/core/security/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_typicalUsage.java
index 2126845..8e821fa 100644
--- a/core/security/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_typicalUsage.java
+++ b/core/security/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_typicalUsage.java
@@ -27,11 +27,11 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.security.shiro.authorization.IsisPermission;
-
import static org.hamcrest.CoreMatchers.not;
import static org.junit.Assert.assertThat;
+import org.apache.isis.security.shiro.authorization.IsisPermission;
+
public class IsisPermissionTest_typicalUsage {
diff --git a/core/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java b/core/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
index 0f848fd..c8972fd 100644
--- a/core/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
+++ b/core/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
@@ -29,6 +29,11 @@ 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.assertThat;
+
import org.apache.isis.applib.Identifier;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.security.api.authentication.AuthenticationRequest;
@@ -39,11 +44,6 @@ import org.apache.isis.security.shiro.authorization.AuthorizorShiro;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
import lombok.val;
public class ShiroAuthenticatorOrAuthorizorTest_authenticate {
diff --git a/core/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java b/core/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
index bba9770..d093a82 100644
--- a/core/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
+++ b/core/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
@@ -30,6 +30,9 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.applib.Identifier;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.security.api.authentication.AuthenticationRequest;
@@ -40,9 +43,6 @@ import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import lombok.val;
public class ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole {
diff --git a/core/security/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIniTest.java b/core/security/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIniTest.java
index ad71b67..5937492 100644
--- a/core/security/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIniTest.java
+++ b/core/security/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIniTest.java
@@ -22,12 +22,12 @@ import java.util.Set;
import org.apache.shiro.config.Ini;
import org.junit.Test;
-import org.apache.isis.commons.internal.collections._Sets;
-
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.commons.internal.collections._Sets;
+
public class PermissionToRoleMapperFromIniTest {
@Test
diff --git a/core/security/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromStringTest.java b/core/security/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromStringTest.java
index 2393cae..15f7c68 100644
--- a/core/security/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromStringTest.java
+++ b/core/security/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromStringTest.java
@@ -21,12 +21,12 @@ import java.util.Set;
import org.junit.Test;
-import org.apache.isis.commons.internal.collections._Sets;
-
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.commons.internal.collections._Sets;
+
public class PermissionToRoleMapperFromStringTest {
@Test
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java
index 206ab13..4933f6e 100644
--- a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java
+++ b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java
@@ -30,6 +30,11 @@ import javax.jdo.annotations.Persistent;
import org.hamcrest.Matchers;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.unittestsupport.AbstractApplyToAllContractTest;
import org.apache.isis.unittestsupport.utils.CollectUtils;
import org.apache.isis.unittestsupport.utils.ReflectUtils;
@@ -44,10 +49,6 @@ import static org.apache.isis.unittestsupport.utils.ReflectUtils.withEntityParam
import static org.apache.isis.unittestsupport.utils.ReflectUtils.withParametersAssignableFrom;
import static org.apache.isis.unittestsupport.utils.ReflectUtils.withReturnTypeAssignableFrom;
import static org.apache.isis.unittestsupport.utils.ReflectUtils.withTypeAssignableFrom;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.Matchers.greaterThan;
-import static org.junit.Assert.assertThat;
public abstract class BidirectionalRelationshipContractTestAbstract extends AbstractApplyToAllContractTest implements Instantiators {
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/comparable/ComparableContractTester.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/comparable/ComparableContractTester.java
index 176abe3..7f9597a 100644
--- a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/comparable/ComparableContractTester.java
+++ b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/comparable/ComparableContractTester.java
@@ -22,11 +22,11 @@ import java.util.List;
import org.hamcrest.Matchers;
-import org.apache.isis.commons.internal.collections._Lists;
-
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.commons.internal.collections._Lists;
+
public class ComparableContractTester<T extends Comparable<T>> {
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAbstract.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAbstract.java
index 700408a..db8119c 100644
--- a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAbstract.java
+++ b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAbstract.java
@@ -22,13 +22,14 @@ import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.Set;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.commons.internal.reflection._Reflect;
import org.apache.isis.unittestsupport.AbstractApplyToAllContractTest;
import static org.apache.isis.commons.internal.collections._Collections.toHashSet;
import static org.apache.isis.commons.internal.reflection._Reflect.withPrefix;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
/**
* Ensure that subclasses do not inadvertently override an <tt>injectXxx()</tt> method that
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2.java
index c93bb9b..585c64e 100644
--- a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2.java
+++ b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2.java
@@ -24,6 +24,9 @@ import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.util.List;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.jmock.integration.junit4.JUnit4Mockery;
@@ -35,14 +38,12 @@ import org.junit.runners.model.Statement;
import org.picocontainer.MutablePicoContainer;
import org.picocontainer.PicoBuilder;
+import static org.junit.Assert.fail;
+
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static org.junit.Assert.fail;
-
import junit.framework.AssertionFailedError;
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java
index a14ba8f..7555188 100644
--- a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java
+++ b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java
@@ -23,13 +23,14 @@ import java.util.Collection;
import java.util.Set;
import java.util.SortedSet;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.commons.internal.reflection._Reflect;
import org.apache.isis.unittestsupport.AbstractApplyToAllContractTest;
import static org.apache.isis.commons.internal.collections._Collections.toHashSet;
import static org.apache.isis.commons.internal.reflection._Reflect.withTypeAssignableTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
public abstract class SortedSetsContractTestAbstract extends AbstractApplyToAllContractTest {
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_arrayGet_arraySetElementAt.java b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_arrayGet_arraySetElementAt.java
index 035ab2e..54ed179 100644
--- a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_arrayGet_arraySetElementAt.java
+++ b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_arrayGet_arraySetElementAt.java
@@ -23,12 +23,13 @@ import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
-import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
+import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class JsonRepresentationTest_arrayGet_arraySetElementAt {
private JsonRepresentation jsonRepresentation;
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_asInputStream.java b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_asInputStream.java
index 297e6db..0a3978d 100644
--- a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_asInputStream.java
+++ b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_asInputStream.java
@@ -25,15 +25,16 @@ import java.nio.charset.StandardCharsets;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.commons.internal.base._Bytes;
-import org.apache.isis.commons.internal.base._Strings;
-
-import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
+import org.apache.isis.commons.internal.base._Bytes;
+import org.apache.isis.commons.internal.base._Strings;
+
+import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class JsonRepresentationTest_asInputStream {
private JsonRepresentation jsonRepresentation;
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getArray.java b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getArray.java
index e5fb426..01af19a 100644
--- a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getArray.java
+++ b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getArray.java
@@ -23,13 +23,14 @@ import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
-import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
+import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class JsonRepresentationTest_getArray {
private JsonRepresentation jsonRepresentation;
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBigDecimal.java b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBigDecimal.java
index ce38401..809d328 100644
--- a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBigDecimal.java
+++ b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBigDecimal.java
@@ -26,11 +26,12 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
+import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class JsonRepresentationTest_getBigDecimal {
@Rule
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBigInteger.java b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBigInteger.java
index 0cec163..28b0794 100644
--- a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBigInteger.java
+++ b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBigInteger.java
@@ -26,11 +26,12 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
+import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class JsonRepresentationTest_getBigInteger {
@Rule
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBoolean.java b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBoolean.java
index 18910b4..b32159f 100644
--- a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBoolean.java
+++ b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBoolean.java
@@ -23,12 +23,13 @@ import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
-import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
+import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class JsonRepresentationTest_getBoolean {
private JsonRepresentation jsonRepresentation;
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getDouble.java b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getDouble.java
index 54f80e8..6d7123f 100644
--- a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getDouble.java
+++ b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getDouble.java
@@ -25,12 +25,13 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
+import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class JsonRepresentationTest_getDouble {
@Rule
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getInt.java b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getInt.java
index 563dd35..503ea81 100644
--- a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getInt.java
+++ b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getInt.java
@@ -23,12 +23,13 @@ import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
-import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
+import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class JsonRepresentationTest_getInt {
private JsonRepresentation jsonRepresentation;
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getLink_isLink.java b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getLink_isLink.java
index 4caec69..2c37e47 100644
--- a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getLink_isLink.java
+++ b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getLink_isLink.java
@@ -23,13 +23,14 @@ import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
-import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
+import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class JsonRepresentationTest_getLink_isLink {
private LinkRepresentation link;
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getLong.java b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getLong.java
index 977c223..241260b 100644
--- a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getLong.java
+++ b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getLong.java
@@ -23,12 +23,13 @@ import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
-import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
+import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class JsonRepresentationTest_getLong {
private JsonRepresentation jsonRepresentation;
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getNull_isNull.java b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getNull_isNull.java
index 97aa956..de561da 100644
--- a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getNull_isNull.java
+++ b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getNull_isNull.java
@@ -23,13 +23,14 @@ import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
-import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
+import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class JsonRepresentationTest_getNull_isNull {
private JsonRepresentation jsonRepresentation;
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getRepresentation.java b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getRepresentation.java
index 9eb419a..9ba78ca 100644
--- a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getRepresentation.java
+++ b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getRepresentation.java
@@ -23,11 +23,12 @@ import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
-import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
+import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class JsonRepresentationTest_getRepresentation {
private JsonRepresentation jsonRepresentation;
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getString_isString.java b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getString_isString.java
index 4055117..6c72963 100644
--- a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getString_isString.java
+++ b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getString_isString.java
@@ -23,12 +23,13 @@ import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
-import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
+import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class JsonRepresentationTest_getString_isString {
private JsonRepresentation jsonRepresentation;
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_isArray_isMap_isValue.java b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_isArray_isMap_isValue.java
index b4e8790..a08c6c8 100644
--- a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_isArray_isMap_isValue.java
+++ b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_isArray_isMap_isValue.java
@@ -23,10 +23,11 @@ import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
-import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class JsonRepresentationTest_isArray_isMap_isValue {
private JsonRepresentation jsonRepresentation;
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_mapHas.java b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_mapHas.java
index f214df9..db020db 100644
--- a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_mapHas.java
+++ b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_mapHas.java
@@ -22,10 +22,11 @@ import java.io.IOException;
import org.junit.Test;
-import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class JsonRepresentationTest_mapHas {
private JsonRepresentation jsonRepresentation;
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_size.java b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_size.java
index be56b64..92cfeee 100644
--- a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_size.java
+++ b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_size.java
@@ -22,10 +22,11 @@ import java.io.IOException;
import org.junit.Test;
-import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class JsonRepresentationTest_size {
private JsonRepresentation jsonRepresentation;
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_streamArrayElements.java b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_streamArrayElements.java
index 6082353..cb1cce9 100644
--- a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_streamArrayElements.java
+++ b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_streamArrayElements.java
@@ -23,10 +23,11 @@ import java.util.Iterator;
import org.junit.Test;
-import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class JsonRepresentationTest_streamArrayElements {
private JsonRepresentation jsonRepresentation;
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_streamMapEntries.java b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_streamMapEntries.java
index 138d14e..41ef696 100644
--- a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_streamMapEntries.java
+++ b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_streamMapEntries.java
@@ -24,12 +24,13 @@ import java.util.Map.Entry;
import org.junit.Test;
-import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
+import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class JsonRepresentationTest_streamMapEntries {
private JsonRepresentation jsonRepresentation;
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_parser_ContractTest.java b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_parser_ContractTest.java
index d4f9e10..c8ff3a2 100644
--- a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_parser_ContractTest.java
+++ b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_parser_ContractTest.java
@@ -20,10 +20,10 @@ package org.apache.isis.viewer.restfulobjects.applib;
import org.junit.Test;
-import org.apache.isis.viewer.restfulobjects.applib.util.Parser;
-
import static org.junit.Assert.assertSame;
+import org.apache.isis.viewer.restfulobjects.applib.util.Parser;
+
/**
* contract test.
*/
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_DomainModelTest_parser.java b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_DomainModelTest_parser.java
index 6f0f218..fd7f748 100644
--- a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_DomainModelTest_parser.java
+++ b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_DomainModelTest_parser.java
@@ -20,11 +20,11 @@ package org.apache.isis.viewer.restfulobjects.applib.client;
import org.junit.Test;
+import static org.junit.Assert.assertSame;
+
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulRequest.DomainModel;
import org.apache.isis.viewer.restfulobjects.applib.util.Parser;
-import static org.junit.Assert.assertSame;
-
public class RestfulRequest_DomainModelTest_parser {
@Test
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrodomainmodel.java b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrodomainmodel.java
index 01035a0..8a6b963 100644
--- a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrodomainmodel.java
+++ b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrodomainmodel.java
@@ -21,13 +21,13 @@ package org.apache.isis.viewer.restfulobjects.applib.client;
import org.junit.Before;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulRequest.DomainModel;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulRequest.RequestParameter;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
public class RestfulRequest_RequestParameterTest_valueOf_xrodomainmodel {
private final RequestParameter<DomainModel> requestParameter = RestfulRequest.RequestParameter.DOMAIN_MODEL;
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrofollowlinks.java b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrofollowlinks.java
index e5ab006..8fdd2b5 100644
--- a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrofollowlinks.java
+++ b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrofollowlinks.java
@@ -23,12 +23,12 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
-import org.apache.isis.viewer.restfulobjects.applib.client.RestfulRequest.RequestParameter;
-
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
+import org.apache.isis.viewer.restfulobjects.applib.client.RestfulRequest.RequestParameter;
+
public class RestfulRequest_RequestParameterTest_valueOf_xrofollowlinks {
private final RequestParameter<List<List<String>>> requestParameter = RestfulRequest.RequestParameter.FOLLOW_LINKS;
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse_HttpStatusCodeTest.java b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse_HttpStatusCodeTest.java
index a4f8d95..d38024b 100644
--- a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse_HttpStatusCodeTest.java
+++ b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse_HttpStatusCodeTest.java
@@ -22,11 +22,11 @@ import javax.ws.rs.core.Response.Status.Family;
import org.junit.Test;
-import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse.HttpStatusCode;
-
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse.HttpStatusCode;
+
public class RestfulResponse_HttpStatusCodeTest {
@Test
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollection.java b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollection.java
index f1b19da..ef0065c 100644
--- a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollection.java
+++ b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollection.java
@@ -23,14 +23,15 @@ import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
-
-import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
+import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
+
+import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class DomainObjectRepresentationTest_getCollection {
private DomainObjectRepresentation representation;
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollections.java b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollections.java
index dae8f0f..4c27f72 100644
--- a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollections.java
+++ b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollections.java
@@ -23,11 +23,12 @@ import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
public class DomainObjectRepresentationTest_getCollections {
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperties.java b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperties.java
index 6637fba..a42b4e3 100644
--- a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperties.java
+++ b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperties.java
@@ -23,11 +23,12 @@ import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
public class DomainObjectRepresentationTest_getProperties {
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperty.java b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperty.java
index d9f6d9c..215c08a 100644
--- a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperty.java
+++ b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperty.java
@@ -23,14 +23,15 @@ import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
-
-import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
+import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
+
+import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
+
public class DomainObjectRepresentationTest_getProperty {
private DomainObjectRepresentation representation;
diff --git a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser_forJaxRsMediaType_ContractTest.java b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser_forJaxRsMediaType_ContractTest.java
index ea743a4..c6c019d 100644
--- a/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser_forJaxRsMediaType_ContractTest.java
+++ b/core/viewers/restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser_forJaxRsMediaType_ContractTest.java
@@ -20,12 +20,12 @@ package org.apache.isis.viewer.restfulobjects.applib.util;
import org.junit.Test;
-import org.apache.isis.viewer.restfulobjects.applib.RestfulMediaType;
-
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.viewer.restfulobjects.applib.RestfulMediaType;
+
public abstract class Parser_forJaxRsMediaType_ContractTest {
@Test
diff --git a/core/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/LinkFollowSpecsTest_follow.java b/core/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/LinkFollowSpecsTest_follow.java
index dad06ba..09bc6a1 100644
--- a/core/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/LinkFollowSpecsTest_follow.java
+++ b/core/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/LinkFollowSpecsTest_follow.java
@@ -22,12 +22,12 @@ import java.util.List;
import org.junit.Test;
-import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
-import org.apache.isis.viewer.restfulobjects.applib.util.Parser;
-
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
+import org.apache.isis.viewer.restfulobjects.applib.util.Parser;
+
public class LinkFollowSpecsTest_follow {
@Test
diff --git a/core/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_appendValueAndFormat.java b/core/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_appendValueAndFormat.java
index 9e1ed7e..f73673a 100644
--- a/core/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_appendValueAndFormat.java
+++ b/core/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_appendValueAndFormat.java
@@ -30,6 +30,10 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.metamodel.facets.object.encodeable.EncodableFacet;
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.spec.ObjectSpecId;
@@ -38,10 +42,6 @@ import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
-
public class JsonValueEncoderTest_appendValueAndFormat {
@Rule public JUnitRuleMockery2 context =
diff --git a/core/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asAdapter.java b/core/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asAdapter.java
index 966d122..d083531 100644
--- a/core/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asAdapter.java
+++ b/core/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asAdapter.java
@@ -37,6 +37,11 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.object.encodeable.EncodableFacet;
import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
@@ -47,11 +52,6 @@ import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThat;
-
import lombok.val;
public class JsonValueEncoderTest_asAdapter {
diff --git a/core/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asObject.java b/core/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asObject.java
index d1d23b5..8e86543 100644
--- a/core/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asObject.java
+++ b/core/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asObject.java
@@ -28,6 +28,9 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.object.encodeable.EncodableFacet;
import org.apache.isis.metamodel.spec.ManagedObject;
@@ -36,9 +39,6 @@ import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-
public class JsonValueEncoderTest_asObject {
@Rule public JUnitRuleMockery2 context =
diff --git a/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java b/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
index fb69356..7e2fedb 100644
--- a/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
+++ b/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
@@ -34,6 +34,9 @@ import org.junit.Rule;
import org.junit.Test;
import org.springframework.web.context.WebApplicationContext;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.metamodel.MetaModelContext_forTesting;
@@ -49,9 +52,6 @@ import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse.HttpStatusCode;
import org.apache.isis.viewer.restfulobjects.rendering.RestfulObjectsApplicationException;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
public abstract class ResourceContext_ensureCompatibleAcceptHeader_ContractTest {
@Rule public JUnitRuleMockery2 context =
diff --git a/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java b/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
index f77bcbd..f3a841e 100644
--- a/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
+++ b/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
@@ -31,6 +31,9 @@ import org.junit.Rule;
import org.junit.Test;
import org.springframework.web.context.WebApplicationContext;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.commons.internal.url.UrlDecoderUtil;
@@ -49,9 +52,6 @@ import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulRequest.RequestParameter;
import org.apache.isis.viewer.restfulobjects.applib.util.UrlEncodingUtils;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
-
public class ResourceContext_getArg_Test {
@Rule public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
diff --git a/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/RestfulObjectsApplicationExceptionMapper_Test_Contract.java b/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/RestfulObjectsApplicationExceptionMapper_Test_Contract.java
index b653cd7..6476c01 100644
--- a/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/RestfulObjectsApplicationExceptionMapper_Test_Contract.java
+++ b/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/RestfulObjectsApplicationExceptionMapper_Test_Contract.java
@@ -26,17 +26,17 @@ 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.assertThat;
+
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse.HttpStatusCode;
import org.apache.isis.viewer.restfulobjects.applib.util.JsonMapper;
import org.apache.isis.viewer.restfulobjects.rendering.RestfulObjectsApplicationException;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
/**
* contract test.
*/
diff --git a/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/util/UrlParserUtils_Test.java b/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/util/UrlParserUtils_Test.java
index ad6ace6..607f785 100644
--- a/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/util/UrlParserUtils_Test.java
+++ b/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/util/UrlParserUtils_Test.java
@@ -20,10 +20,10 @@ package org.apache.isis.viewer.restfulobjects.viewer.util;
import org.junit.Test;
-import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
-
import static org.junit.Assert.assertEquals;
+import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
+
public class UrlParserUtils_Test {
@Test
diff --git a/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java b/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java
index 4c37f16..244dc16 100644
--- a/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java
+++ b/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java
@@ -29,10 +29,10 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-
import static org.hamcrest.CoreMatchers.is;
+import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+
public class IsisRestfulObjectsSessionFilter_lookupPassThru_Test {
@Rule
diff --git a/core/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/EntityModel_hintsTest.java b/core/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/EntityModel_hintsTest.java
index 65f2372..f785597 100644
--- a/core/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/EntityModel_hintsTest.java
+++ b/core/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/EntityModel_hintsTest.java
@@ -27,15 +27,15 @@ import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.metamodel.MetaModelContext_forTesting;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
import lombok.val;
public class EntityModel_hintsTest {
diff --git a/core/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/LowestCommonSuperclassClosureTest.java b/core/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/LowestCommonSuperclassClosureTest.java
index 4200f80..efb9dd2 100644
--- a/core/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/LowestCommonSuperclassClosureTest.java
+++ b/core/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/LowestCommonSuperclassClosureTest.java
@@ -24,10 +24,10 @@ import java.util.List;
import org.junit.Test;
-import org.apache.isis.metamodel.commons.matchers.IsisMatchers;
-
import static org.junit.Assert.assertThat;
+import org.apache.isis.metamodel.commons.matchers.IsisMatchers;
+
public class LowestCommonSuperclassClosureTest {
static class Animal {}
diff --git a/core/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java b/core/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java
index f870aa3..4fc31e4 100644
--- a/core/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java
+++ b/core/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java
@@ -24,6 +24,10 @@ 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.junit.Assert.assertThat;
+
import org.apache.isis.metamodel.MetaModelContext_forTesting;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.metamodel.objectmanager.ObjectManager;
@@ -32,10 +36,6 @@ import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
import org.apache.isis.webapp.context.memento.ObjectMementoService;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import lombok.val;
public class ScalarModel_isScalarSubtypingAnyOf_Test {
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
index 2166aa0..8325175 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
@@ -34,10 +34,10 @@ import org.apache.wicket.util.convert.IConverter;
import org.apache.isis.viewer.wicket.ui.components.scalars.DateConverter;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
-import static de.agilecoders.wicket.jquery.JQuery.$;
-
import de.agilecoders.wicket.core.util.Attributes;
+import static de.agilecoders.wicket.jquery.JQuery.$;
+
/**
* A text input field that is used as a date or date/time picker.
* It uses <a href="https://github.com/Eonasdan/bootstrap-datetimepicker">Bootstrap Datetime picker</a>
diff --git a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionContentsSelectorDropdownPanelTest.java b/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionContentsSelectorDropdownPanelTest.java
index b15965b..4588651 100644
--- a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionContentsSelectorDropdownPanelTest.java
+++ b/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionContentsSelectorDropdownPanelTest.java
@@ -26,6 +26,9 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.metamodel.MetaModelContext_forTesting;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
@@ -34,9 +37,6 @@ import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.CollectionContentsAsAjaxTablePanelFactory;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import lombok.val;
public class CollectionContentsSelectorDropdownPanelTest {
diff --git a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDateTest.java b/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDateTest.java
index 8239df7..a3b098a 100644
--- a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDateTest.java
+++ b/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDateTest.java
@@ -24,13 +24,13 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
public class DateConverterForJavaSqlDateTest {
@Rule
diff --git a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDateTest.java b/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDateTest.java
index cae55fd..a42d9db 100644
--- a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDateTest.java
+++ b/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDateTest.java
@@ -26,13 +26,13 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
public class DateConverterForJavaUtilDateTest {
@Rule
diff --git a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTimeTest.java b/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTimeTest.java
index 6b9267c..2dcb666 100644
--- a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTimeTest.java
+++ b/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTimeTest.java
@@ -25,13 +25,13 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
public class DateConverterForJodaDateTimeTest {
@Rule
diff --git a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTest.java b/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTest.java
index 047ac24..6ecf31f 100644
--- a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTest.java
+++ b/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTest.java
@@ -25,13 +25,13 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
public class DateConverterForJodaLocalDateTest {
@Rule
diff --git a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTimeTest.java b/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTimeTest.java
index b2ef4c8..532d1c1 100644
--- a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTimeTest.java
+++ b/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTimeTest.java
@@ -25,13 +25,13 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
public class DateConverterForJodaLocalDateTimeTest {
@Rule
diff --git a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTest.java b/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTest.java
index 7384d7c..319adf7 100644
--- a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTest.java
+++ b/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTest.java
@@ -26,14 +26,14 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.ui.components.scalars.jdk8time.DateConverterForJdk8LocalDate;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
public class DateConverterForJdk8LocalDateTest {
@Rule
diff --git a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTimeTest.java b/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTimeTest.java
index 4c4cf2a..1ca1c83 100644
--- a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTimeTest.java
+++ b/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTimeTest.java
@@ -26,14 +26,14 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.ui.components.scalars.jdk8time.DateConverterForJdk8LocalDateTime;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
public class DateConverterForJdk8LocalDateTimeTest {
@Rule
diff --git a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8OffsetDateTimeTest.java b/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8OffsetDateTimeTest.java
index a89e78c..2534c2a 100644
--- a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8OffsetDateTimeTest.java
+++ b/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8OffsetDateTimeTest.java
@@ -26,14 +26,14 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.ui.components.scalars.jdk8time.DateConverterForJdk8OffsetDateTime;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
public class DateConverterForJdk8OffsetDateTimeTest {
@Rule
diff --git a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java b/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java
index b314338..343f7e5 100644
--- a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java
+++ b/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java
@@ -29,6 +29,8 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.metamodel.spec.ObjectSpecId;
import org.apache.isis.metamodel.spec.ObjectSpecification;
@@ -40,8 +42,6 @@ import org.apache.isis.viewer.wicket.ui.components.widgets.select2.providers.Obj
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
import org.apache.isis.webapp.context.memento.ObjectMemento;
-import static org.hamcrest.CoreMatchers.is;
-
public class ObjectAdapterMementoProviderForValueChoicesTest {
@Rule public JUnitRuleMockery2 context =
diff --git a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstractTest.java b/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstractTest.java
index 6bf34da..356a52c 100644
--- a/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstractTest.java
+++ b/core/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstractTest.java
@@ -20,11 +20,11 @@ package org.apache.isis.viewer.wicket.ui.pages;
import org.junit.Test;
-import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
-
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
+
public abstract class PageAbstractTest {
public static class AsCssStyle extends PageAbstractTest {
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java
index 3421026..1239669 100644
--- a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java
+++ b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java
@@ -20,6 +20,8 @@ package org.apache.isis.viewer.wicket.viewer.webmodule;
import java.util.List;
+import static java.util.Objects.requireNonNull;
+
import javax.inject.Inject;
import javax.inject.Named;
import javax.servlet.ServletContext;
@@ -38,8 +40,6 @@ import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.webapp.modules.WebModuleAbstract;
import org.apache.isis.webapp.modules.WebModuleContext;
-import static java.util.Objects.requireNonNull;
-
import lombok.Getter;
import lombok.extern.log4j.Log4j2;
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
index ebd9595..ee92132 100644
--- a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
+++ b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
@@ -25,6 +25,8 @@ import java.util.Set;
import java.util.UUID;
import java.util.function.Function;
+import static java.util.Objects.requireNonNull;
+
import javax.inject.Inject;
import org.apache.wicket.Application;
@@ -93,7 +95,6 @@ import org.apache.isis.viewer.wicket.viewer.integration.WebRequestCycleForIsis;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
import org.apache.isis.webapp.context.memento.ObjectMemento;
-import static java.util.Objects.requireNonNull;
import static org.apache.isis.commons.internal.base._With.requires;
import de.agilecoders.wicket.core.Bootstrap;
diff --git a/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java b/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
index 32c7781..52df0fd 100644
--- a/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
+++ b/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
@@ -30,6 +30,11 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.nullValue;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.session.SessionLoggingService;
import org.apache.isis.runtime.session.IsisSessionFactory;
@@ -42,11 +47,6 @@ import org.apache.isis.security.api.authentication.standard.SimpleSession;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
-
public class AuthenticatedWebSessionForIsis_Authenticate {
diff --git a/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java b/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
index c423741..d808615 100644
--- a/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
+++ b/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
@@ -30,6 +30,9 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.session.SessionLoggingService;
import org.apache.isis.runtime.session.IsisSessionFactory;
@@ -41,9 +44,6 @@ import org.apache.isis.security.api.authentication.standard.RandomCodeGeneratorD
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-
public class AuthenticatedWebSessionForIsis_SignIn {
@Rule
diff --git a/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault_RegistrationAndCaching.java b/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault_RegistrationAndCaching.java
index 46ea522..7ed3bf1 100644
--- a/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault_RegistrationAndCaching.java
+++ b/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault_RegistrationAndCaching.java
@@ -23,15 +23,15 @@ import org.apache.wicket.Page;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.viewer.wicket.model.models.ActionModel;
-import org.apache.isis.viewer.wicket.model.models.PageType;
-import org.apache.isis.viewer.wicket.ui.pages.actionprompt.ActionPromptPage;
-
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.nullValue;
import static org.junit.Assert.assertThat;
+import org.apache.isis.viewer.wicket.model.models.ActionModel;
+import org.apache.isis.viewer.wicket.model.models.PageType;
+import org.apache.isis.viewer.wicket.ui.pages.actionprompt.ActionPromptPage;
+
public class PageClassListDefault_RegistrationAndCaching {
private PageClassRegistryDefault registryImpl;
diff --git a/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Defaults.java b/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Defaults.java
index 7f04d51..3727066 100644
--- a/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Defaults.java
+++ b/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Defaults.java
@@ -27,17 +27,17 @@ import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.nullValue;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.viewer.integration.AuthenticatedWebSessionForIsis;
import org.apache.isis.webapp.context.memento.ObjectMemento;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
-
public class IsisWicketApplication_Defaults {
@Rule
diff --git a/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Pages.java b/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Pages.java
index 9f93d1d..63e94e2 100644
--- a/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Pages.java
+++ b/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Pages.java
@@ -26,15 +26,15 @@ import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.isis.viewer.wicket.ui.pages.home.HomePage;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-
public class IsisWicketApplication_Pages {
@Rule
[isis] 01/02: ISIS-2158: new import order settings (eclipse)
Posted by ah...@apache.org.
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
commit 72c82bac5ad3951b0c2eba58a2931fb045c762d6
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Jan 4 14:47:08 2020 +0100
ISIS-2158: new import order settings (eclipse)
---
ide-settings/eclipse/eclipse-settings.importorder | 24 +++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/ide-settings/eclipse/eclipse-settings.importorder b/ide-settings/eclipse/eclipse-settings.importorder
index 5a356ee..1f59d2b 100644
--- a/ide-settings/eclipse/eclipse-settings.importorder
+++ b/ide-settings/eclipse/eclipse-settings.importorder
@@ -1,10 +1,18 @@
#Organize Import Order
-#Sat Jan 04 13:14:43 CET 2020
+#Sat Jan 04 14:46:17 CET 2020
+11=\#org.isisaddons
+12=org.incode
+13=\#org.incode
+14=
+15=\#
0=java
-1=javax
-2=com
-3=org
-4=org.apache.isis
-5=org.isisaddons
-6=org.incode
-7=\#
+1=\#java
+2=javax
+3=\#javax
+4=com
+5=\#com
+6=org
+7=\#org
+8=org.apache.isis
+9=\#org.apache.isis
+10=org.isisaddons