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 2019/08/02 12:43:06 UTC
[isis] branch v2 updated: batch update source format: organize
imports and reorder
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/v2 by this push:
new b0358bc batch update source format: organize imports and reorder
b0358bc is described below
commit b0358bc367dc99641bfc52f2178d53d84e6380e7
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Aug 2 14:42:52 2019 +0200
batch update source format: organize imports and reorder
0=java
1=javax
2=com
3=org
4=org.apache.isis
5=org.isisaddons
6=org.incode
7=#
---
.../apache/isis/applib/annotation/Defaulted.java | 1 +
.../isis/applib/annotation/DomainObjectLayout.java | 2 +-
.../org/apache/isis/applib/annotation/Value.java | 1 +
.../isis/applib/annotation/ViewModelLayout.java | 2 +-
.../apache/isis/applib/client/RestfulClient.java | 4 +-
.../java/org/apache/isis/applib/clock/Clock.java | 3 +-
.../conmap/ContentMappingServiceForCommandDto.java | 3 +-
.../services/metamodel/MetaModelService.java | 2 +
.../QueryResultsCacheInternal.java | 3 +-
.../apache/isis/applib/value/BlobClobFactory.java | 4 +-
.../org/apache/isis/applib/IdentifierTests.java | 10 +--
.../isis/applib/events/InteractionEventTest.java | 15 ++---
.../QueryDefaultTest_withStart_or_withCount.java | 6 +-
.../eventbus/AbstractDomainEvent_veto_Test.java | 1 +
.../exceprecog/ExceptionRecognizerForTypeTest.java | 8 +--
.../exceprecog/ExceptionRecognizerGeneralTest.java | 8 +--
.../services/i18n/TranslatableStringTest.java | 9 +--
.../interaction/InteractionDefaultTest_next.java | 6 +-
.../QueryResultsCache_KeyTest.java | 4 +-
.../XmlSnapshotServiceAbstractTest.java | 9 +--
.../applib/spec/AbstractSpecificationTest.java | 10 +--
.../org/apache/isis/applib/tree/TreePathTest.java | 5 +-
.../isis/applib/util/EnumsTest_converts.java | 4 +-
.../applib/util/ObjectContractsTest_compareTo.java | 3 +-
.../ObjectContractsTest_equals_and_hashCode.java | 3 +-
.../applib/util/ObjectContractsTest_toString.java | 9 +--
.../apache/isis/applib/util/ReasonBufferTest.java | 4 +-
.../org/apache/isis/applib/util/ReasonsTest.java | 4 +-
.../apache/isis/applib/util/TitleBufferTest.java | 6 +-
.../org/apache/isis/applib/value/ColorTest.java | 4 +-
.../org/apache/isis/applib/value/MoneyTest.java | 8 +--
.../org/apache/isis/applib/value/PasswordTest.java | 4 +-
.../apache/isis/applib/value/PercentageTest.java | 6 +-
.../commons/internal/memento/MementosTest.java | 16 ++---
.../org/apache/isis/commons/collections/Bin.java | 4 +-
.../isis/commons/internal/assertions/_Ensure.java | 4 +-
.../apache/isis/commons/internal/base/_Bytes.java | 6 +-
.../apache/isis/commons/internal/base/_Casts.java | 4 +-
.../apache/isis/commons/internal/base/_Either.java | 4 +-
.../isis/commons/internal/base/_Lazy_Simple.java | 4 +-
.../commons/internal/base/_Lazy_ThreadSafe.java | 4 +-
.../isis/commons/internal/base/_Reduction.java | 4 +-
.../isis/commons/internal/base/_Strings.java | 12 ++--
.../internal/base/_Strings_KeyValuePair.java | 4 +-
.../isis/commons/internal/collections/_Arrays.java | 4 +-
.../collections/_Collections_Collector.java | 4 +-
.../isis/commons/internal/collections/_Lists.java | 4 +-
.../isis/commons/internal/collections/_Maps.java | 4 +-
.../commons/internal/collections/_Multimaps.java | 4 +-
.../isis/commons/internal/concurrent/_Tasks.java | 9 +--
.../isis/commons/internal/context/_Context.java | 10 +--
.../internal/context/_Context_ThreadLocal.java | 4 +-
.../context/_Context_ThreadLocal_Singleton.java | 4 +-
.../isis/commons/internal/context/_Plugin.java | 9 +--
.../commons/internal/exceptions/_Exceptions.java | 6 +-
.../internal/ioc/spring/BeanAdapterSpring.java | 3 +-
.../isis/commons/internal/ioc/spring/_Spring.java | 1 +
.../internal/memento/_Mementos_MementoDefault.java | 4 +-
.../Ensure_GivenValueThatDoesMatchTest.java | 5 +-
.../Ensure_GivenValueThatDoesNotMatchTest.java | 5 +-
.../isis/commons/internal/base/BytesTest.java | 9 ++-
.../isis/commons/internal/base/NullSafeTest.java | 6 +-
.../isis/commons/internal/base/ReductionTest.java | 8 +--
.../isis/commons/internal/base/StringsTest.java | 11 ++--
.../apache/isis/commons/internal/cdi/CDITest.java | 3 +-
.../commons/internal/compare/ComparatorsTest.java | 8 +--
.../isis/commons/internal/context/ContextTest.java | 10 +--
.../encoding/ByteEncoderDecoderRoundtripTest.java | 17 ++----
.../internal/threadpool/ThreadPoolSupportTest.java | 2 -
.../isis/config/registry/IsisBeanTypeRegistry.java | 8 +--
.../ConfigurationConstants_isProtected_Test.java | 2 -
.../config/ConfigurationConstants_mask_Test.java | 2 -
.../facets/param/name/ParameterNameFacetTest.java | 15 ++---
.../ServiceInjectorTestUsingCodegenPlugin.java | 9 +--
.../ServiceInstantiatorTestUsingCodegenPlugin.java | 2 -
.../BidirectionalRelationshipContractTestAll.java | 3 -
.../bidir/InstantiatorForChildDomainObject.java | 2 -
.../bidir/PeerDomainObjectForTesting.java | 2 -
...mainObjectComparableContractTest_compareTo.java | 2 -
.../files/FilesTest_deleteFiles.java | 10 +--
...ectServiceMethodMustBeFinalContractTestAll.java | 2 -
.../ImposteriserTestUsingCodegenPlugin.java | 1 -
...IsisActionsTest_returnNewTransientInstance.java | 15 +++--
.../jmocking/JMockActionsTest_returnArgument.java | 6 +-
.../jmocking/JMockActionsTest_returnEach.java | 11 ++--
.../jmocking/JUnitRuleMockery2Test.java | 4 +-
..._autoWiring_constructorInjection_happyCase.java | 14 ++---
...y2Test_autoWiring_sadCase_noClassUnderTest.java | 4 +-
...est_autoWiring_sadCase_twoClassesUnderTest.java | 6 +-
...2Test_autoWiring_setterInjection_happyCase.java | 15 +++--
...RuleMockery2Test_mockAnnotatedWithAllowing.java | 9 ++-
...RuleMockery2Test_mockAnnotatedWithChecking.java | 9 ++-
...RuleMockery2Test_mockAnnotatedWithIgnoring.java | 9 ++-
...kery2Test_mockAnnotatedWithNever_happyCase.java | 9 ++-
...ockery2Test_mockAnnotatedWithNever_sadCase.java | 8 +--
...ockery2Test_mockAnnotatedWithOne_happyCase.java | 9 ++-
...eMockery2Test_mockAnnotatedWithOne_sadCase.java | 9 ++-
.../sortedsets/SortedSetsContractTestAll.java | 2 -
...lueTypeContractTestAbstract_BigIntegerTest.java | 2 -
.../ValueTypeContractTestAbstract_ColorTest.java | 2 -
.../ValueTypeContractTestAbstract_StringTest.java | 2 -
.../proxy/ProxyCreatorTestUsingCodegenPlugin.java | 4 +-
.../isis/integtestsupport/ThrowableMatchers.java | 3 +-
.../IsisMavenPlugin_SpringContextLauncher.java | 7 +--
.../org/apache/isis/mavenplugin/util/Log4j.java | 3 -
.../isis/metamodel/ServiceInjector_forTesting.java | 4 +-
.../isis/metamodel/adapter/oid/Oid_Marshaller.java | 4 +-
.../isis/metamodel/adapter/oid/Oid_Parented.java | 4 +-
.../isis/metamodel/adapter/oid/Oid_Root.java | 4 +-
.../isis/metamodel/adapter/version/Version.java | 4 +-
.../isis/metamodel/commons/ListExtensions.java | 4 +-
.../commons/MethodInvocationPreprocessor.java | 4 +-
.../org/apache/isis/metamodel/consent/Veto.java | 4 +-
.../isis/metamodel/facetapi/FacetAbstract.java | 4 +-
.../isis/metamodel/facetapi/FacetHolder.java | 1 -
.../isis/metamodel/facetapi/FacetHolderImpl.java | 4 +-
.../apache/isis/metamodel/facets/Annotations.java | 4 +-
.../isis/metamodel/facets/DomainEventHelper.java | 4 +-
.../isis/metamodel/facets/ImperativeFacet.java | 1 -
...ctionInvocationFacetForDomainEventAbstract.java | 6 +-
.../annotation/HomePageFacetAnnotationFactory.java | 6 +-
...ectionAddToFacetForDomainEventFromAbstract.java | 4 +-
...nRemoveFromFacetForDomainEventFromAbstract.java | 4 +-
.../javautilcollection/JavaArrayFacet.java | 6 +-
...SortedByFacetForCollectionLayoutAnnotation.java | 4 +-
.../layout/SortedByFacetForCollectionXml.java | 4 +-
.../annotation/SortedByFacetAnnotationFactory.java | 2 +-
.../facets/members/hidden/HiddenFacetAbstract.java | 4 +-
.../RemoveAnnotatedMethodsFacetFactory.java | 4 +-
.../facets/object/parseable/ParserUtil.java | 4 +-
.../value/vsp/ValueSemanticsProviderUtil.java | 4 +-
...tySetterOrClearFacetForDomainEventAbstract.java | 4 +-
.../value/datejdk8local/Jdk8LocalDateUtil.java | 3 +-
.../Jdk8LocalDateValueSemanticsProvider.java | 10 +--
.../datejodalocal/JodaLocalDateValueFacet.java | 3 +-
...ateValueFacetUsingSemanticsProviderFactory.java | 3 +-
.../Jdk8LocalDateTimeValueSemanticsProvider.java | 6 +-
.../value/datetimejoda/JodaDateTimeValueFacet.java | 3 +-
...imeValueFacetUsingSemanticsProviderFactory.java | 3 +-
.../JodaLocalDateTimeValueFacet.java | 3 +-
...imeValueFacetUsingSemanticsProviderFactory.java | 3 +-
.../JodaLocalTimeValueFacetSimpleFactory.java | 5 +-
.../interactions/ActionArgUsabilityContext.java | 6 +-
.../interactions/ActionArgValidityContext.java | 4 +-
.../interactions/ActionArgVisibilityContext.java | 6 +-
.../interactions/ActionUsabilityContext.java | 4 +-
.../interactions/ActionValidityContext.java | 4 +-
.../interactions/ActionVisibilityContext.java | 4 +-
.../interactions/CollectionAccessContext.java | 4 +-
.../interactions/CollectionRemoveFromContext.java | 4 +-
.../interactions/CollectionVisibilityContext.java | 4 +-
.../metamodel/interactions/ObjectTitleContext.java | 4 +-
.../interactions/ObjectValidityContext.java | 4 +-
.../interactions/ObjectVisibilityContext.java | 4 +-
.../metamodel/interactions/ParseValueContext.java | 4 +-
.../interactions/PropertyAccessContext.java | 4 +-
.../interactions/PropertyModifyContext.java | 4 +-
.../interactions/PropertyUsabilityContext.java | 4 +-
.../interactions/PropertyVisibilityContext.java | 4 +-
.../services/appfeat/ApplicationFeatureId.java | 8 +--
.../ApplicationFeatureRepositoryDefault.java | 6 +-
.../services/grid/GridReaderUsingJaxb.java | 3 +-
.../grid/bootstrap3/GridSystemServiceBS3.java | 4 +-
.../services/repository/RepositoryServiceJdo.java | 4 +-
.../services/swagger/SwaggerServiceDefault.java | 10 +--
.../apache/isis/metamodel/spec/ObjectSpecId.java | 4 +-
.../isis/metamodel/spec/ObjectSpecification.java | 4 +-
.../isis/metamodel/spec/feature/ObjectAction.java | 4 +-
.../spec/feature/ObjectActionContainer.java | 4 +-
.../specloader/ProgrammingModelServiceDefault.java | 2 +-
.../specloader/SpecificationLoaderDefault.java | 4 +-
.../specloader/facetprocessor/FacetProcessor.java | 8 +--
.../specloader/specimpl/FacetedMethodsBuilder.java | 2 +-
.../specimpl/ObjectSpecificationAbstract.java | 4 +-
.../specimpl/dflt/ObjectSpecificationDefault.java | 4 +-
.../CollectionFacetOnStandaloneList.java | 4 +-
.../ObjectSpecificationOnStandaloneList.java | 4 +-
...taModelValidatorToCheckObjectSpecIdsUnique.java | 4 +-
.../isis/metamodel/util/snapshot/IsisSchema.java | 5 +-
.../apache/isis/metamodel/util/snapshot/Place.java | 3 +-
.../isis/metamodel/util/snapshot/XmlSnapshot.java | 9 +--
.../metamodel/MetaModelContext_configTest.java | 1 -
.../oid/CollectionOidTest_valueSemantics.java | 3 -
.../adapter/oid/OidMarshallerTest_marshall.java | 8 +--
.../oid/OidMarshallerTest_roundtripping.java | 10 ++-
.../adapter/oid/OidMarshallerTest_unmarshal.java | 8 +--
.../isis/metamodel/adapter/oid/OidVersionTest.java | 7 +--
...dDefaultTest_valueSemantics_whenPersistent.java | 2 -
...idDefaultTest_valueSemantics_whenTransient.java | 2 -
.../metamodel/adapter/oid/RootOidTest_create.java | 7 +--
.../metamodel/adapter/version/VersionTest.java | 8 +--
.../adapter/version/VersionTest_differs.java | 5 +-
.../isis/metamodel/commons/IoUtils_CopyTest.java | 5 +-
.../commons/JavaClassUtilsTest_getBuiltIn.java | 5 +-
.../metamodel/commons/ListUtilsTest_adjust.java | 9 ++-
.../metamodel/commons/ListUtilsTest_insert.java | 12 ++--
.../commons/ListUtilsTest_mutableCopy.java | 11 ++--
.../isis/metamodel/commons/LocaleUtilsTest.java | 5 +-
.../isis/metamodel/commons/NameUtilTest.java | 2 -
.../commons/StringUtilsTest_enumTitle.java | 5 +-
.../commons/StringUtils_NaturalNameTest.java | 5 +-
.../commons/StringUtils_NaturalizeTest.java | 5 +-
.../commons/StringUtils_NormalizedTest.java | 7 +--
.../StringUtils_RemoveLeadingWhiteSpace.java | 1 -
.../commons/StringUtils_SplitOnCommas.java | 1 -
.../commons/StringUtils_StripLeadingSlashTest.java | 5 +-
.../commons/StringUtils_StripNewLinesTest.java | 5 +-
.../commons/StringUtils_camelLowerFirst.java | 5 +-
.../commons/StringUtils_toLineSeparated.java | 5 +-
.../commons/StringUtils_toLowerDashed.java | 5 +-
.../metamodel/commons/TypesTest_filteredList.java | 7 +--
.../matchers/IsisMatchers_NonEmptyStringTest.java | 6 +-
.../metamodel/consent/InteractionResultTest.java | 12 ++--
.../isis/metamodel/facetapi/FacetAbstractTest.java | 5 --
.../facetapi/FeatureTypeTest_identifierFor.java | 7 +--
.../facets/AbstractFacetFactoryJUnit4TestCase.java | 2 -
.../metamodel/facets/AbstractFacetFactoryTest.java | 3 -
.../isis/metamodel/facets/AnnotationsTest.java | 1 -
.../Annotations_getAnnotations_on_Class_Test.java | 1 -
.../Annotations_getAnnotations_on_Field_Test.java | 1 -
.../Annotations_getAnnotations_on_Method_Test.java | 1 -
...notations_getAnnotations_on_Parameter_Test.java | 1 -
.../isis/metamodel/facets/CollectionUtilsTest.java | 4 +-
...nEventHelperTest_newActionInteractionEvent.java | 1 -
...HelperTest_newPropertyDomainEvent_forClear.java | 1 -
...elperTest_newPropertyDomainEvent_forModify.java | 2 +-
.../metamodel/facets/MethodFinderUtilsTest.java | 11 ++--
.../metamodel/facets/ObjectAdapterUtilsTest.java | 7 ++-
.../org/apache/isis/metamodel/facets/Utils.java | 1 -
.../actions/ActionMethodsFacetFactoryTest.java | 3 +-
.../actions/IteratorFilteringFacetFactoryTest.java | 1 +
.../action/ActionAnnotationFacetFactoryTest.java | 1 -
...nnotationFacetFactoryTest_ActionInvocation.java | 3 +-
.../ActionAnnotationFacetFactoryTest_Command.java | 15 ++---
.../ActionAnnotationFacetFactoryTest_Hidden.java | 9 +--
...ctionAnnotationFacetFactoryTest_Invocation.java | 9 +--
...ctionAnnotationFacetFactoryTest_Publishing.java | 11 ++--
...ctionAnnotationFacetFactoryTest_RestrictTo.java | 7 ++-
...ActionAnnotationFacetFactoryTest_Semantics.java | 9 +--
.../ActionAnnotationFacetFactoryTest_TypeOf.java | 11 ++--
...icsFacetFallbackToNonIdempotentFactoryTest.java | 1 -
.../PrototypeFacetAnnotationFactoryTest.java | 1 -
.../HomePageAnnotationFacetFactoryTest.java | 1 -
...tionLayoutAnnotationFacetFactoryJunit4Test.java | 2 -
...nLayoutXmlLayoutAnnotationFacetFactoryTest.java | 3 -
...etDerivedFromDomainServiceFacetFactoryTest.java | 2 -
...etDerivedFromDomainServiceFacetFactoryTest.java | 17 +++---
.../prototype/PrototypeFacetAbstractTest.java | 2 +-
.../collections/JavaCollectionFacetTest.java | 1 +
.../CollectionAnnotationFacetFactoryTest.java | 1 -
...ollectionAnnotationFacetFactoryTest_typeOf.java | 2 +-
...bledAnnotationOnCollectionFacetFactoryTest.java | 1 -
...stedAnnotationOnCollectionFacetFactoryTest.java | 1 -
.../cssclassfa/CssClassFaFacetAbstractTest.java | 2 -
.../ViewModelSemanticCheckingFacetFactoryTest.java | 1 -
...okmarkableAnnotationFacetFactoryTest_class.java | 2 -
.../object/defaults/DefaultedFacetFactoryTest.java | 3 -
.../ObjectDisabledMethodFacetFactoryTest.java | 1 -
...oicesFacetFromBoundedAnnotationFactoryTest.java | 1 -
.../DomainObjectAnnotationFacetFactoryTest.java | 3 +-
.../ObjectTypeAnnotationFacetFactoryTest.java | 4 +-
.../DefaultViewConfiguration_parseValue_Test.java | 4 +-
.../DomainObjectLayoutFactoryTest.java | 15 -----
.../DomainServiceFacetAnnotationFactoryTest.java | 6 +-
.../DomainServiceLayoutFacetFactoryTest.java | 5 +-
.../facets/FacetsFacetAnnotationFactoryTest.java | 1 -
.../hidden/ObjectHiddenMethodFacetFactoryTest.java | 1 -
.../ident/cssclass/CssClassFacetMethodTest.java | 8 +--
.../CssClassFacetMethodWithProblemTest.java | 7 ++-
.../object/ident/icon/IconFacetMethodTest.java | 7 ++-
.../object/ident/layout/LayoutFacetMethodTest.java | 7 ++-
.../ident/title/TitleFacetViaMethodTest.java | 7 ++-
.../TitleAnnotationFacetFactoryTest.java | 21 ++++---
.../NavigableParentFacetMethodFactoryTest.java | 11 ++--
.../navparent/NavigableParentFacetMethodTest.java | 15 ++---
.../NavigableParentAnnotationFacetFactoryTest.java | 13 ++--
...SpecIdFacetDerivedFromClassNameFactoryTest.java | 2 +-
.../parseable/ParseableFacetUsingParserTest.java | 1 -
.../RecreatableObjectFacetFactoryTest.java | 2 -
.../ObjectValidMethodFacetFactoryTest.java | 1 -
...eFacetAnnotationOrConfigurationFactoryTest.java | 3 -
.../ordering/memberorder/DeweyOrderSetTest.java | 2 -
.../memberorder/MemberOrderComparatorTest.java | 1 +
...cetForParameterLayoutAnnotationFactoryTest.java | 1 +
...cetForParameterLayoutAnnotationFactoryTest.java | 1 +
.../ParameterAnnotationFacetFactoryTest.java | 1 -
...lableAnnotationOnParameterFacetFactoryTest.java | 1 -
...RegExAnnotationOnParameterFacetFactoryTest.java | 2 +-
...sabledAnnotationOnPropertyFacetFactoryTest.java | 1 -
.../MandatoryAnnotationFacetFactoryTest.java | 2 +-
...sistedAnnotationOnPropertyFacetFactoryTest.java | 1 -
.../PropertyAnnotationFacetFactoryTest.java | 2 -
...llableAnnotationOnPropertyFacetFactoryTest.java | 1 -
.../RegExAnnotationOnPropertyFacetFactoryTest.java | 2 +-
...acetForPropertyLayoutAnnotationFactoryTest.java | 2 -
...acetForPropertyLayoutAnnotationFactoryTest.java | 2 -
...SpecificationValidatingInteractionMoreTest.java | 10 +--
...isfySpecificationValidatingInteractionTest.java | 17 +++---
.../specification/SpecificationAndTests.java | 10 +--
.../specification/SpecificationNotTests.java | 10 +--
.../specification/SpecificationOrTests.java | 10 +--
.../value/BlobValueSemanticsProviderTest.java | 8 +--
.../value/BooleanValueSemanticsProviderTest.java | 9 +--
.../value/CharacterValueSemanticsProviderTest.java | 9 +--
.../value/ClobValueSemanticsProviderTest.java | 8 +--
.../value/ColorValueSemanticsProviderTest.java | 6 +-
.../value/MoneyValueSemanticsProviderTest.java | 6 +-
.../value/PasswordValueSemanticsProviderTest.java | 4 +-
.../PolishMoneyValueSemanticsProviderTest.java | 6 +-
.../value/StringValueSemanticsProviderTest.java | 7 ++-
.../ValueSemanticsProviderAbstractTestCase.java | 31 +++++-----
...odaLocalDateTimeValueSemanticsProviderTest.java | 1 -
...jectAssociationPredicatesTest_visibleWhere.java | 6 +-
.../interactions/InteractionUtils_isA_Test.java | 1 -
.../services/ServiceInjectorDefaultTest.java | 1 -
.../ServiceInjectorDefaultTest_usingFields.java | 1 -
...erviceInjectorDefaultTest_validateServices.java | 1 -
...InjectorDefaultTest_validateServices_happy.java | 1 -
.../isis/metamodel/services/ServiceUtil_Test.java | 9 ++-
.../services/appfeat/ApplicationFeatureIdTest.java | 4 --
.../ApplicationFeatureRepositoryDefaultTest.java | 4 --
.../services/appfeat/ApplicationFeatureTest.java | 2 -
.../appfeat/ApplicationFeatureTypeTest.java | 3 -
...eptionRecognizerDocDefault_recognizes_Test.java | 2 +-
.../isis/metamodel/services/grid/BS3GridTest.java | 1 -
...dLoaderServiceDefault_resourceNameFor_Test.java | 2 -
.../metamodel/MetaModelServiceDefaultTest.java | 5 +-
.../services/swagger/internal/GenerationTest.java | 1 -
.../services/swagger/internal/TaggerTest.java | 2 -
.../spec/ObjectSpecIdTest_constructor.java | 1 -
.../spec/ObjectSpecIdTest_valueSemantics.java | 1 -
.../specloader/ServiceInitializerTest.java | 20 +++---
.../specloader/SpecificationCacheDefaultTest.java | 8 +--
.../SpecificationLoaderTestAbstract.java | 2 -
.../specloader/SpecificationLoaderTest_array.java | 9 ++-
.../SpecificationLoaderTest_collection.java | 4 +-
.../specloader/SpecificationLoaderTest_value.java | 5 +-
.../ClassSubstitutorTest_getClass.java | 2 -
.../IntrospectionState_comparable_Test.java | 2 -
.../specimpl/ObjectActionMixedInTest.java | 2 +-
...ionParameterAbstractTest_getId_and_getName.java | 14 ++---
.../specimpl/ObjectAssociationAbstractTest.java | 7 +--
...ObjectAssociationAbstractTest_alwaysHidden.java | 11 ++--
.../specimpl/ObjectMemberAbstractTest.java | 4 +-
.../facets/object/query/VisitorForFromClause.java | 1 -
.../version/JdoVersionAnnotationFacetFactory.java | 3 +-
...DerivedFromJdoColumnAnnotationFacetFactory.java | 2 +-
...ndatoryFromJdoColumnAnnotationFacetFactory.java | 2 +-
...DerivedFromJdoColumnAnnotationFacetFactory.java | 2 +-
.../IsisPlatformTransactionManagerForJdo.java | 9 +--
...onRecognizerCompositeForJdoObjectStoreTest.java | 2 +-
...LIntegrityConstraintViolationExceptionTest.java | 1 -
...AnnotationFacetFactoryTest_refineMetaModel.java | 5 +-
.../org/apache/isis/jdo/IsisBootDataNucleus.java | 10 +--
.../CreateSchemaObjectFromClassMetadata.java | 4 +-
.../datanucleus/DataNucleusLifeCycleHelper.java | 3 +-
.../jdo/datanucleus/JDOStateManagerForIsis.java | 5 +-
.../queries/PersistenceQueryProcessorAbstract.java | 2 +-
.../persistence/spi/JdoObjectIdSerializer.java | 3 +-
.../typeconverters/IsisPasswordConverter.java | 1 +
.../datanucleus/valuetypes/IsisBlobMapping.java | 2 +
.../datanucleus/valuetypes/IsisMoneyMapping.java | 2 +
.../isis/jdo/jdosupport/IsisJdoSupportDN5.java | 4 +-
.../mixins/Persistable_downloadJdoMetadata.java | 3 +-
.../DataNucleusApplicationComponents5.java | 1 +
.../isis/jdo/persistence/PersistenceSession5.java | 13 ++--
.../persistence/PersistenceSessionFactory5.java | 5 +-
.../org/apache/isis/jdo/persistence/Utils.java | 1 +
...atastoreIdentityAnnotationFacetFactoryTest.java | 4 +-
...JdoDiscriminatorAnnotationFacetFactoryTest.java | 5 +-
...rsistenceCapableAnnotationFacetFactoryTest.java | 4 +-
.../query/JdoQueryAnnotationFacetFactoryTest.java | 2 -
.../JdoVersionAnnotationFacetFactoryTest.java | 4 +-
...vedFromJdoColumnAnnotationFacetFactoryTest.java | 9 +--
...vedFromJdoColumnAnnotationFacetFactoryTest.java | 9 +--
...JdoNotPersistentAnnotationFacetFactoryTest.java | 3 -
...venJdoPrimaryKeyAnnotationFacetFactoryTest.java | 4 --
.../ObjectReflectorDefaultTest_object.java | 12 ++--
.../adapterfactory/pojo/PojoAdapterTest.java | 4 +-
.../transaction/PojoAdapterBuilder.java | 2 +-
.../runtime/system/ObjectMemberAbstractTest.java | 29 ++++-----
.../WrapperFactoryDefaultTest_wrappedObject.java | 1 -
...FactoryDefaultTest_wrappedObject_transient.java | 1 -
.../isis/security/shiro/IsisBootSecurityShiro.java | 7 ++-
.../isis/security/shiro/ShiroSecurityContext.java | 5 +-
.../apache/isis/security/shiro/WebModuleShiro.java | 15 ++---
.../shiro/IsisPermissionTest_setParts.java | 7 ++-
.../shiro/IsisPermissionTest_typicalUsage.java | 9 +--
.../PermissionToRoleMapperFromIniTest.java | 8 +--
.../PermissionToRoleMapperFromStringTest.java | 8 +--
.../shiro/permrolemapper/UtilTest_parse.java | 10 ++-
.../runtime/services/hsqldb/HsqlDbManagerMenu.java | 3 +-
.../AbstractCollectionInvocationHandler.java | 4 +-
.../apache/isis/runtime/profiler/ProfilerTest.java | 2 -
.../isis/runtime/profiler/ProfilerTestSystem.java | 2 -
.../isis/wrapper/WrapperFactoryDefaultTest.java | 1 -
.../background/BackgroundServiceDefault.java | 7 ++-
.../background/ForkingInvocationHandler.java | 4 +-
.../services/email/EmailServiceDefault.java | 1 +
.../isis/runtime/services/error/EmailTicket.java | 4 +-
.../isis/runtime/services/error/SimpleTicket.java | 4 +-
.../factory/FactoryServiceInternalDefault.java | 4 +-
.../isis/runtime/services/i18n/po/PoWriter.java | 3 +-
.../services/i18n/po/TranslationServicePo.java | 4 +-
.../menubars/MenuBarsLoaderServiceDefault.java | 5 +-
.../services/message/MessageServiceDefault.java | 3 +-
.../userreg/EmailNotificationServiceDefault.java | 6 +-
.../services/xactn/TransactionServiceSpring.java | 11 ++--
.../changes/PreAndPostValues_shouldAudit_Test.java | 6 +-
.../email/EmailServiceDefaultTest_actually.java | 4 +-
.../email/EmailServiceDefaultTest_notEmpty.java | 2 -
.../runtime/services/i18n/po/PoReaderTest.java | 2 -
.../services/i18n/po/PoWriterTest_escape.java | 2 -
.../org/apache/isis/webapp/IsisBootWebApp.java | 5 +-
.../isis/webapp/IsisWebAppContextInitializer.java | 3 +-
.../isis/webapp/IsisWebAppContextListener.java | 3 +-
.../org/apache/isis/webapp/modules/WebModule.java | 3 +-
.../isis/webapp/modules/WebModuleContext.java | 4 +-
.../modules/h2console/WebModuleH2Console.java | 3 +-
.../logonlog/WebModuleLogOnExceptionLogger.java | 13 ++--
.../webapp/modules/resources/ResourceServlet.java | 10 +--
.../ResourceServlet_HtmlTemplateVariables.java | 6 +-
.../resources/WebModuleStaticResources.java | 3 +-
.../modules/sse/WebModuleServerSentEvents.java | 3 +-
.../runtime/persistence/adapter/PojoAdapter.java | 4 +-
.../session/RuntimeEventSupport_Spring.java | 3 +-
.../JdoPersistenceLifecycleService.java | 5 +-
.../adaptermanager/ObjectAdapterContext.java | 2 +-
.../ObjectAdapterContext_Factories.java | 3 +-
.../adaptermanager/ObjectAdapterLegacy.java | 2 +-
.../system/transaction/IsisTransactionObject.java | 3 +-
.../PersistenceSessionServiceInternalDefault.java | 6 +-
.../isis/runtime/system/MethodFinderUtilsTest.java | 17 +++---
.../system/ObjectActionLayoutXmlDefaultTest.java | 11 ++--
.../system/OneToManyAssociationDefaultTest.java | 9 ++-
.../system/TypeExtractorMethodReturnTest.java | 13 ++--
.../system/TypeExtractorMethodsParametersTest.java | 3 +-
.../isis/security/IsisBootSecurityBypass.java | 7 ++-
.../isis/security/EncodabilityContractTest.java | 11 ++--
.../fixture/LogonFixtureAuthenticatorTest.java | 6 +-
.../standard/AuthenticatorDefaultTest.java | 5 --
.../SimpleSessionEncodabilityNoRolesTest.java | 2 +-
.../SimpleSessionEncodabilityTestAbstract.java | 5 +-
.../SimpleSessionEncodabilityWithRolesTest.java | 2 +-
...rdAuthenticationManager_AuthenticationTest.java | 9 +--
...rdAuthenticationManager_AuthenticatorsTest.java | 6 +-
...irectionalRelationshipContractTestAbstract.java | 31 +++++-----
.../comparable/ComparableContractTester.java | 9 +--
...rviceMethodMustBeFinalContractTestAbstract.java | 10 +--
.../isis/unittestsupport/jaxb/JaxbMatchers.java | 5 +-
.../jmocking/ImposteriserUsingCodegenPlugin.java | 3 +-
.../unittestsupport/jmocking/MyMockomatic.java | 9 +--
.../soap/SoapEndpointPublishingRule.java | 4 +-
.../sortedsets/SortedSetsContractTestAbstract.java | 10 +--
.../value/ValueTypeContractTestAbstract.java | 10 +--
.../restfulobjects/applib/JsonRepresentation.java | 19 +++---
.../restfulobjects/applib/LinkRepresentation.java | 8 +--
.../applib/client/RepresentationWalker.java | 6 +-
.../applib/client/RestfulResponse.java | 8 +--
.../AbstractObjectMemberRepresentation.java | 4 +-
.../domainobjects/ActionResultRepresentation.java | 4 +-
.../domainobjects/DomainObjectRepresentation.java | 4 +-
.../applib/domainobjects/DomainRepresentation.java | 4 +-
.../applib/domainobjects/ListRepresentation.java | 4 +-
.../domainobjects/ObjectActionRepresentation.java | 4 +-
.../ObjectCollectionRepresentation.java | 4 +-
.../domainobjects/ScalarValueRepresentation.java | 4 +-
.../AbstractTypeMemberRepresentation.java | 4 +-
.../domaintypes/DomainTypeRepresentation.java | 4 +-
.../TypeActionResultRepresentation.java | 4 +-
.../applib/domaintypes/TypeListRepresentation.java | 4 +-
.../applib/errors/ErrorRepresentation.java | 4 +-
.../applib/health/HealthRepresentation.java | 4 +-
.../applib/homepage/HomePageRepresentation.java | 4 +-
.../applib/user/UserRepresentation.java | 4 +-
.../restfulobjects/applib/util/JsonMapper.java | 6 +-
.../restfulobjects/applib/util/JsonNodeUtils.java | 4 +-
.../applib/util/UrlEncodingUtils.java | 4 +-
.../applib/version/VersionRepresentation.java | 4 +-
.../viewer/restfulobjects/applib/JsonFixture.java | 6 +-
...resentationTest_arrayGet_arraySetElementAt.java | 10 +--
.../applib/JsonRepresentationTest_getArray.java | 10 +--
.../JsonRepresentationTest_getBigDecimal.java | 1 +
.../JsonRepresentationTest_getBigInteger.java | 1 +
.../applib/JsonRepresentationTest_getBoolean.java | 10 +--
.../applib/JsonRepresentationTest_getDouble.java | 1 +
.../applib/JsonRepresentationTest_getInt.java | 1 +
.../JsonRepresentationTest_getLink_isLink.java | 12 ++--
.../applib/JsonRepresentationTest_getLong.java | 1 +
.../JsonRepresentationTest_getNull_isNull.java | 10 +--
.../JsonRepresentationTest_getRepresentation.java | 1 +
.../JsonRepresentationTest_getString_isString.java | 10 +--
...onRepresentationTest_isArray_isMap_isValue.java | 1 +
.../applib/JsonRepresentationTest_mapHas.java | 1 +
.../applib/JsonRepresentationTest_newArray.java | 4 +-
.../applib/JsonRepresentationTest_newObject.java | 1 +
.../applib/JsonRepresentationTest_putXxx.java | 8 +--
.../applib/JsonRepresentationTest_size.java | 1 +
...JsonRepresentationTest_streamArrayElements.java | 1 +
.../JsonRepresentationTest_streamMapEntries.java | 1 +
.../applib/JsonRepresentationTest_urlEncoding.java | 6 +-
.../applib/LinkRepresentationTest_equals.java | 8 +--
.../applib/RestfulHttpMethodTest_setUp.java | 7 ++-
.../RestfulRequest_DomainModelTest_parser.java | 5 +-
...equestParameterTest_valueOf_xrodomainmodel.java | 9 +--
...equestParameterTest_valueOf_xrofollowlinks.java | 11 ++--
.../client/RestfulResponse_HeaderTest_Warning.java | 4 +-
.../client/RestfulResponse_HttpStatusCodeTest.java | 9 +--
...mainObjectRepresentationTest_getCollection.java | 6 +-
...ainObjectRepresentationTest_getCollections.java | 2 +
...mainObjectRepresentationTest_getProperties.java | 4 +-
...DomainObjectRepresentationTest_getProperty.java | 13 ++--
.../applib/util/PathNodeTest_equalsHashcode.java | 4 +-
.../applib/util/PathNodeTest_parse.java | 6 +-
.../applib/util/PathNodeTest_split.java | 6 +-
.../viewer/restfulobjects/rendering/OidUtils.java | 4 +-
.../viewer/restfulobjects/rendering/Responses.java | 5 +-
.../AbstractObjectMemberReprRenderer.java | 4 +-
.../domainobjects/ActionResultReprRenderer.java | 4 +-
.../rendering/domainobjects/JsonValueEncoder.java | 17 +++---
.../domainobjects/ObjectActionReprRenderer.java | 4 +-
.../domainobjects/ObjectPropertyReprRenderer.java | 4 +-
.../domaintypes/DomainTypeReprRenderer.java | 4 +-
.../acceptheader/AcceptHeaderServiceForRest.java | 4 +-
...entNegotiationServiceForRestfulObjectsV1_0.java | 4 +-
.../ContentNegotiationServiceOrgApacheIsisV1.java | 3 +-
.../ContentNegotiationServiceXRoDomainType.java | 3 +-
.../viewer/restfulobjects/rendering/util/Util.java | 6 +-
.../rendering/LinkFollowSpecsTest_follow.java | 2 +
.../JsonValueEncoderTest_appendValueAndFormat.java | 9 +--
.../JsonValueEncoderTest_asAdapter.java | 13 ++--
.../JsonValueEncoderTest_asObject.java | 8 ++-
.../rendering/util/MapUtilsTest.java | 6 +-
.../restfulobjects/IsisBootWebRestfulObjects.java | 5 +-
.../restfulobjects/WebModuleRestfulObjects.java | 19 +++---
.../server/mappers/ExceptionMapperAbstract.java | 4 +-
.../serialization/SerializationStrategy.java | 4 +-
...ulObjectsSessionFilter_lookupPassThru_Test.java | 8 +--
.../server/ResourceContextTest_getArg.java | 1 -
...tsApplicationExceptionMapper_Test_Contract.java | 1 +
.../DomainResourceHelperTest_readBodyAsMap.java | 6 +-
.../server/resources/JsonParserHelpTest.java | 1 +
.../server/util/UrlParserUtilsTest.java | 1 +
.../viewer/wicket/viewer/IsisBootWebWicket.java | 1 +
.../wicket/viewer/IsisWicketApplication.java | 67 +++++++++++----------
.../viewer/IsisWicketApplication_Experimental.java | 4 +-
...rgetRespondListenerToResetQueryResultCache.java | 3 +-
.../isis/viewer/wicket/viewer/WebModuleWicket.java | 17 +++---
.../imagecache/ImageResourceCacheClassPath.java | 9 +--
.../viewer/imagecache/ImageResourceCacheKey.java | 1 +
.../wicket/AnonymousWebSessionForIsis.java | 3 +-
.../wicket/AuthenticatedWebSessionForIsis.java | 11 ++--
.../wicket/ConverterForObjectAdapter.java | 1 +
.../integration/wicket/LocalizerForIsis.java | 13 ++--
.../ObjectAdapterMementoSupportUsingSpring.java | 4 +-
.../ComponentFactoryRegistryDefault.java | 15 ++---
.../registries/pages/PageClassListDefault.java | 3 +-
.../registries/pages/PageClassRegistryDefault.java | 7 ++-
.../pages/PageNavigationServiceDefault.java | 7 ++-
.../viewer/services/DeepLinkServiceWicket.java | 9 +--
.../services/HintStoreUsingWicketSession.java | 7 ++-
.../viewer/services/LocaleProviderWicket.java | 3 +-
.../viewer/IsisWicketApplication_Defaults.java | 11 ++--
.../wicket/viewer/IsisWicketApplication_Pages.java | 7 ++-
...uthenticatedWebSessionForIsis_Authenticate.java | 11 ++--
...thenticatedWebSessionForIsis_Instantiation.java | 1 +
.../AuthenticatedWebSessionForIsis_SignIn.java | 7 ++-
.../imagecache/ImageResourceCacheKeyTest.java | 5 +-
.../pages/PageClassListDefault_Instantiation.java | 1 -
...ageClassListDefault_RegistrationAndCaching.java | 1 +
.../services/TranslationsResolverWicketTest.java | 1 +
.../common/OnConcurrencyExceptionHandler.java | 5 +-
.../wicket/model/common/OnSelectionHandler.java | 3 +-
.../model/hints/IsisActionCompletedEvent.java | 1 +
.../wicket/model/links/ListOfLinksModel.java | 4 +-
.../wicket/model/models/ActionArgumentModel.java | 1 +
.../viewer/wicket/model/models/ActionModel.java | 19 +++---
.../wicket/model/models/ActionPromptProvider.java | 5 +-
.../viewer/wicket/model/models/EntityModel.java | 7 ++-
.../model/models/EntityModelForReference.java | 1 +
.../wicket/model/models/ImageResourceCache.java | 3 +-
.../viewer/wicket/model/models/ModelAbstract.java | 3 +-
.../wicket/model/models/ObjectAdapterModel.java | 1 +
.../model/models/ScalarModelWithMultiPending.java | 1 +
.../model/models/ScalarModelWithPending.java | 3 +-
.../model/models/ToggledMementosProvider.java | 3 +-
.../wicket/model/models/WicketComponentUtils.java | 3 +-
.../viewer/wicket/model/util/ComponentHintKey.java | 13 ++--
.../wicket/model/models/EntityModel_hintsTest.java | 3 +-
.../models/LowestCommonSuperclassClosureTest.java | 7 ++-
.../ScalarModel_isScalarSubtypingAnyOf_Test.java | 1 +
.../isis/viewer/wicket/ui/ComponentType.java | 3 +-
.../actionresponse/ActionResultResponseType.java | 5 +-
.../ui/app/registry/ComponentFactoryRegistrar.java | 2 +-
.../wicket/ui/components/about/AboutPanel.java | 3 +-
.../ui/components/about/AboutPanelFactory.java | 1 +
.../ui/components/about/JarManifestModel.java | 2 +-
.../ui/components/actioninfo/ActionInfoPanel.java | 1 +
.../components/actionmenu/CssClassFaBehavior.java | 3 +-
.../AdditionalLinksAsDropDownPanel.java | 1 +
.../AdditionalLinksAsListInlinePanel.java | 1 +
.../entityactions/EntityActionLinkFactory.java | 3 +-
.../actionmenu/serviceactions/CssMenuItem.java | 17 +++---
.../serviceactions/ServiceActionLinkFactory.java | 3 +-
.../serviceactions/ServiceActionUtil.java | 15 ++---
.../serviceactions/ServiceActionsPanel.java | 9 +--
.../serviceactions/ServiceActionsPanelFactory.java | 1 -
.../serviceactions/TertiaryMenuPanelFactory.java | 1 -
.../actionprompt/ActionPromptHeaderPanel.java | 1 +
.../actions/ActionFormExecutorStrategy.java | 1 +
.../actions/ActionParametersFormPanelFactory.java | 5 +-
.../bookmarkedpages/BookmarkedPagesPanel.java | 1 +
.../BookmarkedPagesPanelFactory.java | 1 +
.../ui/components/collection/CollectionPanel.java | 9 +--
.../CollectionContentsAsAjaxTablePanel.java | 15 ++---
.../CollectionContentsSortableDataProvider.java | 17 +++---
.../ajaxtable/IsisAjaxFallbackDataTable.java | 1 +
.../ajaxtable/IsisAjaxFallbackHeadersToolbar.java | 7 ++-
.../ajaxtable/IsisAjaxFallbackOrderByBorder.java | 3 +-
.../ajaxtable/IsisAjaxHeadersToolbar.java | 12 +++-
.../IsisAjaxPagingNavigationIncrementLink.java | 4 +-
.../ajaxtable/IsisAjaxPagingNavigator.java | 4 +-
.../columns/ObjectAdapterTitleColumn.java | 1 +
.../columns/ObjectAdapterToggleboxColumn.java | 13 ++--
.../icons/CollectionContentsAsIconsPanel.java | 1 +
.../CollectionContentsAsIconsPanelFactory.java | 1 +
.../CollectionContentsMultipleViewsPanel.java | 13 ++--
.../summary/CollectionContentsAsSummary.java | 12 ++--
.../CollectionContentsAsSummaryFactory.java | 1 +
.../entity/EntityComponentFactoryAbstract.java | 5 +-
.../collection/EntityCollectionPanelFactory.java | 5 +-
.../entity/header/EntityHeaderPanel.java | 1 +
.../entity/icontitle/EntityIconAndTitlePanel.java | 17 +++---
.../icontitle/EntityIconAndTitlePanelFactory.java | 1 +
.../icontitle/EntityIconTitleAndCopyLinkPanel.java | 1 +
.../EntityIconTitleAndCopyLinkPanelFactory.java | 1 +
.../selector/links/EntityLinksSelectorPanel.java | 6 +-
.../ui/components/footer/FooterPanelFactory.java | 5 +-
.../ui/components/header/HeaderPanelFactory.java | 5 +-
.../wicket/ui/components/layout/bs3/Util.java | 3 +-
.../components/layout/bs3/tabs/TabGroupPanel.java | 11 ++--
.../ui/components/property/PropertyEditPanel.java | 1 +
.../property/PropertyFormExecutorStrategy.java | 5 +-
.../PropertyEditPromptHeaderPanel.java | 5 +-
.../components/scalars/IsisConverterLocator.java | 9 +--
.../ui/components/scalars/ScalarPanelAbstract.java | 19 +++---
.../components/scalars/ScalarPanelAbstract2.java | 31 +++++-----
.../scalars/ScalarPanelSelect2Abstract.java | 1 +
.../ScalarPanelTextFieldParseableAbstract.java | 1 +
.../ui/components/scalars/TextFieldValueModel.java | 1 +
.../scalars/datepicker/DateTimeConfig.java | 8 ++-
.../scalars/image/JavaAwtImagePanel.java | 5 +-
.../scalars/image/JavaAwtImagePanelFactory.java | 1 +
.../scalars/isisapplib/IsisBlobPanel.java | 2 +
.../scalars/isisapplib/IsisClobPanel.java | 3 +
.../scalars/isisapplib/IsisTimePanel.java | 1 -
.../jdk8time/DateConverterForJdk8Abstract.java | 7 ++-
.../DateConverterForJdk8LocalDateTime.java | 4 +-
.../DateConverterForJdk8OffsetDateTime.java | 4 +-
.../jdk8time/Jdk8LocalDatePanelFactory.java | 4 +-
.../scalars/jdk8time/Jdk8LocalDateTimePanel.java | 3 +-
.../jdk8time/Jdk8LocalDateTimePanelFactory.java | 3 +-
.../scalars/jdk8time/Jdk8OffsetDateTimePanel.java | 3 +-
.../jdk8time/Jdk8OffsetDateTimePanelFactory.java | 3 +-
.../scalars/jdkmath/JavaMathBigDecimalPanel.java | 2 -
.../jdkmath/JavaMathBigIntegerPanelFactory.java | 1 +
.../scalars/markup/MarkupComponent_observing.java | 4 +-
.../scalars/reference/EntityLinkSelect2Panel.java | 1 +
.../scalars/reference/ReferencePanelFactory.java | 1 +
.../scalars/string/MultiLineStringPanel.java | 1 +
.../scalars/string/StringPanelFactory.java | 1 +
.../scalars/value/ValuePanelFactory.java | 1 +
.../StandaloneCollectionPanel.java | 1 +
.../wicket/ui/components/tree/TreePanel.java | 9 +--
.../ui/components/tree/TreePanelFactories.java | 1 +
.../ui/components/unknown/UnknownModelPanel.java | 1 +
.../ui/components/value/StandaloneValuePanel.java | 1 +
.../ui/components/widgets/bootstrap/FormGroup.java | 4 +-
.../widgets/breadcrumbs/BreadcrumbModel.java | 2 +-
.../widgets/breadcrumbs/BreadcrumbPanel.java | 23 +++----
.../widgets/buttons/ContainedButtonPanel.java | 4 +-
.../widgets/buttons/ToggleButtonsPanel.java | 2 +
.../widgets/checkbox/ContainedToggleboxPanel.java | 1 +
.../entitysimplelink/EntityLinkSimplePanel.java | 7 ++-
.../EntityLinkSimplePanelFactory.java | 1 +
.../ui/components/widgets/favicon/Favicon.java | 3 +-
.../formcomponent/FormComponentPanelAbstract.java | 3 +-
.../widgets/formcomponent/FormFeedbackPanel.java | 4 +-
.../ui/components/widgets/navbar/BrandLogo.java | 3 +-
.../ui/components/widgets/navbar/BrandName.java | 3 +-
.../ui/components/widgets/select2/ChoiceExt.java | 1 +
.../ui/components/widgets/select2/Select2.java | 1 +
.../widgets/select2/Select2ChoiceExt.java | 1 +
.../widgets/select2/Select2MultiChoiceExt.java | 1 +
.../select2/providers/EmptyChoiceProvider.java | 3 +-
...bjectAdapterMementoProviderForValueChoices.java | 1 +
.../themepicker/IsisWicketThemeSupportDefault.java | 6 +-
.../widgets/zclip/ZeroClipboardPanel.java | 1 +
.../viewer/wicket/ui/errors/ExceptionModel.java | 5 +-
.../viewer/wicket/ui/errors/JGrowlBehaviour.java | 6 +-
.../isis/viewer/wicket/ui/errors/JGrowlUtil.java | 3 +-
.../ui/pages/EmailVerificationUrlService.java | 2 +
.../isis/viewer/wicket/ui/pages/PageAbstract.java | 63 +++++++++----------
.../wicket/ui/pages/PageNavigationService.java | 2 +
.../accmngt/AccountManagementPageAbstract.java | 25 ++++----
.../EmailVerificationUrlServiceDefault.java | 7 ++-
.../accmngt/password_reset/PasswordResetPanel.java | 13 ++--
.../ui/pages/accmngt/register/RegisterPage.java | 11 ++--
.../pages/accmngt/signup/RegistrationFormPage.java | 3 +-
.../ui/pages/actionprompt/ActionPromptPage.java | 1 +
.../viewer/wicket/ui/pages/entity/EntityPage.java | 1 +
.../viewer/wicket/ui/pages/error/ErrorPage.java | 3 +-
.../wicket/ui/pages/login/WicketLogoutPage.java | 5 +-
.../wicket/ui/pages/login/WicketSignInPage.java | 9 +--
.../wicket/ui/pages/mmverror/MmvErrorPage.java | 11 ++--
.../wicket/ui/pages/voidreturn/VoidReturnPage.java | 1 +
.../isis/viewer/wicket/ui/panels/FormAbstract.java | 5 +-
.../wicket/ui/panels/FormExecutorStrategy.java | 1 +
.../wicket/ui/panels/PromptFormPanelAbstract.java | 3 +-
.../viewer/wicket/ui/util/CssClassAppender.java | 3 +-
.../viewer/wicket/ui/util/CssClassRemover.java | 3 +-
.../isis/viewer/wicket/ui/util/CssIdAppender.java | 4 +-
.../apache/isis/viewer/wicket/ui/util/Links.java | 1 +
.../wicket/ui/ComponentType_ConstantsTest.java | 4 +-
...ollectionContentsSelectorDropdownPanelTest.java | 2 +
.../EntityIconAndTitlePanelTest_abbreviated.java | 4 +-
.../jdkdates/DateConverterForJavaSqlDateTest.java | 7 ++-
.../jdkdates/DateConverterForJavaUtilDateTest.java | 7 ++-
.../jodatime/DateConverterForJodaDateTimeTest.java | 7 ++-
.../DateConverterForJodaLocalDateTest.java | 7 ++-
.../DateConverterForJodaLocalDateTimeTest.java | 7 ++-
.../DateConverterForJdk8LocalDateTest.java | 7 ++-
.../DateConverterForJdk8LocalDateTimeTest.java | 8 ++-
.../DateConverterForJdk8OffsetDateTimeTest.java | 15 ++---
...tAdapterMementoProviderForValueChoicesTest.java | 4 +-
.../main/java/domainapp/application/DemoApp.java | 5 +-
.../domainapp/application/DemoAppManifest.java | 19 +++---
.../java/domainapp/dom/events/EventSubscriber.java | 4 +-
.../dom/types/blob/BlobDemo_downloadLogo.java | 2 +-
.../application/HelloWorldAppManifest.java | 17 +++---
.../src/main/java/domainapp/dom/types/Notes.java | 6 +-
.../application/manifest/SimpleAppManifest.java | 19 +++---
.../services/homepage/HomePageService.java | 3 +-
.../bdd/specs/SimpleObjectsStepDef.java | 9 +--
.../integtests/SpringIntegrationTest.java | 3 +-
.../integtests/mml/MetaModelService_IntegTest.java | 21 ++++---
.../integtests/smoke/Smoke_IntegTest.java | 9 +--
.../modules/simple/dom/impl/SimpleObject.java | 8 +--
.../modules/simple/dom/impl/SimpleObject_Test.java | 4 +-
.../simple/dom/impl/SimpleObjects_Test.java | 9 +--
.../integtests/SimpleModuleIntegTestAbstract.java | 3 +-
.../integtests/SimpleModuleManifestForTesting.java | 15 ++---
.../integtests/tests/SimpleObject_IntegTest.java | 8 ++-
.../integtests/tests/SimpleObjects_IntegTest.java | 9 +--
.../main/java/domainapp/application/SimpleApp.java | 7 ++-
examples/smoketest.7z | Bin 45055 -> 0 bytes
.../isis/testdomain/jdo/JdoTestDomainModule.java | 15 ++---
.../jdo/JdoTestDomainModule_withShiro.java | 19 +++---
.../apache/isis/testdomain/rest/RestService.java | 5 +-
.../testdomain/auditing/AuditerServiceTest.java | 4 +-
.../bootstrapping/JdoBootstrappingTest.java | 17 +++---
.../JdoBootstrappingTest_usingFixtures.java | 17 +++---
.../SpringServiceProvisioningTest.java | 17 +++---
.../commandexecution/BackgroundExecutionTest.java | 17 +++---
.../eventhandling/SpringEventPublishingTest.java | 7 ++-
.../testdomain/ldap/LdapEmbeddedServerTest.java | 6 +-
.../publishing/PublisherServiceTest.java | 4 +-
.../isis/testdomain/rest/RestServiceTest.java | 15 ++---
.../isis/testdomain/shiro/ShiroLdapTest.java | 17 +++---
.../isis/testdomain/shiro/ShiroSecmanLdapTest.java | 33 +++++-----
.../shiro/ShiroSecmanLdap_restfulStressTest.java | 17 +++---
.../isis/testdomain/shiro/ShiroSecmanTest.java | 23 +++----
.../isis/testdomain/shiro/ShiroSimpleTest.java | 8 +--
.../extensions/fixtures/FixturesEventService.java | 5 +-
.../isis/extensions/fixtures/IsisBootFixtures.java | 5 +-
.../IsisIntegrationTestAbstactWithFixtures.java | 3 +-
.../fixturescripts/ExecutionParameters.java | 7 ++-
.../fixtures/fixturescripts/FixtureScript.java | 7 ++-
.../fixtures/legacy/clock/ClockFixture.java | 9 +--
.../fixtures/legacy/clock/TickingClockFixture.java | 9 +--
.../QueryResultsCacheControlInternal.java | 3 +-
.../fixturescripts/ExecutionContextTest.java | 1 -
.../ExecutionParameters_AsKeyValueMap_Test.java | 1 -
.../fixturescripts/ExecutionParameters_Test.java | 1 -
.../legacy/FixtureClockInstantiationTest.java | 9 ++-
extensions/pom.xml | 6 +-
.../api/permission/ApplicationPermissionMode.java | 1 +
.../PasswordEncryptionServiceUsingJBcrypt.java | 3 +-
.../secman/model/IsisBootSecmanModel.java | 3 +-
.../secman/jdo/IsisBootSecmanPersistenceJdo.java | 3 +-
.../permission/ApplicationPermissionFactory.java | 3 +-
.../jdo/dom/role/ApplicationRoleFactory.java | 3 +-
.../jdo/dom/tenancy/ApplicationTenancyFactory.java | 3 +-
.../jdo/dom/user/ApplicationUserFactory.java | 3 +-
.../secman/jdo/seed/SeedSecurityModuleService.java | 3 +-
.../secman/shiro/IsisModuleSecurityRealm.java | 19 +++---
.../secman/shiro/PermissionForMember.java | 3 +-
.../secman/shiro/PrincipalForApplicationUser.java | 5 +-
.../shiro/SecurityRealmServiceUsingShiro.java | 3 +-
.../wicket/excel/CollectionContentsAsExcel.java | 7 ++-
.../viewer/wicket/excel/ExcelFileModel.java | 11 ++--
801 files changed, 2271 insertions(+), 2187 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Defaulted.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/Defaulted.java
index 12e7d23..f01d66b 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/Defaulted.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/Defaulted.java
@@ -26,6 +26,7 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.apache.isis.applib.adapters.DefaultsProvider;
+import org.apache.isis.commons.internal.encoding.Encodable;
/**
* Indicates that the class should have a default, by providing a link to a
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/DomainObjectLayout.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/DomainObjectLayout.java
index 6583b16..e971135 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/DomainObjectLayout.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/DomainObjectLayout.java
@@ -27,8 +27,8 @@ import java.lang.annotation.Target;
import org.apache.isis.applib.events.ui.CssClassUiEvent;
import org.apache.isis.applib.events.ui.IconUiEvent;
-import org.apache.isis.applib.events.ui.TitleUiEvent;
import org.apache.isis.applib.events.ui.LayoutUiEvent;
+import org.apache.isis.applib.events.ui.TitleUiEvent;
/**
* Layout hints for domain objects.
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Value.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/Value.java
index 5acac64..36269fa 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/Value.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/Value.java
@@ -27,6 +27,7 @@ import java.lang.annotation.Target;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.ValueSemanticsProvider;
+import org.apache.isis.commons.internal.encoding.Encodable;
/**
* Indicates that the class has value semantics.
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/ViewModelLayout.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/ViewModelLayout.java
index c3ca77a..6db5c3a 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/ViewModelLayout.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/ViewModelLayout.java
@@ -27,8 +27,8 @@ import java.lang.annotation.Target;
import org.apache.isis.applib.events.ui.CssClassUiEvent;
import org.apache.isis.applib.events.ui.IconUiEvent;
-import org.apache.isis.applib.events.ui.TitleUiEvent;
import org.apache.isis.applib.events.ui.LayoutUiEvent;
+import org.apache.isis.applib.events.ui.TitleUiEvent;
/**
* Layout hints for view models.
diff --git a/core/applib/src/main/java/org/apache/isis/applib/client/RestfulClient.java b/core/applib/src/main/java/org/apache/isis/applib/client/RestfulClient.java
index 9976dce..87ed68b 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/client/RestfulClient.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/client/RestfulClient.java
@@ -18,8 +18,6 @@
*/
package org.apache.isis.applib.client;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-
import java.util.EnumSet;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Future;
@@ -36,6 +34,8 @@ import org.apache.isis.applib.client.log.RestfulLoggingFilter;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.context._Context;
+import static org.apache.isis.commons.internal.base._NullSafe.stream;
+
import lombok.extern.log4j.Log4j2;
/**
diff --git a/core/applib/src/main/java/org/apache/isis/applib/clock/Clock.java b/core/applib/src/main/java/org/apache/isis/applib/clock/Clock.java
index e83f9f7..5579ae6 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/clock/Clock.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/clock/Clock.java
@@ -22,12 +22,13 @@ import java.sql.Timestamp;
import java.util.Date;
import java.util.TimeZone;
-import org.apache.isis.applib.Defaults;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import org.joda.time.LocalDate;
import org.joda.time.LocalDateTime;
+import org.apache.isis.applib.Defaults;
+
/**
* Provides a mechanism to get (and possible to set) the current time.
*
diff --git a/core/applib/src/main/java/org/apache/isis/applib/conmap/ContentMappingServiceForCommandDto.java b/core/applib/src/main/java/org/apache/isis/applib/conmap/ContentMappingServiceForCommandDto.java
index 4a9ea31..495fb47 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/conmap/ContentMappingServiceForCommandDto.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/conmap/ContentMappingServiceForCommandDto.java
@@ -24,6 +24,8 @@ import java.util.List;
import javax.inject.Inject;
import javax.ws.rs.core.MediaType;
+import org.springframework.core.annotation.Order;
+
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.conmap.spi.CommandDtoProcessorService;
@@ -37,7 +39,6 @@ import org.apache.isis.schema.cmd.v1.CommandDto;
import org.apache.isis.schema.common.v1.PeriodDto;
import org.apache.isis.schema.utils.CommandDtoUtils;
import org.apache.isis.schema.utils.jaxbadapters.JavaSqlTimestampXmlGregorianCalendarAdapter;
-import org.springframework.core.annotation.Order;
@DomainService(nature = NatureOfService.DOMAIN)
public class ContentMappingServiceForCommandDto implements ContentMappingService {
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java b/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java
index 644368b..9ea6347 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java
@@ -21,6 +21,8 @@ package org.apache.isis.applib.services.metamodel;
import java.util.Collections;
import java.util.List;
+import org.springframework.boot.autoconfigure.data.web.SpringDataWebProperties.Sort;
+
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.command.CommandDtoProcessor;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheInternal.java b/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheInternal.java
index 7a3bff0..438d946 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheInternal.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheInternal.java
@@ -23,13 +23,14 @@ import java.util.concurrent.Callable;
import javax.enterprise.context.RequestScoped;
+import org.springframework.beans.factory.annotation.Autowired;
+
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.services.WithTransactionScope;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.collections._Maps;
-import org.springframework.beans.factory.annotation.Autowired;
import lombok.extern.log4j.Log4j2;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/value/BlobClobFactory.java b/core/applib/src/main/java/org/apache/isis/applib/value/BlobClobFactory.java
index d8dd5e3..289142e 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/value/BlobClobFactory.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/value/BlobClobFactory.java
@@ -18,11 +18,11 @@
*/
package org.apache.isis.applib.value;
-import static org.apache.isis.commons.internal.base._Strings.asFileNameWithExtension;
-
import javax.activation.MimeType;
import javax.activation.MimeTypeParseException;
+import static org.apache.isis.commons.internal.base._Strings.asFileNameWithExtension;
+
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/core/applib/src/test/java/org/apache/isis/applib/IdentifierTests.java b/core/applib/src/test/java/org/apache/isis/applib/IdentifierTests.java
index 955f274..6b21647 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/IdentifierTests.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/IdentifierTests.java
@@ -19,17 +19,17 @@
package org.apache.isis.applib;
-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 java.math.BigDecimal;
import java.util.Arrays;
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;
+
public class IdentifierTests {
private Identifier identifier;
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 e37afd3..fb26dea 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
@@ -19,18 +19,19 @@
package org.apache.isis.applib.events;
-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;
import org.jmock.integration.junit4.JUnitRuleMockery;
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;
+
public class InteractionEventTest {
@Rule
diff --git a/core/applib/src/test/java/org/apache/isis/applib/query/QueryDefaultTest_withStart_or_withCount.java b/core/applib/src/test/java/org/apache/isis/applib/query/QueryDefaultTest_withStart_or_withCount.java
index 990b9d8..00c0c0b 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/query/QueryDefaultTest_withStart_or_withCount.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/query/QueryDefaultTest_withStart_or_withCount.java
@@ -16,14 +16,14 @@
*/
package org.apache.isis.applib.query;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public class QueryDefaultTest_withStart_or_withCount {
private QueryDefault<Customer> queryDefault;
diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/eventbus/AbstractDomainEvent_veto_Test.java b/core/applib/src/test/java/org/apache/isis/applib/services/eventbus/AbstractDomainEvent_veto_Test.java
index 2dec000..61ff3f6 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/services/eventbus/AbstractDomainEvent_veto_Test.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/services/eventbus/AbstractDomainEvent_veto_Test.java
@@ -22,6 +22,7 @@ import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
+
import org.apache.isis.applib.events.domain.AbstractDomainEvent;
import org.apache.isis.applib.services.i18n.TranslatableString;
diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForTypeTest.java b/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForTypeTest.java
index 081a2ab..65c8d4c 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForTypeTest.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForTypeTest.java
@@ -19,14 +19,14 @@
package org.apache.isis.applib.services.exceprecog;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
import java.util.function.Function;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
public class ExceptionRecognizerForTypeTest {
private ExceptionRecognizer ersForType;
diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerGeneralTest.java b/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerGeneralTest.java
index d7af332..d5775b3 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerGeneralTest.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerGeneralTest.java
@@ -19,14 +19,14 @@
package org.apache.isis.applib.services.exceprecog;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
import java.util.function.Predicate;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
public class ExceptionRecognizerGeneralTest {
private ExceptionRecognizer ersGeneral;
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 37fe974..ea0af64 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
@@ -18,15 +18,16 @@
*/
package org.apache.isis.applib.services.i18n;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.jmock.Expectations;
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;
+
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 31ec5db..9ce7b14 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
@@ -19,13 +19,13 @@
package org.apache.isis.applib.services.interaction;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import org.junit.Test;
import org.apache.isis.applib.services.iactn.Interaction;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public class InteractionDefaultTest_next {
@Test
diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache_KeyTest.java b/core/applib/src/test/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache_KeyTest.java
index 591f56f..aba6f56 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache_KeyTest.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache_KeyTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.isis.applib.services.queryresultscache;
+import org.junit.Test;
+
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.junit.Test;
-
public class QueryResultsCache_KeyTest {
private QueryResultsCache.Key cacheKey;
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 278fb5a..afa2c58 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
@@ -16,21 +16,22 @@
*/
package org.apache.isis.applib.services.xmlsnapshot;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.math.BigDecimal;
import java.math.BigInteger;
import java.nio.charset.Charset;
import java.util.Locale;
-import org.apache.isis.commons.internal.resources._Resources;
import org.joda.time.LocalDate;
import org.junit.Before;
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;
+
public class XmlSnapshotServiceAbstractTest {
private XmlSnapshotServiceAbstract xmlSnapshotService;
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 99e13d0..365d603 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
@@ -19,16 +19,16 @@
package org.apache.isis.applib.spec;
-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.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;
+
public class AbstractSpecificationTest {
private static class SomeDomainObject {
diff --git a/core/applib/src/test/java/org/apache/isis/applib/tree/TreePathTest.java b/core/applib/src/test/java/org/apache/isis/applib/tree/TreePathTest.java
index 95edb9a..da88947 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/tree/TreePathTest.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/tree/TreePathTest.java
@@ -18,11 +18,12 @@
*/
package org.apache.isis.applib.tree;
-import static org.junit.Assert.*;
-
import org.hamcrest.Matchers;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+
public class TreePathTest {
@Test
diff --git a/core/applib/src/test/java/org/apache/isis/applib/util/EnumsTest_converts.java b/core/applib/src/test/java/org/apache/isis/applib/util/EnumsTest_converts.java
index 1d230a0..4a6b8c5 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/util/EnumsTest_converts.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/util/EnumsTest_converts.java
@@ -18,11 +18,11 @@
*/
package org.apache.isis.applib.util;
+import org.junit.Test;
+
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.junit.Test;
-
public class EnumsTest_converts {
private static enum MyEnum {
diff --git a/core/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_compareTo.java b/core/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_compareTo.java
index 7c6cfc4..21bed94 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_compareTo.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_compareTo.java
@@ -18,9 +18,10 @@ package org.apache.isis.applib.util;
import java.util.List;
-import org.apache.isis.unittestsupport.comparable.ComparableContractTest_compareTo;
import org.junit.Before;
+import org.apache.isis.unittestsupport.comparable.ComparableContractTest_compareTo;
+
public class ObjectContractsTest_compareTo extends ComparableContractTest_compareTo<InvoiceItem> {
private Invoice inv123;
diff --git a/core/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_equals_and_hashCode.java b/core/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_equals_and_hashCode.java
index e134c78..78f8a94 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_equals_and_hashCode.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_equals_and_hashCode.java
@@ -18,9 +18,10 @@ package org.apache.isis.applib.util;
import java.util.List;
+import org.junit.Before;
+
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.unittestsupport.value.ValueTypeContractTestAbstract;
-import org.junit.Before;
public class ObjectContractsTest_equals_and_hashCode extends ValueTypeContractTestAbstract<InvoiceItem3> {
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 fb290ff..0c0e8bc 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
@@ -16,13 +16,14 @@
*/
package org.apache.isis.applib.util;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+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 org.junit.Before;
-import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
public class ObjectContractsTest_toString {
diff --git a/core/applib/src/test/java/org/apache/isis/applib/util/ReasonBufferTest.java b/core/applib/src/test/java/org/apache/isis/applib/util/ReasonBufferTest.java
index e08635e..558230d 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/util/ReasonBufferTest.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/util/ReasonBufferTest.java
@@ -19,11 +19,11 @@
package org.apache.isis.applib.util;
-import static org.junit.Assert.assertEquals;
-
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class ReasonBufferTest {
private ReasonBuffer reason;
diff --git a/core/applib/src/test/java/org/apache/isis/applib/util/ReasonsTest.java b/core/applib/src/test/java/org/apache/isis/applib/util/ReasonsTest.java
index 83ec09c..115f9a2 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/util/ReasonsTest.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/util/ReasonsTest.java
@@ -19,12 +19,12 @@
package org.apache.isis.applib.util;
+import org.junit.Test;
+
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.nullValue;
import static org.junit.Assert.assertThat;
-import org.junit.Test;
-
public class ReasonsTest {
@Test
diff --git a/core/applib/src/test/java/org/apache/isis/applib/util/TitleBufferTest.java b/core/applib/src/test/java/org/apache/isis/applib/util/TitleBufferTest.java
index dfa5019..5c8fbf6 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/util/TitleBufferTest.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/util/TitleBufferTest.java
@@ -19,12 +19,12 @@
package org.apache.isis.applib.util;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
public class TitleBufferTest {
String companyName;
diff --git a/core/applib/src/test/java/org/apache/isis/applib/value/ColorTest.java b/core/applib/src/test/java/org/apache/isis/applib/value/ColorTest.java
index a96fdb3..33c1f8a 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/value/ColorTest.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/value/ColorTest.java
@@ -19,11 +19,11 @@
package org.apache.isis.applib.value;
+import org.junit.Test;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import org.junit.Test;
-
public class ColorTest {
@Test
public void testToTitle() throws Exception {
diff --git a/core/applib/src/test/java/org/apache/isis/applib/value/MoneyTest.java b/core/applib/src/test/java/org/apache/isis/applib/value/MoneyTest.java
index daa5172..a2bdf1c 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/value/MoneyTest.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/value/MoneyTest.java
@@ -19,15 +19,15 @@
package org.apache.isis.applib.value;
+import java.math.BigDecimal;
+
+import org.junit.Test;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import java.math.BigDecimal;
-
-import org.junit.Test;
-
public class MoneyTest {
@Test
diff --git a/core/applib/src/test/java/org/apache/isis/applib/value/PasswordTest.java b/core/applib/src/test/java/org/apache/isis/applib/value/PasswordTest.java
index 80fb305..4f0015c 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/value/PasswordTest.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/value/PasswordTest.java
@@ -19,12 +19,12 @@
package org.apache.isis.applib.value;
+import org.junit.Test;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import org.junit.Test;
-
public class PasswordTest {
@Test
public void testCheckPassword() {
diff --git a/core/applib/src/test/java/org/apache/isis/applib/value/PercentageTest.java b/core/applib/src/test/java/org/apache/isis/applib/value/PercentageTest.java
index e518c24..13ceb94 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/value/PercentageTest.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/value/PercentageTest.java
@@ -19,14 +19,14 @@
package org.apache.isis.applib.value;
+import org.junit.Before;
+import org.junit.Test;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertTrue;
-import org.junit.Before;
-import org.junit.Test;
-
public class PercentageTest {
Percentage p1;
Percentage p2;
diff --git a/core/applib/src/test/java/org/apache/isis/commons/internal/memento/MementosTest.java b/core/applib/src/test/java/org/apache/isis/commons/internal/memento/MementosTest.java
index 4eebecc..4b16d82 100644
--- a/core/applib/src/test/java/org/apache/isis/commons/internal/memento/MementosTest.java
+++ b/core/applib/src/test/java/org/apache/isis/commons/internal/memento/MementosTest.java
@@ -19,26 +19,26 @@
package org.apache.isis.commons.internal.memento;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
import java.io.Serializable;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Date;
+import org.joda.time.LocalDate;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.urlencoding.UrlEncodingService;
import org.apache.isis.applib.services.urlencoding.UrlEncodingServiceUsingBaseEncodingAbstract;
import org.apache.isis.applib.services.urlencoding.UrlEncodingServiceWithCompression;
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 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;
public class MementosTest {
diff --git a/core/commons/src/main/java/org/apache/isis/commons/collections/Bin.java b/core/commons/src/main/java/org/apache/isis/commons/collections/Bin.java
index 110561a..e3e1abc 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/collections/Bin.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/collections/Bin.java
@@ -18,8 +18,6 @@
*/
package org.apache.isis.commons.collections;
-import static org.apache.isis.commons.internal.base._With.requires;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -37,6 +35,8 @@ import org.springframework.core.annotation.AnnotationAwareOrderComparator;
import org.apache.isis.commons.internal.base._NullSafe;
+import static org.apache.isis.commons.internal.base._With.requires;
+
import lombok.val;
/**
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/assertions/_Ensure.java b/core/commons/src/main/java/org/apache/isis/commons/internal/assertions/_Ensure.java
index 81a58a5..4ae9e05 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/assertions/_Ensure.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/assertions/_Ensure.java
@@ -19,11 +19,11 @@
package org.apache.isis.commons.internal.assertions;
-import static org.apache.isis.commons.internal.base._With.requires;
-
import java.util.function.Predicate;
import java.util.function.Supplier;
+import static org.apache.isis.commons.internal.base._With.requires;
+
/**
* Utility for verifying arguments and so on.
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Bytes.java b/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Bytes.java
index fe7e8f8..89005fc 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Bytes.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Bytes.java
@@ -19,9 +19,6 @@
package org.apache.isis.commons.internal.base;
-import static org.apache.isis.commons.internal.base._With.mapIfPresentElse;
-import static org.apache.isis.commons.internal.base._With.requires;
-
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -30,6 +27,9 @@ import java.util.function.UnaryOperator;
import javax.annotation.Nullable;
+import static org.apache.isis.commons.internal.base._With.mapIfPresentElse;
+import static org.apache.isis.commons.internal.base._With.requires;
+
/**
* <h1>- internal use only -</h1>
* <p>
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Casts.java b/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Casts.java
index 8ca7479..a346a80 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Casts.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Casts.java
@@ -19,13 +19,13 @@
package org.apache.isis.commons.internal.base;
-import static org.apache.isis.commons.internal.base._With.requires;
-
import java.util.function.BiFunction;
import java.util.function.Supplier;
import javax.annotation.Nullable;
+import static org.apache.isis.commons.internal.base._With.requires;
+
/**
* <h1>- internal use only -</h1>
* <p>
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Either.java b/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Either.java
index 13be5bc..60292fe 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Either.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Either.java
@@ -19,8 +19,6 @@
package org.apache.isis.commons.internal.base;
-import static org.apache.isis.commons.internal.base._With.requires;
-
import java.util.Optional;
import java.util.function.BiFunction;
import java.util.function.Consumer;
@@ -28,6 +26,8 @@ import java.util.function.Function;
import javax.annotation.Nullable;
+import static org.apache.isis.commons.internal.base._With.requires;
+
import lombok.AccessLevel;
import lombok.EqualsAndHashCode;
import lombok.RequiredArgsConstructor;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Lazy_Simple.java b/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Lazy_Simple.java
index 8fa1b3f..a2c492d 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Lazy_Simple.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Lazy_Simple.java
@@ -19,10 +19,10 @@
package org.apache.isis.commons.internal.base;
-import static org.apache.isis.commons.internal.base._With.requires;
-
import java.util.function.Supplier;
+import static org.apache.isis.commons.internal.base._With.requires;
+
/**
* package private mixin for _Lazy
* @since 2.0
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Lazy_ThreadSafe.java b/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Lazy_ThreadSafe.java
index 52e769c..7ec7ed7 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Lazy_ThreadSafe.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Lazy_ThreadSafe.java
@@ -19,10 +19,10 @@
package org.apache.isis.commons.internal.base;
-import static org.apache.isis.commons.internal.base._With.requires;
-
import java.util.function.Supplier;
+import static org.apache.isis.commons.internal.base._With.requires;
+
/**
* package private mixin for _Lazy
* @since 2.0
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Reduction.java b/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Reduction.java
index 64f8564..8cb2674 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Reduction.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Reduction.java
@@ -18,8 +18,6 @@
*/
package org.apache.isis.commons.internal.base;
-import static org.apache.isis.commons.internal.base._With.requires;
-
import java.util.Optional;
import java.util.function.BinaryOperator;
import java.util.function.Consumer;
@@ -27,6 +25,8 @@ import java.util.stream.Stream;
import javax.annotation.Nullable;
+import static org.apache.isis.commons.internal.base._With.requires;
+
/**
* <h1>- internal use only -</h1>
* <p>
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings.java b/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings.java
index 83f959c..673fc5f 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings.java
@@ -19,12 +19,6 @@
package org.apache.isis.commons.internal.base;
-import static org.apache.isis.commons.internal.base._NullSafe.size;
-import static org.apache.isis.commons.internal.base._Strings_SplitIterator.splitIterator;
-import static org.apache.isis.commons.internal.base._With.mapIfPresentElse;
-import static org.apache.isis.commons.internal.base._With.requires;
-import static org.apache.isis.commons.internal.base._With.requiresNotEmpty;
-
import java.io.InputStream;
import java.nio.charset.Charset;
import java.util.Arrays;
@@ -45,6 +39,12 @@ import javax.annotation.Nullable;
import org.apache.isis.commons.internal._Constants;
import org.apache.isis.commons.internal.base._Bytes.BytesOperator;
+import static org.apache.isis.commons.internal.base._NullSafe.size;
+import static org.apache.isis.commons.internal.base._Strings_SplitIterator.splitIterator;
+import static org.apache.isis.commons.internal.base._With.mapIfPresentElse;
+import static org.apache.isis.commons.internal.base._With.requires;
+import static org.apache.isis.commons.internal.base._With.requiresNotEmpty;
+
/**
* <h1>- internal use only -</h1>
* <p>
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_KeyValuePair.java b/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_KeyValuePair.java
index 3fa619a..dd5f71a 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_KeyValuePair.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_KeyValuePair.java
@@ -19,12 +19,12 @@
package org.apache.isis.commons.internal.base;
-import static org.apache.isis.commons.internal.exceptions._Exceptions.notImplemented;
-
import java.util.Optional;
import org.apache.isis.commons.internal.base._Strings.KeyValuePair;
+import static org.apache.isis.commons.internal.exceptions._Exceptions.notImplemented;
+
/**
*
* package private mixin for utility class {@link _Strings}
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Arrays.java b/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Arrays.java
index 27ca76f..bed5638 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Arrays.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Arrays.java
@@ -19,8 +19,6 @@
package org.apache.isis.commons.internal.collections;
-import static org.apache.isis.commons.internal.base._With.requires;
-
import java.lang.reflect.Array;
import java.util.Collection;
import java.util.function.BiPredicate;
@@ -32,6 +30,8 @@ import org.apache.isis.commons.internal._Constants;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.base._NullSafe;
+import static org.apache.isis.commons.internal.base._With.requires;
+
/**
* <h1>- internal use only -</h1>
* <p>
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Collections_Collector.java b/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Collections_Collector.java
index 9eaf4cf..b0d0e4d 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Collections_Collector.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Collections_Collector.java
@@ -19,8 +19,6 @@
package org.apache.isis.commons.internal.collections;
-import static org.apache.isis.commons.internal.base._With.requires;
-
import java.util.Collection;
import java.util.Collections;
import java.util.Set;
@@ -30,6 +28,8 @@ import java.util.function.Function;
import java.util.function.Supplier;
import java.util.stream.Collector;
+import static org.apache.isis.commons.internal.base._With.requires;
+
/**
*
* package private mixin for utility class {@link _Collections}
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Lists.java b/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Lists.java
index 6eb5ad8..de4f711 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Lists.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Lists.java
@@ -19,8 +19,6 @@
package org.apache.isis.commons.internal.collections;
-import static org.apache.isis.commons.internal.base._With.requires;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -37,6 +35,8 @@ import javax.annotation.Nullable;
import org.apache.isis.commons.internal.base._NullSafe;
+import static org.apache.isis.commons.internal.base._With.requires;
+
/**
* <h1>- internal use only -</h1>
* <p>
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Maps.java b/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Maps.java
index 0b749d1..65aa10a 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Maps.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Maps.java
@@ -19,8 +19,6 @@
package org.apache.isis.commons.internal.collections;
-import static org.apache.isis.commons.internal.base._With.requires;
-
import java.util.AbstractMap;
import java.util.Collections;
import java.util.Comparator;
@@ -37,6 +35,8 @@ import javax.annotation.Nullable;
import org.apache.isis.commons.internal.collections._Multimaps.ListMultimap;
+import static org.apache.isis.commons.internal.base._With.requires;
+
/**
* <h1>- internal use only -</h1>
* <p>
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Multimaps.java b/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Multimaps.java
index a68ff0d..564c203 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Multimaps.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Multimaps.java
@@ -19,8 +19,6 @@
package org.apache.isis.commons.internal.collections;
-import static org.apache.isis.commons.internal.base._With.requires;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
@@ -40,6 +38,8 @@ import javax.annotation.Nullable;
import org.apache.isis.commons.internal.base._Casts;
+import static org.apache.isis.commons.internal.base._With.requires;
+
/**
* <h1>- internal use only -</h1>
* <p>
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/concurrent/_Tasks.java b/core/commons/src/main/java/org/apache/isis/commons/internal/concurrent/_Tasks.java
index 39c44ce..6daa9c0 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/concurrent/_Tasks.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/concurrent/_Tasks.java
@@ -18,9 +18,6 @@
*/
package org.apache.isis.commons.internal.concurrent;
-import static org.apache.isis.commons.internal.base._With.mapIfPresentElse;
-import static org.apache.isis.commons.internal.base._With.requires;
-
import java.util.Collections;
import java.util.List;
import java.util.concurrent.Callable;
@@ -29,10 +26,14 @@ import java.util.function.Supplier;
import javax.annotation.Nullable;
+import org.apache.logging.log4j.Level;
+
import org.apache.isis.commons.internal.base._Either;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.logging.log4j.Level;
+
+import static org.apache.isis.commons.internal.base._With.mapIfPresentElse;
+import static org.apache.isis.commons.internal.base._With.requires;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/context/_Context.java b/core/commons/src/main/java/org/apache/isis/commons/internal/context/_Context.java
index f788524..0aa301d 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/context/_Context.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/context/_Context.java
@@ -19,11 +19,6 @@
package org.apache.isis.commons.internal.context;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-import static org.apache.isis.commons.internal.base._With.ifPresentElseGet;
-import static org.apache.isis.commons.internal.base._With.ifPresentElseThrow;
-import static org.apache.isis.commons.internal.base._With.requires;
-
import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
@@ -37,6 +32,11 @@ import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.plugins.environment.IsisSystemEnvironment;
import org.apache.isis.commons.internal.plugins.environment.IsisSystemEnvironmentPlugin;
+import static org.apache.isis.commons.internal.base._NullSafe.stream;
+import static org.apache.isis.commons.internal.base._With.ifPresentElseGet;
+import static org.apache.isis.commons.internal.base._With.ifPresentElseThrow;
+import static org.apache.isis.commons.internal.base._With.requires;
+
/**
* <h1>- internal use only -</h1>
* <p>
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/context/_Context_ThreadLocal.java b/core/commons/src/main/java/org/apache/isis/commons/internal/context/_Context_ThreadLocal.java
index a4d5680..05d25b1 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/context/_Context_ThreadLocal.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/context/_Context_ThreadLocal.java
@@ -19,8 +19,6 @@
package org.apache.isis.commons.internal.context;
-import static org.apache.isis.commons.internal.base._With.requires;
-
import java.util.Map;
import org.apache.isis.commons.collections.Bin;
@@ -28,6 +26,8 @@ import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.commons.internal.collections._Multimaps;
+import static org.apache.isis.commons.internal.base._With.requires;
+
import lombok.Value;
import lombok.val;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/context/_Context_ThreadLocal_Singleton.java b/core/commons/src/main/java/org/apache/isis/commons/internal/context/_Context_ThreadLocal_Singleton.java
index 58bc387..bf5beeb 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/context/_Context_ThreadLocal_Singleton.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/context/_Context_ThreadLocal_Singleton.java
@@ -19,13 +19,13 @@
package org.apache.isis.commons.internal.context;
-import static org.apache.isis.commons.internal.base._With.requires;
-
import java.util.HashMap;
import java.util.Map;
import org.apache.isis.commons.internal.base._Casts;
+import static org.apache.isis.commons.internal.base._With.requires;
+
import lombok.Value;
import lombok.val;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/context/_Plugin.java b/core/commons/src/main/java/org/apache/isis/commons/internal/context/_Plugin.java
index b00a899..f2a71be 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/context/_Plugin.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/context/_Plugin.java
@@ -19,8 +19,6 @@
package org.apache.isis.commons.internal.context;
-import static org.apache.isis.commons.internal.base._With.requires;
-
import java.io.File;
import java.net.URL;
import java.net.URLClassLoader;
@@ -30,12 +28,15 @@ import java.util.function.Function;
import java.util.function.Supplier;
import java.util.stream.Collectors;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.collections._Sets;
import org.apache.isis.commons.internal.plugins.PluginResolveException;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+
+import static org.apache.isis.commons.internal.base._With.requires;
/**
* <h1>- internal use only -</h1>
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/exceptions/_Exceptions.java b/core/commons/src/main/java/org/apache/isis/commons/internal/exceptions/_Exceptions.java
index 351445b..03968ed 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/exceptions/_Exceptions.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/exceptions/_Exceptions.java
@@ -19,9 +19,6 @@
package org.apache.isis.commons.internal.exceptions;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-import static org.apache.isis.commons.internal.base._With.requires;
-
import java.io.PrintStream;
import java.util.Collections;
import java.util.List;
@@ -37,6 +34,9 @@ import javax.annotation.Nullable;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.functions._Functions;
+import static org.apache.isis.commons.internal.base._NullSafe.stream;
+import static org.apache.isis.commons.internal.base._With.requires;
+
/**
* <h1>- internal use only -</h1>
* <p>
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/BeanAdapterSpring.java b/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/BeanAdapterSpring.java
index 2f4ac72..177ecb6 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/BeanAdapterSpring.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/BeanAdapterSpring.java
@@ -18,11 +18,12 @@
*/
package org.apache.isis.commons.internal.ioc.spring;
+import org.springframework.beans.factory.ObjectProvider;
+
import org.apache.isis.commons.collections.Bin;
import org.apache.isis.commons.internal.ioc.BeanAdapter;
import org.apache.isis.commons.internal.ioc.BeanSort;
import org.apache.isis.commons.internal.ioc.LifecycleContext;
-import org.springframework.beans.factory.ObjectProvider;
import lombok.Value;
import lombok.val;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/_Spring.java b/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/_Spring.java
index 247ff06..8945840 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/_Spring.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/_Spring.java
@@ -41,6 +41,7 @@ import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.core.env.EnumerablePropertySource;
import org.springframework.core.env.MapPropertySource;
import org.springframework.core.env.PropertySource;
+
import org.apache.isis.commons.collections.Bin;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.collections._Maps;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/memento/_Mementos_MementoDefault.java b/core/commons/src/main/java/org/apache/isis/commons/internal/memento/_Mementos_MementoDefault.java
index 7857743..5b3a4d1 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/memento/_Mementos_MementoDefault.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/memento/_Mementos_MementoDefault.java
@@ -19,8 +19,6 @@
package org.apache.isis.commons.internal.memento;
-import static org.apache.isis.commons.internal.base._With.requires;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -42,6 +40,8 @@ import org.apache.isis.commons.internal.memento._Mementos.EncoderDecoder;
import org.apache.isis.commons.internal.memento._Mementos.Memento;
import org.apache.isis.commons.internal.memento._Mementos.SerializingAdapter;
+import static org.apache.isis.commons.internal.base._With.requires;
+
/**
*
* package private mixin for utility class {@link _Mementos}
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/assertions/Ensure_GivenValueThatDoesMatchTest.java b/core/commons/src/test/java/org/apache/isis/commons/internal/assertions/Ensure_GivenValueThatDoesMatchTest.java
index 1d3fb35..e0b9963 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/assertions/Ensure_GivenValueThatDoesMatchTest.java
+++ b/core/commons/src/test/java/org/apache/isis/commons/internal/assertions/Ensure_GivenValueThatDoesMatchTest.java
@@ -19,15 +19,14 @@
package org.apache.isis.commons.internal.assertions;
+import org.junit.Test;
+
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.CoreMatchers.sameInstance;
import static org.junit.Assert.assertThat;
-import org.apache.isis.commons.internal.assertions._Ensure;
-import org.junit.Test;
-
public class Ensure_GivenValueThatDoesMatchTest {
@Test
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/assertions/Ensure_GivenValueThatDoesNotMatchTest.java b/core/commons/src/test/java/org/apache/isis/commons/internal/assertions/Ensure_GivenValueThatDoesNotMatchTest.java
index 2be7927..aee59fe 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/assertions/Ensure_GivenValueThatDoesNotMatchTest.java
+++ b/core/commons/src/test/java/org/apache/isis/commons/internal/assertions/Ensure_GivenValueThatDoesNotMatchTest.java
@@ -19,14 +19,13 @@
package org.apache.isis.commons.internal.assertions;
+import org.junit.Test;
+
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 org.apache.isis.commons.internal.assertions._Ensure;
-import org.junit.Test;
-
public class Ensure_GivenValueThatDoesNotMatchTest {
@Test
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 da942ff..736c0b9 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
@@ -19,14 +19,9 @@
package org.apache.isis.commons.internal.base;
-import static org.hamcrest.Matchers.lessThan;
-
import java.nio.charset.StandardCharsets;
import java.util.Base64;
-import org.apache.isis.commons.internal._Constants;
-import org.apache.isis.commons.internal.base._Bytes;
-import org.apache.isis.commons.internal.base._Strings;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -35,6 +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;
+
public class BytesTest {
final int n = 256;
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/base/NullSafeTest.java b/core/commons/src/test/java/org/apache/isis/commons/internal/base/NullSafeTest.java
index 570a417..e72c486 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/base/NullSafeTest.java
+++ b/core/commons/src/test/java/org/apache/isis/commons/internal/base/NullSafeTest.java
@@ -19,8 +19,6 @@
package org.apache.isis.commons.internal.base;
-import static org.hamcrest.CoreMatchers.is;
-
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -28,11 +26,11 @@ import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.base._Strings;
import org.junit.Assert;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+
public class NullSafeTest {
@Test
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 3a53121..d19fb5a 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
@@ -19,15 +19,15 @@
package org.apache.isis.commons.internal.base;
-import static org.hamcrest.CoreMatchers.is;
-
import java.util.List;
-import org.apache.isis.commons.internal.base._Reduction;
-import org.apache.isis.commons.internal.collections._Lists;
import org.junit.Assert;
import org.junit.Test;
+import org.apache.isis.commons.internal.collections._Lists;
+
+import static org.hamcrest.CoreMatchers.is;
+
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 4e66ca7..cbc874e 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
@@ -19,18 +19,17 @@
package org.apache.isis.commons.internal.base;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-
import java.nio.charset.StandardCharsets;
import java.util.stream.Collectors;
-import org.apache.isis.commons.internal._Constants;
-import org.apache.isis.commons.internal.base._Bytes;
-import org.apache.isis.commons.internal.base._Strings;
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;
+
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 e3a73df..78905bd 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
@@ -25,11 +25,12 @@ import java.util.List;
import javax.annotation.CheckForNull;
import javax.inject.Inject;
-import org.apache.isis.commons.internal.ioc.cdi._CDI;
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;
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 b2390bf..47eff8f 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
@@ -19,21 +19,21 @@
package org.apache.isis.commons.internal.compare;
-import static org.hamcrest.CoreMatchers.is;
-
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.SortedSet;
import java.util.TreeSet;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.compare._Comparators;
import org.junit.Assert;
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;
+
public class ComparatorsTest {
@Rule
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/context/ContextTest.java b/core/commons/src/test/java/org/apache/isis/commons/internal/context/ContextTest.java
index 4183ebb..4103f55 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/context/ContextTest.java
+++ b/core/commons/src/test/java/org/apache/isis/commons/internal/context/ContextTest.java
@@ -18,17 +18,17 @@
*/
package org.apache.isis.commons.internal.context;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
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.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
@Disabled("some tests fail to run on eclipse -> "
+ "java.lang.ClassNotFoundException: org.junit.platform.commons.logging.LogRecordListener")
class ContextTest {
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/encoding/ByteEncoderDecoderRoundtripTest.java b/core/commons/src/test/java/org/apache/isis/commons/internal/encoding/ByteEncoderDecoderRoundtripTest.java
index e38a12e..65fd650 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/encoding/ByteEncoderDecoderRoundtripTest.java
+++ b/core/commons/src/test/java/org/apache/isis/commons/internal/encoding/ByteEncoderDecoderRoundtripTest.java
@@ -19,25 +19,20 @@
package org.apache.isis.commons.internal.encoding;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
import java.io.IOException;
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
-import org.apache.isis.commons.internal.encoding.DataInputExtended;
-import org.apache.isis.commons.internal.encoding.DataInputStreamExtended;
-import org.apache.isis.commons.internal.encoding.DataOutputExtended;
-import org.apache.isis.commons.internal.encoding.DataOutputStreamExtended;
-import org.apache.isis.commons.internal.encoding.Encodable;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
public class ByteEncoderDecoderRoundtripTest {
private DataOutputStreamExtended outputImpl;
diff --git a/core/commons/src/test/java/org/apache/isis/commons/internal/threadpool/ThreadPoolSupportTest.java b/core/commons/src/test/java/org/apache/isis/commons/internal/threadpool/ThreadPoolSupportTest.java
index 72d2a06..01f3061 100644
--- a/core/commons/src/test/java/org/apache/isis/commons/internal/threadpool/ThreadPoolSupportTest.java
+++ b/core/commons/src/test/java/org/apache/isis/commons/internal/threadpool/ThreadPoolSupportTest.java
@@ -31,8 +31,6 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.threadpool.ThreadPoolExecutionMode;
-import org.apache.isis.commons.internal.threadpool.ThreadPoolSupport;
class ThreadPoolSupportTest {
diff --git a/core/config/src/main/java/org/apache/isis/config/registry/IsisBeanTypeRegistry.java b/core/config/src/main/java/org/apache/isis/config/registry/IsisBeanTypeRegistry.java
index ec289c6..c66ee65 100644
--- a/core/config/src/main/java/org/apache/isis/config/registry/IsisBeanTypeRegistry.java
+++ b/core/config/src/main/java/org/apache/isis/config/registry/IsisBeanTypeRegistry.java
@@ -18,10 +18,6 @@
*/
package org.apache.isis.config.registry;
-import static org.apache.isis.commons.internal.base._With.requires;
-import static org.apache.isis.commons.internal.reflection._Reflect.containsAnnotation;
-import static org.apache.isis.commons.internal.reflection._Reflect.getAnnotation;
-
import java.io.Serializable;
import java.util.Collection;
import java.util.HashMap;
@@ -51,6 +47,10 @@ import org.apache.isis.commons.internal.ioc.BeanSort;
import org.apache.isis.commons.internal.ioc.BeanSortClassifier;
import org.apache.isis.commons.internal.ioc.spring._Spring;
+import static org.apache.isis.commons.internal.base._With.requires;
+import static org.apache.isis.commons.internal.reflection._Reflect.containsAnnotation;
+import static org.apache.isis.commons.internal.reflection._Reflect.getAnnotation;
+
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
diff --git a/core/config/src/test/java/org/apache/isis/config/ConfigurationConstants_isProtected_Test.java b/core/config/src/test/java/org/apache/isis/config/ConfigurationConstants_isProtected_Test.java
index 44f8e01..8fa7333 100644
--- a/core/config/src/test/java/org/apache/isis/config/ConfigurationConstants_isProtected_Test.java
+++ b/core/config/src/test/java/org/apache/isis/config/ConfigurationConstants_isProtected_Test.java
@@ -20,8 +20,6 @@ package org.apache.isis.config;
import org.junit.Test;
-import org.apache.isis.config.ConfigurationConstants;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/core/config/src/test/java/org/apache/isis/config/ConfigurationConstants_mask_Test.java b/core/config/src/test/java/org/apache/isis/config/ConfigurationConstants_mask_Test.java
index e16319a..70abf68 100644
--- a/core/config/src/test/java/org/apache/isis/config/ConfigurationConstants_mask_Test.java
+++ b/core/config/src/test/java/org/apache/isis/config/ConfigurationConstants_mask_Test.java
@@ -20,8 +20,6 @@ package org.apache.isis.config;
import org.junit.Test;
-import org.apache.isis.config.ConfigurationConstants;
-
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
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 8a269bc..846058a 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
@@ -18,21 +18,22 @@
*/
package org.apache.isis.metamodel.facets.param.name;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.lang.reflect.Method;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
import org.apache.isis.metamodel.facets.FacetFactory;
import org.apache.isis.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.metamodel.progmodel.ProgrammingModelAbstract.DeprecatedPolicy;
import org.apache.isis.metamodel.progmodels.dflt.ProgrammingModelFacetsJava8;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
/**
* Detached from its module because we need the javac -parameter flag set when compiling this test
diff --git a/core/detached-tests/src/test/java/org/apache/isis/runtime/services/ServiceInjectorTestUsingCodegenPlugin.java b/core/detached-tests/src/test/java/org/apache/isis/runtime/services/ServiceInjectorTestUsingCodegenPlugin.java
index 04b814f..9c755dc 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/runtime/services/ServiceInjectorTestUsingCodegenPlugin.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/runtime/services/ServiceInjectorTestUsingCodegenPlugin.java
@@ -18,9 +18,6 @@
*/
package org.apache.isis.runtime.services;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.util.List;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
@@ -39,13 +36,13 @@ import org.junit.Test;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.config.internal._Config;
import org.apache.isis.metamodel.MetaModelContext;
-import org.apache.isis.runtime.services.RequestScopedService;
-import org.apache.isis.runtime.services.ServiceInstantiator;
import org.apache.isis.runtime.system.context.IsisContext;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public class ServiceInjectorTestUsingCodegenPlugin {
@Rule
diff --git a/core/detached-tests/src/test/java/org/apache/isis/runtime/services/ServiceInstantiatorTestUsingCodegenPlugin.java b/core/detached-tests/src/test/java/org/apache/isis/runtime/services/ServiceInstantiatorTestUsingCodegenPlugin.java
index 9eb39e3..4af6762 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/runtime/services/ServiceInstantiatorTestUsingCodegenPlugin.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/runtime/services/ServiceInstantiatorTestUsingCodegenPlugin.java
@@ -36,8 +36,6 @@ import org.junit.Test;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.runtime.services.RequestScopedService;
-import org.apache.isis.runtime.services.ServiceInstantiator;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import static org.hamcrest.CoreMatchers.is;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java
index 0351d41..634a1fc 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java
@@ -19,9 +19,6 @@
package org.apache.isis.unittestsupport.bidir;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.unittestsupport.bidir.BidirectionalRelationshipContractTestAbstract;
-import org.apache.isis.unittestsupport.bidir.Instantiator;
-import org.apache.isis.unittestsupport.bidir.InstantiatorSimple;
public class BidirectionalRelationshipContractTestAll extends BidirectionalRelationshipContractTestAbstract {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/InstantiatorForChildDomainObject.java b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/InstantiatorForChildDomainObject.java
index 19042e6..fc5f695 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/InstantiatorForChildDomainObject.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/InstantiatorForChildDomainObject.java
@@ -20,8 +20,6 @@ package org.apache.isis.unittestsupport.bidir;
import java.util.SortedSet;
-import org.apache.isis.unittestsupport.bidir.Instantiator;
-
/**
* To ensure that different ({@link Comparable}) {@link ChildDomainObject}s
* are not equivalent when placed into the {@link ParentDomainObject#getChildren() children} (a {@link SortedSet}.)
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/PeerDomainObjectForTesting.java b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/PeerDomainObjectForTesting.java
index 93fa13b..1aa2143 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/PeerDomainObjectForTesting.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/PeerDomainObjectForTesting.java
@@ -18,8 +18,6 @@
*/
package org.apache.isis.unittestsupport.bidir;
-import javax.jdo.annotations.Persistent;
-
public class PeerDomainObjectForTesting extends PeerDomainObject {
}
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/comparable/CategorizedDomainObjectComparableContractTest_compareTo.java b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/comparable/CategorizedDomainObjectComparableContractTest_compareTo.java
index 711a934..85b6f05 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/comparable/CategorizedDomainObjectComparableContractTest_compareTo.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/comparable/CategorizedDomainObjectComparableContractTest_compareTo.java
@@ -20,8 +20,6 @@ package org.apache.isis.unittestsupport.comparable;
import java.util.List;
-import org.apache.isis.unittestsupport.comparable.ComparableContractTest_compareTo;
-
public class CategorizedDomainObjectComparableContractTest_compareTo extends ComparableContractTest_compareTo<CategorizedDomainObject> {
@SuppressWarnings("unchecked")
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/files/FilesTest_deleteFiles.java b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/files/FilesTest_deleteFiles.java
index c43bc17..4a87ee0 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/files/FilesTest_deleteFiles.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/files/FilesTest_deleteFiles.java
@@ -21,11 +21,6 @@ package org.apache.isis.unittestsupport.files;
import java.io.File;
import java.io.IOException;
-import org.apache.isis.unittestsupport.files.Files;
-import org.apache.isis.unittestsupport.files.Files.Deleter;
-import org.apache.isis.unittestsupport.files.Files.Recursion;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
@@ -34,6 +29,11 @@ import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
+import org.apache.isis.unittestsupport.files.Files.Deleter;
+import org.apache.isis.unittestsupport.files.Files.Recursion;
+import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+
public class FilesTest_deleteFiles {
@Rule
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAll.java b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAll.java
index 2b248a4..0bac6b5 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAll.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAll.java
@@ -18,8 +18,6 @@
*/
package org.apache.isis.unittestsupport.inject;
-import org.apache.isis.unittestsupport.inject.InjectServiceMethodMustBeFinalContractTestAbstract;
-
public class InjectServiceMethodMustBeFinalContractTestAll extends InjectServiceMethodMustBeFinalContractTestAbstract {
public InjectServiceMethodMustBeFinalContractTestAll() {
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 2d1b7de..60297b3 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
@@ -39,7 +39,6 @@ import org.junit.jupiter.api.Test;
import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.commons.internal.plugins.codegen.ProxyFactoryPlugin;
-import org.apache.isis.unittestsupport.jmocking.Imposterisers;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
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 001e45f..8f3b5ca 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
@@ -18,14 +18,6 @@
*/
package org.apache.isis.unittestsupport.jmocking;
-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.IsisActions;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
@@ -34,6 +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;
+
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 3fd26ae..3794b98 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,13 +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.JMockActions;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-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 95efb3c..b6abe14 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
@@ -19,17 +19,16 @@
package org.apache.isis.unittestsupport.jmocking;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-
-import org.apache.isis.unittestsupport.jmocking.JMockActions;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.jmock.Expectations;
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;
+
public class JMockActionsTest_returnEach {
@Rule
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test.java b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test.java
index aa5422d..3248802 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test.java
@@ -19,13 +19,13 @@
package org.apache.isis.unittestsupport.jmocking;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
+import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+
public class JUnitRuleMockery2Test {
@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 af5e92b..638f042 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
@@ -19,18 +19,18 @@
package org.apache.isis.unittestsupport.jmocking;
+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;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import org.jmock.auto.Mock;
-import org.junit.Rule;
-import org.junit.Test;
-
public class JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase {
@Rule
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java
index 94d1ada..68170f6 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java
@@ -19,12 +19,12 @@
package org.apache.isis.unittestsupport.jmocking;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
+import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+
public class JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest {
@Rule
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java
index c055d7d..fc6593d 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java
@@ -19,14 +19,14 @@
package org.apache.isis.unittestsupport.jmocking;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.jmock.auto.Mock;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
+import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+
public class JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest {
@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 2023133..ee88053 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
@@ -19,19 +19,18 @@
package org.apache.isis.unittestsupport.jmocking;
+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;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import org.jmock.auto.Mock;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
public class JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase {
@Rule
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java
index 01f4cbf..53d2bb0 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java
@@ -19,15 +19,14 @@
package org.apache.isis.unittestsupport.jmocking;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Allowing;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.jmock.auto.Mock;
-import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Allowing;
+import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+
public class JUnitRuleMockery2Test_mockAnnotatedWithAllowing {
@Rule
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithChecking.java b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithChecking.java
index dcfbcb7..ff307ec 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithChecking.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithChecking.java
@@ -19,15 +19,14 @@
package org.apache.isis.unittestsupport.jmocking;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.jmock.auto.Mock;
+import org.junit.Rule;
+import org.junit.Test;
+
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Checking;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ExpectationsOn;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import org.jmock.auto.Mock;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
public class JUnitRuleMockery2Test_mockAnnotatedWithChecking {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java
index 0ec1f6d..d6cdb16 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java
@@ -19,15 +19,14 @@
package org.apache.isis.unittestsupport.jmocking;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Ignoring;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.jmock.auto.Mock;
-import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Ignoring;
+import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+
public class JUnitRuleMockery2Test_mockAnnotatedWithIgnoring {
@Rule
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java
index 7b85339..a3b2b72 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java
@@ -19,15 +19,14 @@
package org.apache.isis.unittestsupport.jmocking;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Never;
import org.jmock.auto.Mock;
-import org.junit.Before;
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 org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Never;
+
public class JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase {
@Rule
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java
index 3915f65..048d6be 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java
@@ -19,15 +19,15 @@
package org.apache.isis.unittestsupport.jmocking;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Never;
import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
+import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Never;
+
public class JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase {
@Rule
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java
index 1ac64a0..4705799 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java
@@ -19,15 +19,14 @@
package org.apache.isis.unittestsupport.jmocking;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.One;
import org.jmock.auto.Mock;
-import org.junit.Before;
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 org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.One;
+
public class JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase {
@Rule
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java
index e733c2a..8413acf 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java
@@ -19,16 +19,15 @@
package org.apache.isis.unittestsupport.jmocking;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.One;
import org.jmock.auto.Mock;
-import org.junit.Before;
import org.junit.Ignore;
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 org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.One;
+
public class JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase {
@Rule
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/sortedsets/SortedSetsContractTestAll.java b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/sortedsets/SortedSetsContractTestAll.java
index baef9d2..bf19c7c 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/sortedsets/SortedSetsContractTestAll.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/sortedsets/SortedSetsContractTestAll.java
@@ -18,8 +18,6 @@
*/
package org.apache.isis.unittestsupport.sortedsets;
-import org.apache.isis.unittestsupport.sortedsets.SortedSetsContractTestAbstract;
-
public class SortedSetsContractTestAll extends SortedSetsContractTestAbstract {
public SortedSetsContractTestAll() {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract_BigIntegerTest.java b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract_BigIntegerTest.java
index af27a6a..39bf280 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract_BigIntegerTest.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract_BigIntegerTest.java
@@ -22,8 +22,6 @@ import java.math.BigInteger;
import java.util.Arrays;
import java.util.List;
-import org.apache.isis.unittestsupport.value.ValueTypeContractTestAbstract;
-
public class ValueTypeContractTestAbstract_BigIntegerTest extends ValueTypeContractTestAbstract<BigInteger> {
@Override
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract_ColorTest.java b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract_ColorTest.java
index c026e5e..7a4deea 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract_ColorTest.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract_ColorTest.java
@@ -22,8 +22,6 @@ import java.awt.Color;
import java.util.Arrays;
import java.util.List;
-import org.apache.isis.unittestsupport.value.ValueTypeContractTestAbstract;
-
public class ValueTypeContractTestAbstract_ColorTest extends ValueTypeContractTestAbstract<Color> {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract_StringTest.java b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract_StringTest.java
index bb959a4..c1fc569 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract_StringTest.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract_StringTest.java
@@ -21,8 +21,6 @@ package org.apache.isis.unittestsupport.value;
import java.util.Arrays;
import java.util.List;
-import org.apache.isis.unittestsupport.value.ValueTypeContractTestAbstract;
-
public class ValueTypeContractTestAbstract_StringTest extends ValueTypeContractTestAbstract<String> {
@Override
diff --git a/core/detached-tests/src/test/java/org/apache/isis/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java b/core/detached-tests/src/test/java/org/apache/isis/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java
index a08ff37..a5d256e 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java
@@ -22,12 +22,12 @@ import java.lang.reflect.Method;
import java.util.HashSet;
import java.util.Set;
-import org.apache.isis.wrapper.handlers.DelegatingInvocationHandler;
-import org.apache.isis.wrapper.proxy.ProxyCreator;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.apache.isis.wrapper.handlers.DelegatingInvocationHandler;
+
public class ProxyCreatorTestUsingCodegenPlugin {
private ProxyCreator proxyCreator;
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ThrowableMatchers.java b/core/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ThrowableMatchers.java
index 2d9181b..46c7a4e 100644
--- a/core/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ThrowableMatchers.java
+++ b/core/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ThrowableMatchers.java
@@ -20,10 +20,11 @@ package org.apache.isis.integtestsupport;
import java.util.List;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.hamcrest.Description;
import org.hamcrest.TypeSafeMatcher;
+import org.apache.isis.commons.internal.exceptions._Exceptions;
+
public class ThrowableMatchers {
ThrowableMatchers(){}
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextLauncher.java b/core/integtestsupport/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextLauncher.java
index 16babb8..ecac60f 100644
--- a/core/integtestsupport/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextLauncher.java
+++ b/core/integtestsupport/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextLauncher.java
@@ -31,14 +31,13 @@ import java.util.HashSet;
import java.util.List;
import java.util.Optional;
import java.util.Set;
-import java.util.stream.Stream;
-import org.apache.isis.commons.internal.collections._Arrays;
-import org.apache.isis.commons.internal.collections._Lists;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import lombok.extern.java.Log;
+import org.apache.isis.commons.internal.collections._Arrays;
+import org.apache.isis.commons.internal.collections._Lists;
+
import lombok.extern.log4j.Log4j2;
/**
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/mavenplugin/util/Log4j.java b/core/integtestsupport/src/main/java/org/apache/isis/mavenplugin/util/Log4j.java
index 8dcb26c..ab6d8c4 100644
--- a/core/integtestsupport/src/main/java/org/apache/isis/mavenplugin/util/Log4j.java
+++ b/core/integtestsupport/src/main/java/org/apache/isis/mavenplugin/util/Log4j.java
@@ -18,11 +18,8 @@
*/
package org.apache.isis.mavenplugin.util;
-import java.util.Enumeration;
-
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.config.Configurator;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/ServiceInjector_forTesting.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/ServiceInjector_forTesting.java
index 2163014..4e34bbd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/ServiceInjector_forTesting.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/ServiceInjector_forTesting.java
@@ -18,8 +18,6 @@
*/
package org.apache.isis.metamodel;
-import static java.util.Objects.requireNonNull;
-
import java.util.function.Consumer;
import org.springframework.beans.factory.InjectionPoint;
@@ -28,6 +26,8 @@ import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.metamodel.services.ServiceInjectorDefault;
import org.apache.isis.metamodel.specloader.InjectorMethodEvaluatorDefault;
+import static java.util.Objects.requireNonNull;
+
import lombok.val;
class ServiceInjector_forTesting implements ServiceInjector {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Marshaller.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Marshaller.java
index aa20781..663961a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Marshaller.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Marshaller.java
@@ -18,8 +18,6 @@
*/
package org.apache.isis.metamodel.adapter.oid;
-import static org.apache.isis.commons.internal.base._Strings.splitThenStream;
-
import java.util.Iterator;
import java.util.List;
import java.util.regex.Matcher;
@@ -34,6 +32,8 @@ import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.metamodel.adapter.version.Version;
import org.apache.isis.metamodel.spec.ObjectSpecId;
+import static org.apache.isis.commons.internal.base._Strings.splitThenStream;
+
/**
* Factory for subtypes of {@link Oid}, based on their oid str.
*
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Parented.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Parented.java
index 033e0bc..a5975ab 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Parented.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Parented.java
@@ -19,8 +19,6 @@
package org.apache.isis.metamodel.adapter.oid;
-import static org.apache.isis.commons.internal.base._With.requires;
-
import java.io.IOException;
import java.util.Objects;
@@ -28,6 +26,8 @@ import org.apache.isis.commons.internal.encoding.DataInputExtended;
import org.apache.isis.commons.internal.encoding.DataOutputExtended;
import org.apache.isis.metamodel.adapter.version.Version;
+import static org.apache.isis.commons.internal.base._With.requires;
+
final class Oid_Parented implements ParentedOid {
private static final long serialVersionUID = 1L;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Root.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Root.java
index 6ed9175..e2e0410 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Root.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/oid/Oid_Root.java
@@ -19,8 +19,6 @@
package org.apache.isis.metamodel.adapter.oid;
-import static org.apache.isis.commons.internal.base._With.requires;
-
import java.io.IOException;
import java.util.Objects;
@@ -33,6 +31,8 @@ import org.apache.isis.metamodel.adapter.version.Version;
import org.apache.isis.metamodel.spec.ObjectSpecId;
import org.apache.isis.schema.common.v1.OidDto;
+import static org.apache.isis.commons.internal.base._With.requires;
+
import lombok.val;
final class Oid_Root implements RootOid {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/version/Version.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/version/Version.java
index cc2e730..acb0b3c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/version/Version.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/version/Version.java
@@ -19,8 +19,6 @@
package org.apache.isis.metamodel.adapter.version;
-import static org.apache.isis.commons.internal.base._With.mapIfPresentElse;
-
import java.io.IOException;
import java.io.Serializable;
import java.util.Date;
@@ -34,6 +32,8 @@ import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.adapter.oid.Oid;
import org.apache.isis.metamodel.commons.DateExtensions;
+import static org.apache.isis.commons.internal.base._With.mapIfPresentElse;
+
/**
* An instance of this class is held by each {@link ObjectAdapter} and is used
* to represent a particular version (at a point in time) of domain object
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ListExtensions.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ListExtensions.java
index b5f1b90..79e389e1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ListExtensions.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/ListExtensions.java
@@ -19,8 +19,6 @@
package org.apache.isis.metamodel.commons;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
@@ -29,6 +27,8 @@ import java.util.stream.Collectors;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.collections._Lists;
+import static org.apache.isis.commons.internal.base._NullSafe.stream;
+
public final class ListExtensions {
private static final String DEFAULT_DELIMITER = ",";
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/MethodInvocationPreprocessor.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/MethodInvocationPreprocessor.java
index 68dbf94..f41ba00 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/MethodInvocationPreprocessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/MethodInvocationPreprocessor.java
@@ -19,8 +19,6 @@
package org.apache.isis.metamodel.commons;
-import static org.apache.isis.commons.internal.base._NullSafe.isEmpty;
-
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Collection;
@@ -32,6 +30,8 @@ import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.collections._Arrays;
import org.apache.isis.commons.internal.collections._Collections;
+import static org.apache.isis.commons.internal.base._NullSafe.isEmpty;
+
/**
* Utility for method invocation pre-processing.
* <p>
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/consent/Veto.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/consent/Veto.java
index 1935fb2..20ce9cd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/consent/Veto.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/consent/Veto.java
@@ -19,11 +19,11 @@
package org.apache.isis.metamodel.consent;
-import static org.apache.isis.commons.internal.assertions._Ensure.ensureThatArg;
-
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.metamodel.facetapi.Facet;
+import static org.apache.isis.commons.internal.assertions._Ensure.ensureThatArg;
+
public class Veto extends ConsentAbstract {
private static final long serialVersionUID = 1L;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetAbstract.java
index 24cfd90..2b3b247 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetAbstract.java
@@ -19,8 +19,6 @@
package org.apache.isis.metamodel.facetapi;
-import static org.apache.isis.commons.internal.base._With.requires;
-
import java.util.Map;
import java.util.Objects;
import java.util.stream.Stream;
@@ -28,6 +26,8 @@ import java.util.stream.Stream;
import org.apache.isis.commons.internal.assertions._Ensure;
import org.apache.isis.metamodel.MetaModelContext;
+import static org.apache.isis.commons.internal.base._With.requires;
+
public abstract class FacetAbstract implements Facet, MetaModelContext.Delegating {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetHolder.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetHolder.java
index 46cf618..02a5f5b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetHolder.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetHolder.java
@@ -21,7 +21,6 @@ package org.apache.isis.metamodel.facetapi;
import java.util.stream.Stream;
-import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.base._NullSafe;
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetHolderImpl.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetHolderImpl.java
index 0087c07..a0f1577 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetHolderImpl.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetHolderImpl.java
@@ -19,8 +19,6 @@
package org.apache.isis.metamodel.facetapi;
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
-
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -30,6 +28,8 @@ import java.util.stream.Stream;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.base._NullSafe;
+import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+
/**
* For base subclasses or, more likely, to help write tests.
*/
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/Annotations.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/Annotations.java
index 853c82c..6cf7966 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/Annotations.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/Annotations.java
@@ -19,8 +19,6 @@
package org.apache.isis.metamodel.facets;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-
import java.beans.IntrospectionException;
import java.lang.annotation.Annotation;
import java.lang.invoke.MethodHandle;
@@ -52,6 +50,8 @@ import org.apache.isis.metamodel.commons.ThrowableExtensions;
import org.apache.isis.metamodel.exceptions.MetaModelException;
import org.apache.isis.metamodel.methodutils.MethodScope;
+import static org.apache.isis.commons.internal.base._NullSafe.stream;
+
public final class Annotations {
private Annotations() {}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/DomainEventHelper.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/DomainEventHelper.java
index 5a5ea5c..392c785 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/DomainEventHelper.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/DomainEventHelper.java
@@ -19,8 +19,6 @@
package org.apache.isis.metamodel.facets;
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
-
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.util.Arrays;
@@ -43,6 +41,8 @@ import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.spec.feature.ObjectAction;
import org.apache.isis.metamodel.spec.feature.ObjectActionParameter;
+import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/ImperativeFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/ImperativeFacet.java
index 659c9aa..4361f99 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/ImperativeFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/ImperativeFacet.java
@@ -28,7 +28,6 @@ import java.util.stream.Stream;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.metamodel.commons.ObjectExtensions;
import org.apache.isis.metamodel.facetapi.DecoratingFacet;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.spec.ObjectSpecification;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
index fc0bca7..edf5e93 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
@@ -19,9 +19,6 @@
package org.apache.isis.metamodel.facets.actions.action.invocation;
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.sql.Timestamp;
@@ -73,6 +70,9 @@ import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.spec.feature.ObjectAction;
import org.apache.isis.schema.ixn.v1.ActionInvocationDto;
+import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+import static org.apache.isis.commons.internal.base._NullSafe.stream;
+
public abstract class ActionInvocationFacetForDomainEventAbstract
extends ActionInvocationFacetAbstract
implements ImperativeFacet {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotationFactory.java
index 5cbd74a..9d635a2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotationFactory.java
@@ -19,8 +19,6 @@
package org.apache.isis.metamodel.facets.actions.homepage.annotation;
-import static org.apache.isis.commons.internal.functions._Predicates.not;
-
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -39,8 +37,10 @@ import org.apache.isis.metamodel.spec.feature.Contributed;
import org.apache.isis.metamodel.spec.feature.ObjectAction;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorVisiting;
-import org.apache.isis.metamodel.specloader.validator.ValidationFailures;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorVisiting.Visitor;
+import org.apache.isis.metamodel.specloader.validator.ValidationFailures;
+
+import static org.apache.isis.commons.internal.functions._Predicates.not;
public class HomePageFacetAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner{
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionAddToFacetForDomainEventFromAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionAddToFacetForDomainEventFromAbstract.java
index 8e352b6..2f4a300 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionAddToFacetForDomainEventFromAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionAddToFacetForDomainEventFromAbstract.java
@@ -19,8 +19,6 @@
package org.apache.isis.metamodel.facets.collections.collection.modify;
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
-
import java.util.Map;
import java.util.Set;
@@ -36,6 +34,8 @@ import org.apache.isis.metamodel.facets.SingleValueFacetAbstract;
import org.apache.isis.metamodel.facets.collections.modify.CollectionAddToFacet;
import org.apache.isis.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet;
+import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+
public abstract class CollectionAddToFacetForDomainEventFromAbstract
extends SingleValueFacetAbstract<Class<? extends CollectionDomainEvent<?,?>>>
implements CollectionAddToFacet {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionRemoveFromFacetForDomainEventFromAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionRemoveFromFacetForDomainEventFromAbstract.java
index adbecc5..fe23993 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionRemoveFromFacetForDomainEventFromAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/collection/modify/CollectionRemoveFromFacetForDomainEventFromAbstract.java
@@ -19,8 +19,6 @@
package org.apache.isis.metamodel.facets.collections.collection.modify;
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
-
import java.util.Collection;
import java.util.Map;
@@ -37,6 +35,8 @@ import org.apache.isis.metamodel.facets.SingleValueFacetAbstract;
import org.apache.isis.metamodel.facets.collections.modify.CollectionRemoveFromFacet;
import org.apache.isis.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet;
+import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+
public abstract class CollectionRemoveFromFacetForDomainEventFromAbstract
extends SingleValueFacetAbstract<Class<? extends CollectionDomainEvent<?,?>>>
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/javautilcollection/JavaArrayFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/javautilcollection/JavaArrayFacet.java
index d91d27b..8265cd2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/javautilcollection/JavaArrayFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/javautilcollection/JavaArrayFacet.java
@@ -19,9 +19,6 @@
package org.apache.isis.metamodel.facets.collections.javautilcollection;
-import static org.apache.isis.commons.internal.base._NullSafe.isEmpty;
-import static org.apache.isis.commons.internal.collections._Arrays.toArray;
-
import java.util.function.Supplier;
import java.util.stream.Stream;
@@ -32,6 +29,9 @@ import org.apache.isis.metamodel.facets.collections.CollectionFacetAbstract;
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.spec.ObjectSpecification;
+import static org.apache.isis.commons.internal.base._NullSafe.isEmpty;
+import static org.apache.isis.commons.internal.collections._Arrays.toArray;
+
public class JavaArrayFacet extends CollectionFacetAbstract {
public JavaArrayFacet(final FacetHolder holder) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/SortedByFacetForCollectionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/SortedByFacetForCollectionLayoutAnnotation.java
index 36f9f83..8af031b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/SortedByFacetForCollectionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/SortedByFacetForCollectionLayoutAnnotation.java
@@ -19,8 +19,6 @@
package org.apache.isis.metamodel.facets.collections.layout;
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
-
import java.util.Comparator;
import java.util.List;
@@ -29,6 +27,8 @@ import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.collections.sortedby.SortedByFacet;
import org.apache.isis.metamodel.facets.collections.sortedby.SortedByFacetAbstract;
+import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+
public class SortedByFacetForCollectionLayoutAnnotation extends SortedByFacetAbstract {
public static SortedByFacet create(
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/SortedByFacetForCollectionXml.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/SortedByFacetForCollectionXml.java
index f092448..9d1078d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/SortedByFacetForCollectionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/layout/SortedByFacetForCollectionXml.java
@@ -19,8 +19,6 @@
package org.apache.isis.metamodel.facets.collections.layout;
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
-
import java.util.Comparator;
import org.apache.isis.applib.layout.component.CollectionLayoutData;
@@ -29,6 +27,8 @@ import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.collections.sortedby.SortedByFacet;
import org.apache.isis.metamodel.facets.collections.sortedby.SortedByFacetAbstract;
+import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+
public class SortedByFacetForCollectionXml extends SortedByFacetAbstract {
public static SortedByFacet create(CollectionLayoutData collectionLayout, FacetHolder holder) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/sortedby/annotation/SortedByFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/sortedby/annotation/SortedByFacetAnnotationFactory.java
index 00043e4..c1e8e05 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/sortedby/annotation/SortedByFacetAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/sortedby/annotation/SortedByFacetAnnotationFactory.java
@@ -32,8 +32,8 @@ import org.apache.isis.metamodel.spec.feature.Contributed;
import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorVisiting;
-import org.apache.isis.metamodel.specloader.validator.ValidationFailures;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorVisiting.Visitor;
+import org.apache.isis.metamodel.specloader.validator.ValidationFailures;
/**
* There is no check that the value is a {@link Comparator}; instead this is done through
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/HiddenFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/HiddenFacetAbstract.java
index 7224e9e..87c1a4b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/HiddenFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/HiddenFacetAbstract.java
@@ -19,8 +19,6 @@
package org.apache.isis.metamodel.facets.members.hidden;
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
-
import java.util.function.Predicate;
import java.util.stream.Stream;
@@ -33,6 +31,8 @@ import org.apache.isis.metamodel.facets.all.hide.HiddenFacet;
import org.apache.isis.metamodel.interactions.VisibilityContext;
import org.apache.isis.metamodel.spec.ManagedObject;
+import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+
/**
* This implements {@link org.apache.isis.metamodel.facetapi.MultiTypedFacet} so that each concrete implementation
* is added to the eventual {@link org.apache.isis.metamodel.facetapi.FacetHolder} twice: once under
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java
index 5f480ee..5f27aeb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java
@@ -19,8 +19,6 @@
package org.apache.isis.metamodel.facets.object.ignore.annotation;
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
-
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.util.List;
@@ -38,6 +36,8 @@ import org.apache.isis.metamodel.facetapi.MethodRemover;
import org.apache.isis.metamodel.facets.Annotations;
import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
+import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+
public class RemoveAnnotatedMethodsFacetFactory extends FacetFactoryAbstract {
private final List<String> eventHandlerClassNames = _Lists.of(
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParserUtil.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParserUtil.java
index 6d8f7ba..dd8d8e6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParserUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/parseable/ParserUtil.java
@@ -19,14 +19,14 @@
package org.apache.isis.metamodel.facets.object.parseable;
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
-
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.metamodel.commons.ClassUtil;
import org.apache.isis.metamodel.facetapi.FacetHolder;
+import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+
public final class ParserUtil {
private ParserUtil() {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/vsp/ValueSemanticsProviderUtil.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/vsp/ValueSemanticsProviderUtil.java
index 86f49f3..c6909ce 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/vsp/ValueSemanticsProviderUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/vsp/ValueSemanticsProviderUtil.java
@@ -19,8 +19,6 @@
package org.apache.isis.metamodel.facets.object.value.vsp;
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
-
import org.apache.isis.applib.adapters.ValueSemanticsProvider;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.config.IsisConfiguration;
@@ -28,6 +26,8 @@ import org.apache.isis.config.internal._Config;
import org.apache.isis.metamodel.commons.ClassUtil;
import org.apache.isis.metamodel.facetapi.FacetHolder;
+import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+
public final class ValueSemanticsProviderUtil {
private ValueSemanticsProviderUtil() {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java
index 1aaf330..6e7e98e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java
@@ -19,8 +19,6 @@
package org.apache.isis.metamodel.facets.properties.property.modify;
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
-
import java.sql.Timestamp;
import java.util.Map;
import java.util.Objects;
@@ -50,6 +48,8 @@ import org.apache.isis.metamodel.services.publishing.PublishingServiceInternal;
import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.schema.ixn.v1.PropertyEditDto;
+import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+
public abstract class PropertySetterOrClearFacetForDomainEventAbstract
extends SingleValueFacetAbstract<Class<? extends PropertyDomainEvent<?,?>>> {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejdk8local/Jdk8LocalDateUtil.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejdk8local/Jdk8LocalDateUtil.java
index 8610283..e666564 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejdk8local/Jdk8LocalDateUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejdk8local/Jdk8LocalDateUtil.java
@@ -25,9 +25,10 @@ import java.util.List;
import java.util.Locale;
import java.util.StringTokenizer;
-import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
import org.joda.time.format.DateTimeFormat;
+import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
+
final class Jdk8LocalDateUtil {
private Jdk8LocalDateUtil(){}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejdk8local/Jdk8LocalDateValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejdk8local/Jdk8LocalDateValueSemanticsProvider.java
index 16adff3..98c4e65 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejdk8local/Jdk8LocalDateValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejdk8local/Jdk8LocalDateValueSemanticsProvider.java
@@ -19,11 +19,6 @@
package org.apache.isis.metamodel.facets.value.datejdk8local;
-import static org.apache.isis.metamodel.facets.value.datejdk8local.Jdk8LocalDateUtil.formatterOf;
-import static org.apache.isis.metamodel.facets.value.datejdk8local.Jdk8LocalDateUtil.formatterOfStyle;
-import static org.apache.isis.metamodel.facets.value.datejdk8local.Jdk8LocalDateUtil.parserOf;
-import static org.apache.isis.metamodel.facets.value.datejdk8local.Jdk8LocalDateUtil.parserOfStyle;
-
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.List;
@@ -40,6 +35,11 @@ import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract;
import org.apache.isis.metamodel.facets.value.datejodalocal.JodaLocalDateValueFacet;
+import static org.apache.isis.metamodel.facets.value.datejdk8local.Jdk8LocalDateUtil.formatterOf;
+import static org.apache.isis.metamodel.facets.value.datejdk8local.Jdk8LocalDateUtil.formatterOfStyle;
+import static org.apache.isis.metamodel.facets.value.datejdk8local.Jdk8LocalDateUtil.parserOf;
+import static org.apache.isis.metamodel.facets.value.datejdk8local.Jdk8LocalDateUtil.parserOfStyle;
+
public class Jdk8LocalDateValueSemanticsProvider extends ValueSemanticsProviderAndFacetAbstract<LocalDate> implements Jdk8LocalDateValueFacet {
public static final int MAX_LENGTH = 12;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejodalocal/JodaLocalDateValueFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejodalocal/JodaLocalDateValueFacet.java
index 681796f..2573dc7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejodalocal/JodaLocalDateValueFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejodalocal/JodaLocalDateValueFacet.java
@@ -19,9 +19,10 @@
package org.apache.isis.metamodel.facets.value.datejodalocal;
+import org.joda.time.LocalDate;
+
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facetapi.Facet;
-import org.joda.time.LocalDate;
public interface JodaLocalDateValueFacet extends Facet {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejodalocal/JodaLocalDateValueFacetUsingSemanticsProviderFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejodalocal/JodaLocalDateValueFacetUsingSemanticsProviderFactory.java
index bd76d85..fc1d75d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejodalocal/JodaLocalDateValueFacetUsingSemanticsProviderFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datejodalocal/JodaLocalDateValueFacetUsingSemanticsProviderFactory.java
@@ -19,9 +19,10 @@
package org.apache.isis.metamodel.facets.value.datejodalocal;
+import org.joda.time.LocalDate;
+
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.value.vsp.ValueFacetUsingSemanticsProviderFactory;
-import org.joda.time.LocalDate;
public class JodaLocalDateValueFacetUsingSemanticsProviderFactory extends ValueFacetUsingSemanticsProviderFactory<LocalDate> {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejdk8local/Jdk8LocalDateTimeValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejdk8local/Jdk8LocalDateTimeValueSemanticsProvider.java
index bfa4051..761a14f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejdk8local/Jdk8LocalDateTimeValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejdk8local/Jdk8LocalDateTimeValueSemanticsProvider.java
@@ -19,9 +19,6 @@
package org.apache.isis.metamodel.facets.value.datetimejdk8local;
-import static org.apache.isis.metamodel.facets.value.datetimejdk8local.Jdk8LocalDateTimeUtil.formatterOf;
-import static org.apache.isis.metamodel.facets.value.datetimejdk8local.Jdk8LocalDateTimeUtil.parserOf;
-
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
@@ -40,6 +37,9 @@ import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract;
+import static org.apache.isis.metamodel.facets.value.datetimejdk8local.Jdk8LocalDateTimeUtil.formatterOf;
+import static org.apache.isis.metamodel.facets.value.datetimejdk8local.Jdk8LocalDateTimeUtil.parserOf;
+
public class Jdk8LocalDateTimeValueSemanticsProvider extends ValueSemanticsProviderAndFacetAbstract<LocalDateTime> implements Jdk8LocalDateTimeValueFacet {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejoda/JodaDateTimeValueFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejoda/JodaDateTimeValueFacet.java
index eba85df..b447773 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejoda/JodaDateTimeValueFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejoda/JodaDateTimeValueFacet.java
@@ -19,9 +19,10 @@
package org.apache.isis.metamodel.facets.value.datetimejoda;
+import org.joda.time.DateTime;
+
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facetapi.Facet;
-import org.joda.time.DateTime;
public interface JodaDateTimeValueFacet extends Facet {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejoda/JodaDateTimeValueFacetUsingSemanticsProviderFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejoda/JodaDateTimeValueFacetUsingSemanticsProviderFactory.java
index 8632f9f..027b3a4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejoda/JodaDateTimeValueFacetUsingSemanticsProviderFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejoda/JodaDateTimeValueFacetUsingSemanticsProviderFactory.java
@@ -19,9 +19,10 @@
package org.apache.isis.metamodel.facets.value.datetimejoda;
+import org.joda.time.DateTime;
+
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.value.vsp.ValueFacetUsingSemanticsProviderFactory;
-import org.joda.time.DateTime;
public class JodaDateTimeValueFacetUsingSemanticsProviderFactory extends ValueFacetUsingSemanticsProviderFactory<DateTime> {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueFacet.java
index 0b60088..3e8db54 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueFacet.java
@@ -19,9 +19,10 @@
package org.apache.isis.metamodel.facets.value.datetimejodalocal;
+import org.joda.time.LocalDateTime;
+
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facetapi.Facet;
-import org.joda.time.LocalDateTime;
public interface JodaLocalDateTimeValueFacet extends Facet {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueFacetUsingSemanticsProviderFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueFacetUsingSemanticsProviderFactory.java
index 8230d87..386f2dc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueFacetUsingSemanticsProviderFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueFacetUsingSemanticsProviderFactory.java
@@ -19,9 +19,10 @@
package org.apache.isis.metamodel.facets.value.datetimejodalocal;
+import org.joda.time.LocalDateTime;
+
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.value.vsp.ValueFacetUsingSemanticsProviderFactory;
-import org.joda.time.LocalDateTime;
public class JodaLocalDateTimeValueFacetUsingSemanticsProviderFactory extends ValueFacetUsingSemanticsProviderFactory<LocalDateTime> {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/timejodalocal/JodaLocalTimeValueFacetSimpleFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/timejodalocal/JodaLocalTimeValueFacetSimpleFactory.java
index 0edaab9..d8135ae 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/timejodalocal/JodaLocalTimeValueFacetSimpleFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/timejodalocal/JodaLocalTimeValueFacetSimpleFactory.java
@@ -19,12 +19,13 @@
package org.apache.isis.metamodel.facets.value.timejodalocal;
+import org.joda.time.LocalDate;
+import org.joda.time.LocalTime;
+
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetUtil;
import org.apache.isis.metamodel.facets.object.value.ValueFacetSimple;
import org.apache.isis.metamodel.facets.object.value.vsp.ValueFacetUsingSemanticsProviderFactory;
-import org.joda.time.LocalDate;
-import org.joda.time.LocalTime;
public class JodaLocalTimeValueFacetSimpleFactory extends ValueFacetUsingSemanticsProviderFactory<LocalDate> {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ActionArgUsabilityContext.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ActionArgUsabilityContext.java
index 7a73164..bb83c32 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ActionArgUsabilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ActionArgUsabilityContext.java
@@ -19,9 +19,6 @@
package org.apache.isis.metamodel.interactions;
-import static org.apache.isis.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
-import static org.apache.isis.metamodel.adapter.ObjectAdapter.Util.unwrapPojoArray;
-
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.events.ActionArgumentUsabilityEvent;
@@ -31,6 +28,9 @@ import org.apache.isis.metamodel.consent.InteractionContextType;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.spec.feature.ObjectAction;
+import static org.apache.isis.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
+import static org.apache.isis.metamodel.adapter.ObjectAdapter.Util.unwrapPojoArray;
+
/**
* See {@link InteractionContext} for overview; analogous to
* {@link ActionArgumentEvent}.
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ActionArgValidityContext.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ActionArgValidityContext.java
index 7feb2e4..c65ef20 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ActionArgValidityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ActionArgValidityContext.java
@@ -19,8 +19,6 @@
package org.apache.isis.metamodel.interactions;
-import static org.apache.isis.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
-
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.services.wrapper.events.ActionArgumentEvent;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
@@ -28,6 +26,8 @@ import org.apache.isis.metamodel.consent.InteractionContextType;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.spec.feature.ObjectAction;
+import static org.apache.isis.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
+
/**
* See {@link InteractionContext} for overview; analogous to
* {@link ActionArgumentEvent}.
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ActionArgVisibilityContext.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ActionArgVisibilityContext.java
index 862451e..3dfa2b8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ActionArgVisibilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ActionArgVisibilityContext.java
@@ -19,9 +19,6 @@
package org.apache.isis.metamodel.interactions;
-import static org.apache.isis.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
-import static org.apache.isis.metamodel.adapter.ObjectAdapter.Util.unwrapPojoArray;
-
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.events.ActionArgumentVisibilityEvent;
@@ -31,6 +28,9 @@ import org.apache.isis.metamodel.consent.InteractionContextType;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.spec.feature.ObjectAction;
+import static org.apache.isis.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
+import static org.apache.isis.metamodel.adapter.ObjectAdapter.Util.unwrapPojoArray;
+
/**
* See {@link InteractionContext} for overview; analogous to
* {@link ActionArgumentEvent}.
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ActionUsabilityContext.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ActionUsabilityContext.java
index 3290274..c45fef7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ActionUsabilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ActionUsabilityContext.java
@@ -19,8 +19,6 @@
package org.apache.isis.metamodel.interactions;
-import static org.apache.isis.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
-
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.wrapper.events.ActionUsabilityEvent;
@@ -29,6 +27,8 @@ import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.spec.feature.ObjectAction;
+import static org.apache.isis.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
+
/**
* See {@link InteractionContext} for overview; analogous to
* {@link ActionUsabilityEvent}.
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ActionValidityContext.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ActionValidityContext.java
index 2162b36..68741a3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ActionValidityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ActionValidityContext.java
@@ -19,8 +19,6 @@
package org.apache.isis.metamodel.interactions;
-import static org.apache.isis.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
-
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.services.wrapper.events.ActionInvocationEvent;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
@@ -28,6 +26,8 @@ import org.apache.isis.metamodel.consent.InteractionContextType;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.spec.feature.ObjectAction;
+import static org.apache.isis.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
+
/**
* See {@link InteractionContext} for overview; analogous to
* {@link ActionInvocationEvent}.
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ActionVisibilityContext.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ActionVisibilityContext.java
index 62b25eb..2a74a2a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ActionVisibilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ActionVisibilityContext.java
@@ -19,8 +19,6 @@
package org.apache.isis.metamodel.interactions;
-import static org.apache.isis.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
-
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.wrapper.events.ActionVisibilityEvent;
@@ -29,6 +27,8 @@ import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.spec.feature.ObjectAction;
+import static org.apache.isis.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
+
/**
* See {@link InteractionContext} for overview; analogous to
* {@link ActionVisibilityEvent}.
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/CollectionAccessContext.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/CollectionAccessContext.java
index bf34237..d2e3af5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/CollectionAccessContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/CollectionAccessContext.java
@@ -19,14 +19,14 @@
package org.apache.isis.metamodel.interactions;
-import static org.apache.isis.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
-
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.services.wrapper.events.CollectionAccessEvent;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.consent.InteractionContextType;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
+import static org.apache.isis.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
+
/**
* See {@link InteractionContext} for overview; analogous to
* {@link CollectionAccessEvent}.
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/CollectionRemoveFromContext.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/CollectionRemoveFromContext.java
index 81f1151..3ba78f8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/CollectionRemoveFromContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/CollectionRemoveFromContext.java
@@ -19,14 +19,14 @@
package org.apache.isis.metamodel.interactions;
-import static org.apache.isis.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
-
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.services.wrapper.events.CollectionRemoveFromEvent;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.consent.InteractionContextType;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
+import static org.apache.isis.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
+
/**
* See {@link InteractionContext} for overview; analogous to
* {@link CollectionRemoveFromEvent}.
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/CollectionVisibilityContext.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/CollectionVisibilityContext.java
index c501ddf..7036e42 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/CollectionVisibilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/CollectionVisibilityContext.java
@@ -19,8 +19,6 @@
package org.apache.isis.metamodel.interactions;
-import static org.apache.isis.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
-
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.wrapper.events.CollectionVisibilityEvent;
@@ -28,6 +26,8 @@ import org.apache.isis.metamodel.consent.InteractionContextType;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.spec.ManagedObject;
+import static org.apache.isis.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
+
/**
* See {@link InteractionContext} for overview; analogous to
* {@link CollectionVisibilityEvent}.
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ObjectTitleContext.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ObjectTitleContext.java
index 1352a4b..09b6ce8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ObjectTitleContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ObjectTitleContext.java
@@ -19,14 +19,14 @@
package org.apache.isis.metamodel.interactions;
-import static org.apache.isis.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
-
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.services.wrapper.events.ObjectTitleEvent;
import org.apache.isis.metamodel.consent.InteractionContextType;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.spec.ManagedObject;
+import static org.apache.isis.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
+
/**
* See {@link InteractionContext} for overview; analogous to
* {@link ObjectTitleEvent}.
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ObjectValidityContext.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ObjectValidityContext.java
index 13c672f..c413e7c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ObjectValidityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ObjectValidityContext.java
@@ -19,14 +19,14 @@
package org.apache.isis.metamodel.interactions;
-import static org.apache.isis.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
-
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.services.wrapper.events.ObjectValidityEvent;
import org.apache.isis.metamodel.consent.InteractionContextType;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.spec.ManagedObject;
+import static org.apache.isis.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
+
/**
* See {@link InteractionContext} for overview; analogous to
* {@link ObjectValidityEvent}.
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ObjectVisibilityContext.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ObjectVisibilityContext.java
index f68b939..84bd65c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ObjectVisibilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ObjectVisibilityContext.java
@@ -19,8 +19,6 @@
package org.apache.isis.metamodel.interactions;
-import static org.apache.isis.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
-
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.wrapper.events.ObjectVisibilityEvent;
@@ -29,6 +27,8 @@ import org.apache.isis.metamodel.consent.InteractionContextType;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.spec.ManagedObject;
+import static org.apache.isis.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
+
/**
* See {@link org.apache.isis.metamodel.interactions.InteractionContext} for overview; analogous to
* {@link ObjectVisibilityEvent}.
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ParseValueContext.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ParseValueContext.java
index d0f7616..7848b36 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ParseValueContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ParseValueContext.java
@@ -19,14 +19,14 @@
package org.apache.isis.metamodel.interactions;
-import static org.apache.isis.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
-
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.services.wrapper.events.ParseValueEvent;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.consent.InteractionContextType;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
+import static org.apache.isis.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
+
/**
* See {@link InteractionContext} for overview; analogous to
* {@link ParseValueEvent}.
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/PropertyAccessContext.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/PropertyAccessContext.java
index 53d0f16..fd15603 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/PropertyAccessContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/PropertyAccessContext.java
@@ -19,14 +19,14 @@
package org.apache.isis.metamodel.interactions;
-import static org.apache.isis.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
-
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.services.wrapper.events.PropertyAccessEvent;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.consent.InteractionContextType;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
+import static org.apache.isis.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
+
/**
* See {@link InteractionContext} for overview; analogous to
* {@link PropertyAccessEvent}.
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/PropertyModifyContext.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/PropertyModifyContext.java
index 737a029..0e4d179 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/PropertyModifyContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/PropertyModifyContext.java
@@ -19,14 +19,14 @@
package org.apache.isis.metamodel.interactions;
-import static org.apache.isis.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
-
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.services.wrapper.events.PropertyModifyEvent;
import org.apache.isis.metamodel.consent.InteractionContextType;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.spec.ManagedObject;
+import static org.apache.isis.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
+
/**
* See {@link InteractionContext} for overview; analogous to
* {@link PropertyModifyEvent}.
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/PropertyUsabilityContext.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/PropertyUsabilityContext.java
index 9366369..5b3348b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/PropertyUsabilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/PropertyUsabilityContext.java
@@ -19,8 +19,6 @@
package org.apache.isis.metamodel.interactions;
-import static org.apache.isis.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
-
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.wrapper.events.PropertyUsabilityEvent;
@@ -28,6 +26,8 @@ import org.apache.isis.metamodel.consent.InteractionContextType;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.spec.ManagedObject;
+import static org.apache.isis.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
+
/**
* See {@link InteractionContext} for overview; analogous to
* {@link PropertyUsabilityEvent}.
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/PropertyVisibilityContext.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/PropertyVisibilityContext.java
index 31ff267..18c812f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/PropertyVisibilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/PropertyVisibilityContext.java
@@ -19,8 +19,6 @@
package org.apache.isis.metamodel.interactions;
-import static org.apache.isis.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
-
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.wrapper.events.PropertyVisibilityEvent;
@@ -28,6 +26,8 @@ import org.apache.isis.metamodel.consent.InteractionContextType;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.spec.ManagedObject;
+import static org.apache.isis.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
+
/**
* See {@link InteractionContext} for overview; analogous to
* {@link PropertyVisibilityEvent}.
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 90b084d..b7a2aa1 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
@@ -18,10 +18,6 @@
*/
package org.apache.isis.metamodel.services.appfeat;
-import static java.util.Comparator.comparing;
-import static java.util.Comparator.naturalOrder;
-import static java.util.Comparator.nullsFirst;
-
import java.io.Serializable;
import java.nio.charset.StandardCharsets;
import java.util.Collections;
@@ -44,6 +40,10 @@ 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/services/appfeat/ApplicationFeatureRepositoryDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
index 974d053..6f3a858 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
@@ -18,9 +18,6 @@
*/
package org.apache.isis.metamodel.services.appfeat;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-import static org.apache.isis.config.internal._Config.getConfiguration;
-
import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -59,6 +56,9 @@ import org.apache.isis.metamodel.spec.feature.ObjectMember;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.metamodel.specloader.specimpl.ContributeeMember;
+import static org.apache.isis.commons.internal.base._NullSafe.stream;
+import static org.apache.isis.config.internal._Config.getConfiguration;
+
import lombok.val;
@Singleton
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridReaderUsingJaxb.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridReaderUsingJaxb.java
index 73b2e00..eb1686e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridReaderUsingJaxb.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridReaderUsingJaxb.java
@@ -25,12 +25,13 @@ import javax.inject.Inject;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
+import org.springframework.stereotype.Service;
+
import org.apache.isis.applib.layout.grid.Grid;
import org.apache.isis.applib.services.grid.GridSystemService;
import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.collections._Arrays;
-import org.springframework.stereotype.Service;
/**
*
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
index e3e089e..115faa1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
@@ -18,8 +18,6 @@
*/
package org.apache.isis.metamodel.services.grid.bootstrap3;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-
import java.util.Arrays;
import java.util.LinkedHashMap;
import java.util.List;
@@ -65,6 +63,8 @@ import org.apache.isis.metamodel.spec.feature.ObjectMember;
import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
+import static org.apache.isis.commons.internal.base._NullSafe.stream;
+
import lombok.val;
@Singleton
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/repository/RepositoryServiceJdo.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/repository/RepositoryServiceJdo.java
index 741c13d..6382bbe 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/repository/RepositoryServiceJdo.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/repository/RepositoryServiceJdo.java
@@ -19,8 +19,6 @@
package org.apache.isis.metamodel.services.repository;
-import static org.apache.isis.config.internal._Config.getConfiguration;
-
import java.util.ArrayList;
import java.util.List;
import java.util.function.Predicate;
@@ -43,6 +41,8 @@ import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.adapter.ObjectAdapterProvider;
import org.apache.isis.metamodel.services.persistsession.PersistenceSessionServiceInternal;
+import static org.apache.isis.config.internal._Config.getConfiguration;
+
@Singleton
public class RepositoryServiceJdo implements RepositoryService {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/SwaggerServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/SwaggerServiceDefault.java
index f7884d1..e7fe440 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/SwaggerServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/SwaggerServiceDefault.java
@@ -18,11 +18,6 @@
*/
package org.apache.isis.metamodel.services.swagger;
-import static org.apache.isis.commons.internal.base._Strings.prefix;
-import static org.apache.isis.commons.internal.base._With.ifPresentElse;
-import static org.apache.isis.commons.internal.resources._Resources.getRestfulPathIfAny;
-import static org.apache.isis.commons.internal.resources._Resources.prependContextPathIfPresent;
-
import javax.inject.Inject;
import javax.inject.Singleton;
@@ -31,6 +26,11 @@ import org.apache.isis.commons.internal.base._Lazy;
import org.apache.isis.metamodel.services.swagger.internal.SwaggerSpecGenerator;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
+import static org.apache.isis.commons.internal.base._Strings.prefix;
+import static org.apache.isis.commons.internal.base._With.ifPresentElse;
+import static org.apache.isis.commons.internal.resources._Resources.getRestfulPathIfAny;
+import static org.apache.isis.commons.internal.resources._Resources.prependContextPathIfPresent;
+
@Singleton
public class SwaggerServiceDefault implements SwaggerService {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ObjectSpecId.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ObjectSpecId.java
index 51e2b20..afbebe8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ObjectSpecId.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ObjectSpecId.java
@@ -18,12 +18,12 @@
*/
package org.apache.isis.metamodel.spec;
-import static org.apache.isis.commons.internal.base._With.requiresNotEmpty;
-
import java.io.Serializable;
import org.apache.isis.metamodel.facets.object.objectspecid.ObjectSpecIdFacet;
+import static org.apache.isis.commons.internal.base._With.requiresNotEmpty;
+
import lombok.AccessLevel;
import lombok.EqualsAndHashCode;
import lombok.Getter;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ObjectSpecification.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ObjectSpecification.java
index 4666eec..823c99d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ObjectSpecification.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ObjectSpecification.java
@@ -19,8 +19,6 @@
package org.apache.isis.metamodel.spec;
-import static org.apache.isis.commons.internal.functions._Predicates.instanceOf;
-
import java.lang.reflect.Array;
import java.lang.reflect.Modifier;
import java.util.Comparator;
@@ -60,6 +58,8 @@ import org.apache.isis.metamodel.specloader.classsubstitutor.ClassSubstitutor;
import org.apache.isis.metamodel.specloader.specimpl.MixedInMember;
import org.apache.isis.security.authentication.AuthenticationSession;
+import static org.apache.isis.commons.internal.functions._Predicates.instanceOf;
+
/**
* Represents an entity or value (cf {@link java.lang.Class}) within the
* metamodel.
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectAction.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectAction.java
index 519c8ec..509aaef 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectAction.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectAction.java
@@ -17,8 +17,6 @@
package org.apache.isis.metamodel.spec.feature;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
@@ -58,6 +56,8 @@ import org.apache.isis.metamodel.spec.ActionType;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.specloader.specimpl.MixedInMember;
+import static org.apache.isis.commons.internal.base._NullSafe.stream;
+
public interface ObjectAction extends ObjectMember {
// -- getSemantics, getOnType
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectActionContainer.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectActionContainer.java
index d235094..b7bfad3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectActionContainer.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectActionContainer.java
@@ -19,8 +19,6 @@
package org.apache.isis.metamodel.spec.feature;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-
import java.util.Collection;
import java.util.List;
import java.util.stream.Stream;
@@ -29,6 +27,8 @@ import org.apache.isis.applib.Identifier;
import org.apache.isis.metamodel.spec.ActionType;
import org.apache.isis.metamodel.spec.ObjectSpecification;
+import static org.apache.isis.commons.internal.base._NullSafe.stream;
+
public interface ObjectActionContainer {
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ProgrammingModelServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ProgrammingModelServiceDefault.java
index dbcad6b..27ccc64 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ProgrammingModelServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ProgrammingModelServiceDefault.java
@@ -24,8 +24,8 @@ import javax.inject.Singleton;
import org.apache.isis.commons.internal.base._Lazy;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.metamodel.progmodel.ProgrammingModel;
-import org.apache.isis.metamodel.progmodel.ProgrammingModelService;
import org.apache.isis.metamodel.progmodel.ProgrammingModelAbstract.DeprecatedPolicy;
+import org.apache.isis.metamodel.progmodel.ProgrammingModelService;
import org.apache.isis.metamodel.progmodels.dflt.ProgrammingModelFacetsJava8;
@Singleton
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
index 7906916..f2ef9de 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
@@ -18,8 +18,6 @@
*/
package org.apache.isis.metamodel.specloader;
-import static org.apache.isis.commons.internal.base._With.requires;
-
import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;
@@ -56,6 +54,8 @@ import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorService;
import org.apache.isis.metamodel.specloader.validator.ValidationFailures;
import org.apache.isis.schema.utils.CommonDtoUtils;
+import static org.apache.isis.commons.internal.base._With.requires;
+
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/facetprocessor/FacetProcessor.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/facetprocessor/FacetProcessor.java
index 9953a1c..b6ff32a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/facetprocessor/FacetProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/facetprocessor/FacetProcessor.java
@@ -34,17 +34,17 @@ import org.apache.isis.metamodel.facetapi.FeatureType;
import org.apache.isis.metamodel.facetapi.MethodRemover;
import org.apache.isis.metamodel.facets.ContributeeMemberFacetFactory;
import org.apache.isis.metamodel.facets.FacetFactory;
+import org.apache.isis.metamodel.facets.FacetFactory.ProcessClassContext;
+import org.apache.isis.metamodel.facets.FacetFactory.ProcessMethodContext;
+import org.apache.isis.metamodel.facets.FacetFactory.ProcessParameterContext;
import org.apache.isis.metamodel.facets.FacetedMethod;
import org.apache.isis.metamodel.facets.FacetedMethodParameter;
import org.apache.isis.metamodel.facets.MethodFilteringFacetFactory;
import org.apache.isis.metamodel.facets.MethodPrefixBasedFacetFactory;
import org.apache.isis.metamodel.facets.MethodRemoverConstants;
import org.apache.isis.metamodel.facets.ObjectSpecIdFacetFactory;
-import org.apache.isis.metamodel.facets.PropertyOrCollectionIdentifyingFacetFactory;
-import org.apache.isis.metamodel.facets.FacetFactory.ProcessClassContext;
-import org.apache.isis.metamodel.facets.FacetFactory.ProcessMethodContext;
-import org.apache.isis.metamodel.facets.FacetFactory.ProcessParameterContext;
import org.apache.isis.metamodel.facets.ObjectSpecIdFacetFactory.ProcessObjectSpecIdContext;
+import org.apache.isis.metamodel.facets.PropertyOrCollectionIdentifyingFacetFactory;
import org.apache.isis.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.metamodel.spec.feature.ObjectMember;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/FacetedMethodsBuilder.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
index 8f93fe6..390ad68 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
@@ -40,9 +40,9 @@ import org.apache.isis.metamodel.facetapi.FeatureType;
import org.apache.isis.metamodel.facetapi.MethodRemover;
import org.apache.isis.metamodel.facets.Annotations;
import org.apache.isis.metamodel.facets.FacetFactory;
+import org.apache.isis.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.isis.metamodel.facets.FacetedMethod;
import org.apache.isis.metamodel.facets.FacetedMethodParameter;
-import org.apache.isis.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.metamodel.facets.object.facets.FacetsFacet;
import org.apache.isis.metamodel.methodutils.MethodScope;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index 82bdb69..e30764e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -19,8 +19,6 @@
package org.apache.isis.metamodel.specloader.specimpl;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -96,6 +94,8 @@ import org.apache.isis.metamodel.specloader.facetprocessor.FacetProcessor;
import org.apache.isis.metamodel.specloader.postprocessor.PostProcessor;
import org.apache.isis.security.authentication.AuthenticationSession;
+import static org.apache.isis.commons.internal.base._NullSafe.stream;
+
import lombok.Getter;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
index 38beedb..f46744d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
@@ -19,8 +19,6 @@
package org.apache.isis.metamodel.specloader.specimpl.dflt;
-import static org.apache.isis.commons.internal.base._With.mapIfPresentElse;
-
import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.List;
@@ -69,6 +67,8 @@ import org.apache.isis.metamodel.specloader.specimpl.ObjectSpecificationAbstract
import org.apache.isis.metamodel.specloader.specimpl.OneToManyAssociationDefault;
import org.apache.isis.metamodel.specloader.specimpl.OneToOneAssociationDefault;
+import static org.apache.isis.commons.internal.base._With.mapIfPresentElse;
+
import lombok.extern.log4j.Log4j2;
@Log4j2
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/standalonelist/CollectionFacetOnStandaloneList.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/standalonelist/CollectionFacetOnStandaloneList.java
index 713e57d..5f145e2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/standalonelist/CollectionFacetOnStandaloneList.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/standalonelist/CollectionFacetOnStandaloneList.java
@@ -19,8 +19,6 @@
package org.apache.isis.metamodel.specloader.specimpl.standalonelist;
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
-
import java.util.List;
import java.util.function.Supplier;
import java.util.stream.Stream;
@@ -33,6 +31,8 @@ import org.apache.isis.metamodel.spec.FreeStandingList;
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.spec.ObjectSpecification;
+import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+
public class CollectionFacetOnStandaloneList extends CollectionFacetAbstract {
public CollectionFacetOnStandaloneList(final FacetHolder holder) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java
index 0cb269e..d35a971 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java
@@ -19,8 +19,6 @@
package org.apache.isis.metamodel.specloader.specimpl.standalonelist;
-import static org.apache.isis.commons.internal.base._With.mapIfPresentElse;
-
import java.util.List;
import org.apache.isis.commons.internal.base._Lazy;
@@ -41,6 +39,8 @@ import org.apache.isis.metamodel.specloader.facetprocessor.FacetProcessor;
import org.apache.isis.metamodel.specloader.postprocessor.PostProcessor;
import org.apache.isis.metamodel.specloader.specimpl.ObjectSpecificationAbstract;
+import static org.apache.isis.commons.internal.base._With.mapIfPresentElse;
+
/**
* A custom {@link ObjectSpecification} that is designed to treat the
* {@link FreeStandingList} class as a "standalone" collection.
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorToCheckObjectSpecIdsUnique.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorToCheckObjectSpecIdsUnique.java
index 1934deb..e7ab6d1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorToCheckObjectSpecIdsUnique.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorToCheckObjectSpecIdsUnique.java
@@ -18,8 +18,6 @@
*/
package org.apache.isis.metamodel.specloader.validator;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -29,6 +27,8 @@ import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.metamodel.spec.ObjectSpecId;
import org.apache.isis.metamodel.spec.ObjectSpecification;
+import static org.apache.isis.commons.internal.base._NullSafe.stream;
+
public class MetaModelValidatorToCheckObjectSpecIdsUnique extends MetaModelValidatorComposite {
public static final String ISIS_REFLECTOR_ENSURE_UNIQUE_OBJECT_IDS_KEY = "isis.reflector.validator.ensureUniqueObjectTypes";
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/util/snapshot/IsisSchema.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/util/snapshot/IsisSchema.java
index 13c40b3..1572d4e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/util/snapshot/IsisSchema.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/util/snapshot/IsisSchema.java
@@ -19,11 +19,12 @@
package org.apache.isis.metamodel.util.snapshot;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
+
/**
* Utility methods relating to the Isis meta model.
*/
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/util/snapshot/Place.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/util/snapshot/Place.java
index 52563d0..c7eb0f2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/util/snapshot/Place.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/util/snapshot/Place.java
@@ -19,9 +19,10 @@
package org.apache.isis.metamodel.util.snapshot;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.w3c.dom.Element;
+import org.apache.isis.metamodel.adapter.ObjectAdapter;
+
/**
* Represents a place in the graph to be navigated; really just wraps an object
* and an XML Element in its XML document. Also provides the capability to
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/util/snapshot/XmlSnapshot.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/util/snapshot/XmlSnapshot.java
index 17977d4..7d23ab9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/util/snapshot/XmlSnapshot.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/util/snapshot/XmlSnapshot.java
@@ -40,6 +40,11 @@ import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
import org.apache.isis.applib.ViewModel;
import org.apache.isis.applib.services.xmlsnapshot.XmlSnapshotService.Snapshot;
import org.apache.isis.applib.snapshot.SnapshottableWithInclusions;
@@ -58,10 +63,6 @@ import org.apache.isis.metamodel.spec.feature.Contributed;
import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
import lombok.val;
import lombok.extern.log4j.Log4j2;
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 4c70cb1..80d3c3a 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
@@ -24,7 +24,6 @@ import org.junit.jupiter.api.Test;
import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.internal._Config;
-import org.apache.isis.metamodel.MetaModelContext;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/oid/CollectionOidTest_valueSemantics.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/oid/CollectionOidTest_valueSemantics.java
index 4a36f86..1d29ff1 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/oid/CollectionOidTest_valueSemantics.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/oid/CollectionOidTest_valueSemantics.java
@@ -21,9 +21,6 @@ package org.apache.isis.metamodel.adapter.oid;
import java.util.Arrays;
import java.util.List;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.adapter.oid.ParentedOid;
-import org.apache.isis.metamodel.adapter.oid.RootOid;
import org.apache.isis.metamodel.spec.ObjectSpecId;
import org.apache.isis.unittestsupport.value.ValueTypeContractTestAbstract;
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 15fd5e2..65206fe 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,14 +21,12 @@ package org.apache.isis.metamodel.adapter.oid;
import org.junit.Before;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
-
-import org.apache.isis.metamodel.adapter.oid.Oid_Marshaller;
-import org.apache.isis.metamodel.adapter.oid.RootOid;
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;
+
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 7c89271..3234660 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
@@ -19,15 +19,13 @@
package org.apache.isis.metamodel.adapter.oid;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import org.junit.Test;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.adapter.oid.ParentedOid;
-import org.apache.isis.metamodel.adapter.oid.RootOid;
import org.apache.isis.metamodel.adapter.oid.Oid.Factory;
import org.apache.isis.metamodel.spec.ObjectSpecId;
-import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
public class OidMarshallerTest_roundtripping {
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 f35c23b..7cb06b1 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,16 +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.adapter.oid.Oid;
-import org.apache.isis.metamodel.adapter.oid.Oid_Marshaller;
-import org.apache.isis.metamodel.adapter.oid.ParentedOid;
-import org.apache.isis.metamodel.adapter.oid.RootOid;
-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 43f191a..9e37c32 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,15 +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.RootOid;
-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/RootOidDefaultTest_valueSemantics_whenPersistent.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenPersistent.java
index e71093a..a5b6c75 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenPersistent.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenPersistent.java
@@ -21,8 +21,6 @@ package org.apache.isis.metamodel.adapter.oid;
import java.util.Arrays;
import java.util.List;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.adapter.oid.RootOid;
import org.apache.isis.metamodel.spec.ObjectSpecId;
import org.apache.isis.unittestsupport.value.ValueTypeContractTestAbstract;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenTransient.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenTransient.java
index 4dcc2ae..2962348 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenTransient.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenTransient.java
@@ -21,8 +21,6 @@ package org.apache.isis.metamodel.adapter.oid;
import java.util.Arrays;
import java.util.List;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.adapter.oid.RootOid;
import org.apache.isis.metamodel.spec.ObjectSpecId;
import org.apache.isis.unittestsupport.value.ValueTypeContractTestAbstract;
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 72d5214..e970d5d 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,14 +20,13 @@ 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.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
-import org.apache.isis.metamodel.adapter.oid.RootOid;
-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/adapter/version/VersionTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/version/VersionTest.java
index b788aa5..b362768 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/version/VersionTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/version/VersionTest.java
@@ -19,19 +19,19 @@
package org.apache.isis.metamodel.adapter.version;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+
import org.apache.isis.commons.internal.encoding.DataInputExtended;
import org.apache.isis.commons.internal.encoding.DataOutputExtended;
-import org.apache.isis.metamodel.adapter.version.Version;
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 VersionTest {
@Rule
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/version/VersionTest_differs.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/version/VersionTest_differs.java
index 094e4e4..8780d3e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/version/VersionTest_differs.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/version/VersionTest_differs.java
@@ -19,12 +19,11 @@
package org.apache.isis.metamodel.adapter.version;
+import org.junit.Test;
+
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.metamodel.adapter.version.Version;
-import org.junit.Test;
-
public class VersionTest_differs {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/IoUtils_CopyTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/IoUtils_CopyTest.java
index 8b1b6b3..df77a9f 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/IoUtils_CopyTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/IoUtils_CopyTest.java
@@ -19,12 +19,9 @@
package org.apache.isis.metamodel.commons;
-import static org.junit.Assert.assertThat;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import org.apache.isis.metamodel.commons.InputStreamExtensions;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
@@ -32,6 +29,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertThat;
+
public class IoUtils_CopyTest {
private static final class ArrayMatcher extends TypeSafeMatcher<byte[]> {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/JavaClassUtilsTest_getBuiltIn.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/JavaClassUtilsTest_getBuiltIn.java
index 86f43a0..7c48c71 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/JavaClassUtilsTest_getBuiltIn.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/JavaClassUtilsTest_getBuiltIn.java
@@ -19,11 +19,10 @@
package org.apache.isis.metamodel.commons;
-import static org.junit.Assert.assertEquals;
-
-import org.apache.isis.metamodel.commons.ClassUtil;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class JavaClassUtilsTest_getBuiltIn {
@Test
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/ListUtilsTest_adjust.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/ListUtilsTest_adjust.java
index 5ec74d6..7f027d0 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/ListUtilsTest_adjust.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/ListUtilsTest_adjust.java
@@ -18,17 +18,16 @@
*/
package org.apache.isis.metamodel.commons;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import org.apache.isis.metamodel.commons.ListExtensions;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
public class ListUtilsTest_adjust {
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 d31cc38..004e2a5 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
@@ -18,16 +18,16 @@
*/
package org.apache.isis.metamodel.commons;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
import java.util.List;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.metamodel.commons.ListExtensions;
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;
+
public class ListUtilsTest_insert {
@Test
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/ListUtilsTest_mutableCopy.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/ListUtilsTest_mutableCopy.java
index fbbefd3..1c68b17 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/ListUtilsTest_mutableCopy.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/ListUtilsTest_mutableCopy.java
@@ -18,17 +18,16 @@
*/
package org.apache.isis.metamodel.commons;
-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 java.util.Arrays;
import java.util.List;
-import org.apache.isis.metamodel.commons.ListExtensions;
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;
+
public class ListUtilsTest_mutableCopy {
@Test
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/LocaleUtilsTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/LocaleUtilsTest.java
index f1295f3..3ee22d2 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/LocaleUtilsTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/LocaleUtilsTest.java
@@ -19,14 +19,13 @@
package org.apache.isis.metamodel.commons;
+import org.junit.Test;
+
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
-import org.apache.isis.metamodel.commons.LocaleUtil;
-import org.junit.Test;
-
public class LocaleUtilsTest {
@Test
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/NameUtilTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/NameUtilTest.java
index e9e4853..7625c55 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/NameUtilTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/NameUtilTest.java
@@ -19,8 +19,6 @@
package org.apache.isis.metamodel.commons;
-import org.apache.isis.metamodel.commons.StringExtensions;
-
import junit.framework.TestCase;
public class NameUtilTest extends TestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtilsTest_enumTitle.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtilsTest_enumTitle.java
index 8fb023d..3aa76e0 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtilsTest_enumTitle.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtilsTest_enumTitle.java
@@ -19,12 +19,11 @@
package org.apache.isis.metamodel.commons;
+import org.junit.Test;
+
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.metamodel.commons.StringExtensions;
-import org.junit.Test;
-
public class StringUtilsTest_enumTitle {
@Test
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_NaturalNameTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_NaturalNameTest.java
index cf043d8..4f692a4 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_NaturalNameTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_NaturalNameTest.java
@@ -19,12 +19,11 @@
package org.apache.isis.metamodel.commons;
+import org.junit.Test;
+
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.metamodel.commons.StringExtensions;
-import org.junit.Test;
-
public class StringUtils_NaturalNameTest {
@Test
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_NaturalizeTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_NaturalizeTest.java
index 137b7cb..42bcfcc 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_NaturalizeTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_NaturalizeTest.java
@@ -19,12 +19,11 @@
package org.apache.isis.metamodel.commons;
+import org.junit.Test;
+
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.metamodel.commons.StringExtensions;
-import org.junit.Test;
-
public class StringUtils_NaturalizeTest {
@Test
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_NormalizedTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_NormalizedTest.java
index 9561ed6..ac23e55 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_NormalizedTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_NormalizedTest.java
@@ -19,18 +19,17 @@
package org.apache.isis.metamodel.commons;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.util.Arrays;
import java.util.Collection;
-import org.apache.isis.metamodel.commons.StringExtensions;
import org.junit.Test;
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;
+
@RunWith(Parameterized.class)
public class StringUtils_NormalizedTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_RemoveLeadingWhiteSpace.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_RemoveLeadingWhiteSpace.java
index bd0162e..3c8850b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_RemoveLeadingWhiteSpace.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_RemoveLeadingWhiteSpace.java
@@ -18,7 +18,6 @@
*/
package org.apache.isis.metamodel.commons;
-import org.apache.isis.metamodel.commons.StringExtensions;
import org.hamcrest.CoreMatchers;
import org.junit.Assert;
import org.junit.Test;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_SplitOnCommas.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_SplitOnCommas.java
index dc5080c..5a71af4 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_SplitOnCommas.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_SplitOnCommas.java
@@ -20,7 +20,6 @@ package org.apache.isis.metamodel.commons;
import java.util.List;
-import org.apache.isis.metamodel.commons.StringExtensions;
import org.hamcrest.CoreMatchers;
import org.junit.Assert;
import org.junit.Test;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_StripLeadingSlashTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_StripLeadingSlashTest.java
index 8469ec4..14e214c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_StripLeadingSlashTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_StripLeadingSlashTest.java
@@ -19,12 +19,11 @@
package org.apache.isis.metamodel.commons;
+import org.junit.Test;
+
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.metamodel.commons.StringExtensions;
-import org.junit.Test;
-
public class StringUtils_StripLeadingSlashTest {
@Test
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_StripNewLinesTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_StripNewLinesTest.java
index 434a819..017b16d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_StripNewLinesTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_StripNewLinesTest.java
@@ -19,12 +19,11 @@
package org.apache.isis.metamodel.commons;
+import org.junit.Test;
+
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.metamodel.commons.StringExtensions;
-import org.junit.Test;
-
public class StringUtils_StripNewLinesTest {
@Test
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_camelLowerFirst.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_camelLowerFirst.java
index 5c0c8ba..dfc6ef4 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_camelLowerFirst.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_camelLowerFirst.java
@@ -19,12 +19,11 @@
package org.apache.isis.metamodel.commons;
+import org.junit.Test;
+
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.metamodel.commons.StringExtensions;
-import org.junit.Test;
-
public class StringUtils_camelLowerFirst {
@Test
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_toLineSeparated.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_toLineSeparated.java
index 98d08ce..1aba185 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_toLineSeparated.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_toLineSeparated.java
@@ -19,14 +19,13 @@
package org.apache.isis.metamodel.commons;
+import org.junit.Test;
+
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
import static org.junit.Assume.assumeThat;
-import org.apache.isis.metamodel.commons.StringExtensions;
-import org.junit.Test;
-
public class StringUtils_toLineSeparated {
@Test
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_toLowerDashed.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_toLowerDashed.java
index 16b690a..4d104cd 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_toLowerDashed.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_toLowerDashed.java
@@ -19,12 +19,11 @@
package org.apache.isis.metamodel.commons;
+import org.junit.Test;
+
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.metamodel.commons.StringExtensions;
-import org.junit.Test;
-
public class StringUtils_toLowerDashed {
@Test
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/TypesTest_filteredList.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/TypesTest_filteredList.java
index 44e682d..8da2a93 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/TypesTest_filteredList.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/TypesTest_filteredList.java
@@ -19,18 +19,17 @@
package org.apache.isis.metamodel.commons;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import org.apache.isis.metamodel.commons.ListExtensions;
import org.junit.Before;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public class TypesTest_filteredList {
private List<Object> shapes;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/matchers/IsisMatchers_NonEmptyStringTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/matchers/IsisMatchers_NonEmptyStringTest.java
index 1a5cd70..c8e5515 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/matchers/IsisMatchers_NonEmptyStringTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/matchers/IsisMatchers_NonEmptyStringTest.java
@@ -19,13 +19,13 @@
package org.apache.isis.metamodel.commons.matchers;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import org.hamcrest.Matcher;
import org.junit.Before;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public class IsisMatchers_NonEmptyStringTest {
private Matcher<String> fooMatcher;
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 9c52dc1..2141f40 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
@@ -19,16 +19,16 @@
package org.apache.isis.metamodel.consent;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import org.apache.isis.metamodel.consent.InteractionResult;
-import org.apache.isis.metamodel.interactions.InteractionAdvisorFacet;
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;
+
public class InteractionResultTest {
private InteractionResult result;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facetapi/FacetAbstractTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facetapi/FacetAbstractTest.java
index 2a150f6..034b260 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facetapi/FacetAbstractTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facetapi/FacetAbstractTest.java
@@ -19,11 +19,6 @@
package org.apache.isis.metamodel.facetapi;
-import org.apache.isis.metamodel.facetapi.Facet;
-import org.apache.isis.metamodel.facetapi.FacetAbstract;
-import org.apache.isis.metamodel.facetapi.FacetHolder;
-import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
-
import junit.framework.TestCase;
public class FacetAbstractTest extends TestCase {
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 c4f5784..b93e7f4 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
@@ -19,16 +19,15 @@
package org.apache.isis.metamodel.facetapi;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.lang.reflect.Method;
import java.math.BigDecimal;
import org.junit.Test;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.metamodel.facetapi.FeatureType;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
public class FeatureTypeTest_identifierFor {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java
index b32bc00..b87a762 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java
@@ -39,8 +39,6 @@ import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FeatureType;
import org.apache.isis.metamodel.facetapi.IdentifiedHolder;
import org.apache.isis.metamodel.facetapi.MethodRemover;
-import org.apache.isis.metamodel.facets.FacetedMethod;
-import org.apache.isis.metamodel.facets.FacetedMethodParameter;
import org.apache.isis.metamodel.facets.object.domainobject.autocomplete.AutoCompleteFacetForDomainObjectAnnotation;
import org.apache.isis.metamodel.services.events.MetamodelEventService;
import org.apache.isis.metamodel.services.persistsession.PersistenceSessionServiceInternal;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryTest.java
index 0ca4c26..b5b496b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryTest.java
@@ -27,15 +27,12 @@ import org.junit.Rule;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.config.internal._Config;
import org.apache.isis.metamodel.MetaModelContext;
import org.apache.isis.metamodel.adapter.ObjectAdapterProvider;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.metamodel.facetapi.FeatureType;
import org.apache.isis.metamodel.facetapi.IdentifiedHolder;
-import org.apache.isis.metamodel.facets.FacetedMethod;
-import org.apache.isis.metamodel.facets.FacetedMethodParameter;
import org.apache.isis.metamodel.services.persistsession.PersistenceSessionServiceInternal;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/AnnotationsTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/AnnotationsTest.java
index 00591be..909e895 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/AnnotationsTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/AnnotationsTest.java
@@ -20,7 +20,6 @@ package org.apache.isis.metamodel.facets;
import java.util.List;
-import org.apache.isis.metamodel.facets.Annotations;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
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 9f6217a..1333304 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
@@ -25,7 +25,6 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import java.util.List;
-import org.apache.isis.metamodel.facets.Annotations;
import org.junit.Assert;
import org.junit.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 b1dc427..1174c8d 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
@@ -31,7 +31,6 @@ import org.junit.Test;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.Publishing;
-import org.apache.isis.metamodel.facets.Annotations;
import static org.hamcrest.CoreMatchers.is;
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 5883e0f..8dccbfc 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,7 +26,6 @@ import java.lang.annotation.Target;
import java.lang.reflect.Method;
import java.util.List;
-import org.apache.isis.metamodel.facets.Annotations;
import org.junit.Assert;
import org.junit.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 dcf2aa1..6356314 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,7 +26,6 @@ import java.lang.annotation.Target;
import java.lang.reflect.Method;
import java.util.List;
-import org.apache.isis.metamodel.facets.Annotations;
import org.junit.Assert;
import org.junit.Test;
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 e30316e..922282b 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
@@ -34,13 +34,13 @@ import java.util.TreeSet;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CopyOnWriteArraySet;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.metamodel.facets.CollectionUtils;
import org.junit.Before;
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;
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 210610d..fd7db40 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
@@ -22,7 +22,6 @@ import org.junit.Test;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.events.domain.ActionDomainEvent;
-import org.apache.isis.metamodel.facets.DomainEventHelper;
import static junit.framework.Assert.assertEquals;
import static org.hamcrest.CoreMatchers.is;
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 14022e2..e41776f 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
@@ -23,7 +23,6 @@ import org.junit.Test;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.events.domain.PropertyDomainEvent;
-import org.apache.isis.metamodel.facets.DomainEventHelper;
import static junit.framework.Assert.assertEquals;
import static org.hamcrest.CoreMatchers.is;
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 9a325c1..5389ca8 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
@@ -20,9 +20,9 @@ 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 org.apache.isis.metamodel.facets.DomainEventHelper;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
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 60e20bc..4c2f7c6 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
@@ -18,11 +18,6 @@
*/
package org.apache.isis.metamodel.facets;
-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 java.lang.reflect.Method;
import java.util.Map;
import java.util.Optional;
@@ -32,7 +27,11 @@ import javax.annotation.PostConstruct;
import org.junit.Test;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.metamodel.facets.MethodFinderUtils;
+
+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 MethodFinderUtilsTest {
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 50d5a7c..fac1236 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
@@ -19,17 +19,18 @@
package org.apache.isis.metamodel.facets;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
+
import org.apache.isis.metamodel.adapter.ObjectAdapter;
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/Utils.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/Utils.java
index bb1dcdf..1178d9d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/Utils.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/Utils.java
@@ -24,7 +24,6 @@ import java.util.List;
import org.apache.isis.commons.internal._Constants;
import org.apache.isis.metamodel.facetapi.FeatureType;
-import org.apache.isis.metamodel.facets.DomainEventHelper;
class Utils {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
index 7c0db6a..3bbd31e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
@@ -28,11 +28,10 @@ import java.util.Set;
import org.jmock.Expectations;
import org.apache.isis.applib.security.UserMemento;
-import org.apache.isis.metamodel.adapter.ObjectAdapterProvider;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.FacetedMethod;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessMethodContext;
+import org.apache.isis.metamodel.facets.FacetedMethod;
import org.apache.isis.metamodel.facets.actions.defaults.ActionDefaultsFacet;
import org.apache.isis.metamodel.facets.actions.defaults.method.ActionDefaultsFacetViaMethod;
import org.apache.isis.metamodel.facets.actions.defaults.method.ActionDefaultsFacetViaMethodFactory;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/IteratorFilteringFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/IteratorFilteringFacetFactoryTest.java
index d07b6c7..4a97e46 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/IteratorFilteringFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/IteratorFilteringFacetFactoryTest.java
@@ -23,6 +23,7 @@ import java.lang.reflect.Method;
import java.util.Iterator;
import org.junit.Ignore;
+
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.isis.metamodel.facets.object.ignore.javalang.IteratorFilteringFacetFactory;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
index 460127a..b68c259 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
@@ -30,7 +30,6 @@ import org.junit.Before;
import org.apache.isis.applib.services.HasUniqueId;
import org.apache.isis.config.internal._Config;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
-import org.apache.isis.metamodel.facets.actions.action.ActionAnnotationFacetFactory;
import org.apache.isis.metamodel.facets.object.domainobject.domainevents.ActionDomainEventDefaultFacetForDomainObjectAnnotation;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.security.authentication.AuthenticationSessionProvider;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_ActionInvocation.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_ActionInvocation.java
index a6ce997..8d5b967 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_ActionInvocation.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_ActionInvocation.java
@@ -24,9 +24,8 @@ import java.lang.reflect.Method;
import org.apache.isis.metamodel.MetaModelContext;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.FacetedMethod;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessMethodContext;
-import org.apache.isis.metamodel.facets.actions.action.ActionAnnotationFacetFactory;
+import org.apache.isis.metamodel.facets.FacetedMethod;
import org.apache.isis.metamodel.facets.actions.action.invocation.ActionInvocationFacet;
import org.apache.isis.metamodel.facets.actions.action.invocation.ActionInvocationFacetForDomainEventAbstract;
import org.apache.isis.metamodel.facets.members.disabled.method.DisableForContextFacet;
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 97314a4..dfae8ea 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
@@ -18,14 +18,10 @@
*/
package org.apache.isis.metamodel.facets.actions.action;
-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 java.lang.reflect.Method;
+import org.junit.Test;
+
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.CommandExecuteIn;
import org.apache.isis.applib.annotation.CommandPersistence;
@@ -39,7 +35,12 @@ import org.apache.isis.metamodel.facets.actions.action.command.CommandFacetFromC
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 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;
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 f9a52a4..2fde654 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
@@ -18,8 +18,8 @@
*/
package org.apache.isis.metamodel.facets.actions.action;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import org.junit.Assert;
+import org.junit.Test;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.Where;
@@ -27,8 +27,9 @@ import org.apache.isis.metamodel.facetapi.Facet;
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 org.junit.Assert;
-import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
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 8e40c87..fdd5af9 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
@@ -18,8 +18,8 @@
*/
package org.apache.isis.metamodel.facets.actions.action;
-import static org.apache.isis.metamodel.commons.matchers.IsisMatchers.classEqualTo;
-import static org.junit.Assert.assertThat;
+import org.junit.Assert;
+import org.junit.Test;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.events.domain.ActionDomainEvent;
@@ -33,8 +33,9 @@ import org.apache.isis.metamodel.facets.actions.action.invocation.ActionDomainEv
import org.apache.isis.metamodel.facets.actions.action.invocation.ActionInvocationFacet;
import org.apache.isis.metamodel.facets.actions.action.invocation.ActionInvocationFacetForDomainEventFromActionAnnotation;
import org.apache.isis.metamodel.facets.actions.action.invocation.ActionInvocationFacetForDomainEventFromDefault;
-import org.junit.Assert;
-import org.junit.Test;
+
+import static org.apache.isis.metamodel.commons.matchers.IsisMatchers.classEqualTo;
+import static org.junit.Assert.assertThat;
public class ActionAnnotationFacetFactoryTest_Invocation extends ActionAnnotationFacetFactoryTest {
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 268c184..cd5eaf7 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
@@ -18,12 +18,10 @@
*/
package org.apache.isis.metamodel.facets.actions.action;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
import java.lang.reflect.Method;
+import org.junit.Test;
+
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.commons.internal.base._Blackhole;
@@ -33,7 +31,10 @@ import org.apache.isis.metamodel.facets.actions.action.publishing.PublishedActio
import org.apache.isis.metamodel.facets.actions.action.publishing.PublishedActionFacetFromConfiguration;
import org.apache.isis.metamodel.facets.actions.publish.PublishedActionFacet;
import org.apache.isis.metamodel.facets.actions.semantics.ActionSemanticsFacetAbstract;
-import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
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 b9d7674..f95f1f9 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
@@ -18,13 +18,14 @@
*/
package org.apache.isis.metamodel.facets.actions.action;
-import static org.junit.Assert.assertNull;
+import org.junit.Assert;
+import org.junit.Test;
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 org.junit.Assert;
-import org.junit.Test;
+
+import static org.junit.Assert.assertNull;
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 4fe2ba9..49f6670 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
@@ -18,15 +18,16 @@
*/
package org.apache.isis.metamodel.facets.actions.action;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import org.junit.Assert;
+import org.junit.Test;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.metamodel.facets.actions.semantics.ActionSemanticsFacet;
-import org.junit.Assert;
-import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
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 14c5116..3bbd96e 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
@@ -18,19 +18,20 @@
*/
package org.apache.isis.metamodel.facets.actions.action;
-import static org.apache.isis.metamodel.commons.matchers.IsisMatchers.classEqualTo;
-import static org.junit.Assert.assertThat;
-
import java.util.Collection;
+import org.junit.Assert;
+import org.junit.Test;
+
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacetInferredFromArray;
import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacetInferredFromGenerics;
import org.apache.isis.metamodel.facets.actions.action.typeof.TypeOfFacetForActionAnnotation;
-import org.junit.Assert;
-import org.junit.Test;
+
+import static org.apache.isis.metamodel.commons.matchers.IsisMatchers.classEqualTo;
+import static org.junit.Assert.assertThat;
public class ActionAnnotationFacetFactoryTest_TypeOf extends ActionAnnotationFacetFactoryTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionSemanticsFacetFallbackToNonIdempotentFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionSemanticsFacetFallbackToNonIdempotentFactoryTest.java
index 37c1e5a..c2e2a88 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionSemanticsFacetFallbackToNonIdempotentFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionSemanticsFacetFallbackToNonIdempotentFactoryTest.java
@@ -24,7 +24,6 @@ import java.lang.reflect.Method;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessMethodContext;
-import org.apache.isis.metamodel.facets.actions.action.ActionAnnotationFacetFactory;
import org.apache.isis.metamodel.facets.actions.action.semantics.ActionSemanticsFacetFallbackToNonIdempotent;
import org.apache.isis.metamodel.facets.actions.semantics.ActionSemanticsFacet;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/PrototypeFacetAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/PrototypeFacetAnnotationFactoryTest.java
index b66c13b..7b880fd 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/PrototypeFacetAnnotationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/PrototypeFacetAnnotationFactoryTest.java
@@ -26,7 +26,6 @@ import org.apache.isis.applib.annotation.RestrictTo;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessMethodContext;
-import org.apache.isis.metamodel.facets.actions.action.ActionAnnotationFacetFactory;
import org.apache.isis.metamodel.facets.actions.prototype.PrototypeFacet;
import org.apache.isis.metamodel.facets.actions.prototype.PrototypeFacetAbstract;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/homepage/HomePageAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/homepage/HomePageAnnotationFacetFactoryTest.java
index 0a60b94..8514bf9 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/homepage/HomePageAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/homepage/HomePageAnnotationFacetFactoryTest.java
@@ -25,7 +25,6 @@ import org.apache.isis.applib.annotation.HomePage;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessMethodContext;
-import org.apache.isis.metamodel.facets.actions.homepage.HomePageFacet;
import org.apache.isis.metamodel.facets.actions.homepage.annotation.HomePageFacetAnnotation;
import org.apache.isis.metamodel.facets.actions.homepage.annotation.HomePageFacetAnnotationFactory;
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 f100179..3bb0b3d 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
@@ -33,8 +33,6 @@ import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
import org.apache.isis.metamodel.facets.FacetFactory;
import org.apache.isis.metamodel.facets.FacetedMethod;
-import org.apache.isis.metamodel.facets.actions.layout.ActionLayoutFacetFactory;
-import org.apache.isis.metamodel.facets.actions.layout.NotContributedFacetForActionLayoutAnnotation;
import org.apache.isis.metamodel.facets.actions.notcontributed.NotContributedFacet;
import org.apache.isis.metamodel.facets.object.domainservice.DomainServiceFacet;
import org.apache.isis.metamodel.facets.object.domainservice.DomainServiceFacetAbstract;
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 e89fb95..fe7c7dd 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
@@ -28,9 +28,6 @@ import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessMethodContext;
-import org.apache.isis.metamodel.facets.actions.layout.ActionLayoutFacetFactory;
-import org.apache.isis.metamodel.facets.actions.layout.ActionPositionFacetForActionLayoutAnnotation;
-import org.apache.isis.metamodel.facets.actions.layout.CssClassFaFacetForActionLayoutAnnotation;
import org.apache.isis.metamodel.facets.actions.position.ActionPositionFacet;
import org.apache.isis.metamodel.facets.actions.position.ActionPositionFacetFallback;
import org.apache.isis.metamodel.facets.members.cssclassfa.CssClassFaFacet;
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 57a3a14..31381ef 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
@@ -29,8 +29,6 @@ import org.apache.isis.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
import org.apache.isis.metamodel.facets.FacetFactory;
import org.apache.isis.metamodel.facets.FacetedMethod;
import org.apache.isis.metamodel.facets.actions.notcontributed.NotContributedFacet;
-import org.apache.isis.metamodel.facets.actions.notcontributed.derived.NotContributedFacetDerivedFromDomainServiceFacet;
-import org.apache.isis.metamodel.facets.actions.notcontributed.derived.NotContributedFacetDerivedFromDomainServiceFacetFactory;
import org.apache.isis.metamodel.facets.object.domainservice.DomainServiceFacet;
import org.apache.isis.metamodel.facets.object.domainservice.DomainServiceFacetAbstract;
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 60a072b..3d64aac 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
@@ -18,11 +18,9 @@
*/
package org.apache.isis.metamodel.facets.actions.notinservicemenu.derived;
-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.jmock.Expectations;
+import org.junit.Before;
+import org.junit.Test;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
@@ -33,9 +31,12 @@ import org.apache.isis.metamodel.facets.FacetedMethod;
import org.apache.isis.metamodel.facets.actions.notinservicemenu.NotInServiceMenuFacet;
import org.apache.isis.metamodel.facets.object.domainservice.DomainServiceFacet;
import org.apache.isis.metamodel.facets.object.domainservice.DomainServiceFacetAbstract;
-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;
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 b9dcea0..6dbbaf4 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
@@ -21,9 +21,9 @@ package org.apache.isis.metamodel.facets.actions.prototype;
import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
+
import org.apache.isis.commons.internal.plugins.environment.DeploymentType;
import org.apache.isis.metamodel.facetapi.FacetHolder;
-import org.apache.isis.metamodel.facets.actions.prototype.PrototypeFacetAbstract;
import org.apache.isis.metamodel.interactions.VisibilityContext;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
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 1af98f3..959c177 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
@@ -28,6 +28,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.adapter.ObjectAdapterProvider;
import org.apache.isis.metamodel.facetapi.FacetHolder;
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 f2971fd..dc3b6da 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
@@ -40,7 +40,6 @@ import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacetInferredFromArray;
import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacetInferredFromGenerics;
import org.apache.isis.metamodel.facets.all.hide.HiddenFacet;
-import org.apache.isis.metamodel.facets.collections.collection.CollectionAnnotationFacetFactory;
import org.apache.isis.metamodel.facets.collections.collection.disabled.DisabledFacetForCollectionAnnotation;
import org.apache.isis.metamodel.facets.collections.collection.hidden.HiddenFacetForCollectionAnnotation;
import org.apache.isis.metamodel.facets.collections.collection.modify.CollectionAddToFacetForDomainEventFromCollectionAnnotation;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest_typeOf.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest_typeOf.java
index 565c983..6a0a869 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest_typeOf.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest_typeOf.java
@@ -24,13 +24,13 @@ import java.util.Collection;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
+
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacetInferredFromArray;
import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacetInferredFromGenerics;
-import org.apache.isis.metamodel.facets.collections.collection.CollectionAnnotationFacetFactory;
import org.apache.isis.metamodel.spec.ObjectSpecification;
public class CollectionAnnotationFacetFactoryTest_typeOf extends AbstractFacetFactoryTest {
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 4e9c791..2f4d112 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
@@ -26,7 +26,6 @@ import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessMethodContext;
-import org.apache.isis.metamodel.facets.collections.collection.CollectionAnnotationFacetFactory;
import org.apache.isis.metamodel.facets.members.disabled.DisabledFacet;
import org.apache.isis.metamodel.facets.members.disabled.DisabledFacetAbstract;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/collections/collection/NotPersistedAnnotationOnCollectionFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/collections/collection/NotPersistedAnnotationOnCollectionFacetFactoryTest.java
index 82b49be..3622367 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/collections/collection/NotPersistedAnnotationOnCollectionFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/collections/collection/NotPersistedAnnotationOnCollectionFacetFactoryTest.java
@@ -26,7 +26,6 @@ import org.apache.isis.applib.annotation.MementoSerialization;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessMethodContext;
-import org.apache.isis.metamodel.facets.collections.collection.CollectionAnnotationFacetFactory;
import org.apache.isis.metamodel.facets.collections.collection.notpersisted.NotPersistedFacetForCollectionAnnotation;
import org.apache.isis.metamodel.facets.propcoll.notpersisted.NotPersistedFacet;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/members/cssclassfa/CssClassFaFacetAbstractTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/members/cssclassfa/CssClassFaFacetAbstractTest.java
index 5e54f89..c189d0f 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/members/cssclassfa/CssClassFaFacetAbstractTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/members/cssclassfa/CssClassFaFacetAbstractTest.java
@@ -23,8 +23,6 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.metamodel.facets.members.cssclassfa.CssClassFaFacetAbstract;
-
public class CssClassFaFacetAbstractTest {
public static class Sanitize extends CssClassFaFacetAbstractTest {
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 6468709..092b5a0 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
@@ -30,7 +30,6 @@ import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.config.ConfigurationConstants;
import org.apache.isis.config.internal._Config;
import org.apache.isis.metamodel.facets.FacetFactory;
-import org.apache.isis.metamodel.facets.object.ViewModelSemanticCheckingFacetFactory;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.metamodel.specloader.validator.ValidationFailures;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
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 ff56d36..51f645d 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
@@ -23,8 +23,6 @@ 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.BookmarkPolicyFacet;
-import org.apache.isis.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacetFallback;
import org.apache.isis.metamodel.facets.object.bookmarkpolicy.bookmarkable.BookmarkPolicyFacetFallbackFactory;
import static org.hamcrest.CoreMatchers.is;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java
index a95fb81..0eb2d77 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java
@@ -24,9 +24,6 @@ import org.apache.isis.applib.annotation.Defaulted;
import org.apache.isis.config.internal._Config;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessClassContext;
-import org.apache.isis.metamodel.facets.object.defaults.DefaultedFacet;
-import org.apache.isis.metamodel.facets.object.defaults.DefaultedFacetAbstract;
-import org.apache.isis.metamodel.facets.object.defaults.DefaultsProviderUtil;
import org.apache.isis.metamodel.facets.object.defaults.annotcfg.DefaultedFacetAnnotationElseConfigurationFactory;
public class DefaultedFacetFactoryTest extends AbstractFacetFactoryTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/disabled/ObjectDisabledMethodFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/disabled/ObjectDisabledMethodFacetFactoryTest.java
index 0486a94..4c4b270 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/disabled/ObjectDisabledMethodFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/disabled/ObjectDisabledMethodFacetFactoryTest.java
@@ -26,7 +26,6 @@ import org.apache.isis.applib.Identifier.Type;
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.disabled.DisabledObjectFacet;
import org.apache.isis.metamodel.facets.object.disabled.method.DisabledObjectFacetViaMethod;
import org.apache.isis.metamodel.facets.object.disabled.method.DisabledObjectFacetViaMethodFactory;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/ChoicesFacetFromBoundedAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/ChoicesFacetFromBoundedAnnotationFactoryTest.java
index 0707fd6..052fec1 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/ChoicesFacetFromBoundedAnnotationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/ChoicesFacetFromBoundedAnnotationFactoryTest.java
@@ -25,7 +25,6 @@ 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.choices.ChoicesFacetFromBoundedAbstract;
-import org.apache.isis.metamodel.facets.object.domainobject.DomainObjectAnnotationFacetFactory;
import org.apache.isis.metamodel.facets.objectvalue.choices.ChoicesFacet;
public class ChoicesFacetFromBoundedAnnotationFactoryTest extends AbstractFacetFactoryTest {
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 1f5980a..c938616 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
@@ -34,9 +34,9 @@ import org.apache.isis.config.internal._Config;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessClassContext;
+import org.apache.isis.metamodel.facets.ObjectSpecIdFacetFactory.ProcessObjectSpecIdContext;
import org.apache.isis.metamodel.facets.object.audit.AuditableFacet;
import org.apache.isis.metamodel.facets.object.autocomplete.AutoCompleteFacet;
-import org.apache.isis.metamodel.facets.object.domainobject.DomainObjectAnnotationFacetFactory;
import org.apache.isis.metamodel.facets.object.domainobject.auditing.AuditableFacetForDomainObjectAnnotation;
import org.apache.isis.metamodel.facets.object.domainobject.auditing.AuditableFacetForDomainObjectAnnotationAsConfigured;
import org.apache.isis.metamodel.facets.object.domainobject.auditing.AuditableFacetFromConfiguration;
@@ -56,7 +56,6 @@ import org.apache.isis.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.isis.metamodel.facets.objectvalue.choices.ChoicesFacet;
import org.apache.isis.metamodel.spec.ObjectSpecId;
-import static org.apache.isis.metamodel.facets.ObjectSpecIdFacetFactory.ProcessObjectSpecIdContext;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.junit.Assert.assertThat;
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 9efcd82..cdcac61 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
@@ -24,13 +24,11 @@ import org.junit.Test;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
-import org.apache.isis.metamodel.facets.FacetFactory.ProcessClassContext;
-import org.apache.isis.metamodel.facets.object.domainobject.DomainObjectAnnotationFacetFactory;
+import org.apache.isis.metamodel.facets.ObjectSpecIdFacetFactory.ProcessObjectSpecIdContext;
import org.apache.isis.metamodel.facets.object.domainobject.objectspecid.ObjectSpecIdFacetForDomainObjectAnnotation;
import org.apache.isis.metamodel.facets.object.objectspecid.ObjectSpecIdFacet;
import org.apache.isis.metamodel.spec.ObjectSpecId;
-import static org.apache.isis.metamodel.facets.ObjectSpecIdFacetFactory.ProcessObjectSpecIdContext;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/DefaultViewConfiguration_parseValue_Test.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/DefaultViewConfiguration_parseValue_Test.java
index 2d3c84e..2fe0aac 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/DefaultViewConfiguration_parseValue_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/DefaultViewConfiguration_parseValue_Test.java
@@ -21,7 +21,9 @@ package org.apache.isis.metamodel.facets.object.domainobject.auditing;
import org.junit.Assert;
import org.junit.Test;
-import static org.apache.isis.metamodel.facets.object.domainobject.auditing.DefaultViewConfiguration.*;
+import static org.apache.isis.metamodel.facets.object.domainobject.auditing.DefaultViewConfiguration.HIDDEN;
+import static org.apache.isis.metamodel.facets.object.domainobject.auditing.DefaultViewConfiguration.TABLE;
+import static org.apache.isis.metamodel.facets.object.domainobject.auditing.DefaultViewConfiguration.parseValue;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
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 34e9b53..40b717a 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
@@ -39,21 +39,6 @@ import org.apache.isis.metamodel.facets.members.cssclass.CssClassFacet;
import org.apache.isis.metamodel.facets.members.cssclassfa.CssClassFaFacet;
import org.apache.isis.metamodel.facets.members.cssclassfa.CssClassFaPosition;
import org.apache.isis.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet;
-import org.apache.isis.metamodel.facets.object.domainobjectlayout.BookmarkPolicyFacetForDomainObjectLayoutAnnotation;
-import org.apache.isis.metamodel.facets.object.domainobjectlayout.BookmarkPolicyFacetForViewModelLayoutAnnotation;
-import org.apache.isis.metamodel.facets.object.domainobjectlayout.CssClassFaFacetForDomainObjectLayoutAnnotation;
-import org.apache.isis.metamodel.facets.object.domainobjectlayout.CssClassFaFacetForViewModelLayoutAnnotation;
-import org.apache.isis.metamodel.facets.object.domainobjectlayout.CssClassFacetForDomainObjectLayoutAnnotation;
-import org.apache.isis.metamodel.facets.object.domainobjectlayout.CssClassFacetForViewModelLayoutAnnotation;
-import org.apache.isis.metamodel.facets.object.domainobjectlayout.DescribedAsFacetForDomainObjectLayoutAnnotation;
-import org.apache.isis.metamodel.facets.object.domainobjectlayout.DescribedAsFacetForViewModelLayoutAnnotation;
-import org.apache.isis.metamodel.facets.object.domainobjectlayout.DomainObjectLayoutFacetFactory;
-import org.apache.isis.metamodel.facets.object.domainobjectlayout.NamedFacetForDomainObjectLayoutAnnotation;
-import org.apache.isis.metamodel.facets.object.domainobjectlayout.NamedFacetForViewModelLayoutAnnotation;
-import org.apache.isis.metamodel.facets.object.domainobjectlayout.PagedFacetForDomainObjectLayoutAnnotation;
-import org.apache.isis.metamodel.facets.object.domainobjectlayout.PagedFacetForViewModelLayoutAnnotation;
-import org.apache.isis.metamodel.facets.object.domainobjectlayout.PluralFacetForDomainObjectLayoutAnnotation;
-import org.apache.isis.metamodel.facets.object.domainobjectlayout.PluralFacetForViewModelLayoutAnnotation;
import org.apache.isis.metamodel.facets.object.paged.PagedFacet;
import org.apache.isis.metamodel.facets.object.plural.PluralFacet;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactoryTest.java
index 6eb30db..df8e40e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactoryTest.java
@@ -20,15 +20,13 @@ package org.apache.isis.metamodel.facets.object.domainservice.annotation;
import org.junit.Assert;
-import static org.apache.isis.metamodel.commons.matchers.IsisMatchers.classEqualTo;
-
import org.apache.isis.applib.annotation.DomainService;
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.domainservice.DomainServiceFacet;
-import org.apache.isis.metamodel.facets.object.domainservice.annotation.DomainServiceFacetAnnotation;
-import org.apache.isis.metamodel.facets.object.domainservice.annotation.DomainServiceFacetAnnotationFactory;
+
+import static org.apache.isis.metamodel.commons.matchers.IsisMatchers.classEqualTo;
public class DomainServiceFacetAnnotationFactoryTest extends AbstractFacetFactoryTest {
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 6689c9b..415df97 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
@@ -19,7 +19,7 @@
package org.apache.isis.metamodel.facets.object.domainservicelayout.annotation;
-import static org.hamcrest.Matchers.is;
+import org.junit.Assert;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.DomainServiceLayout;
@@ -28,7 +28,8 @@ import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
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 org.junit.Assert;
+
+import static org.hamcrest.Matchers.is;
public class DomainServiceLayoutFacetFactoryTest extends AbstractFacetFactoryTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/facets/FacetsFacetAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/facets/FacetsFacetAnnotationFactoryTest.java
index 129d011..cf2052c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/facets/FacetsFacetAnnotationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/facets/FacetsFacetAnnotationFactoryTest.java
@@ -27,7 +27,6 @@ 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.FacetFactory.ProcessClassContext;
-import org.apache.isis.metamodel.facets.object.facets.FacetsFacet;
import org.apache.isis.metamodel.facets.object.facets.annotation.FacetsFacetAnnotation;
import org.apache.isis.metamodel.facets.object.facets.annotation.FacetsFacetAnnotationFactory;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/hidden/ObjectHiddenMethodFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/hidden/ObjectHiddenMethodFacetFactoryTest.java
index 2134cce..a81a263 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/hidden/ObjectHiddenMethodFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/hidden/ObjectHiddenMethodFacetFactoryTest.java
@@ -24,7 +24,6 @@ import java.lang.reflect.Method;
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.hidden.HiddenObjectFacet;
import org.apache.isis.metamodel.facets.object.hidden.method.HiddenObjectFacetViaMethod;
import org.apache.isis.metamodel.facets.object.hidden.method.HiddenObjectFacetViaMethodFactory;
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 ed0b988..4cb2de8 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
@@ -21,9 +21,6 @@ package org.apache.isis.metamodel.facets.object.ident.cssclass;
import java.lang.reflect.Method;
-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 org.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JUnit4Mockery;
@@ -31,9 +28,12 @@ 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.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
public class CssClassFacetMethodTest {
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 1521a8d..5e09420 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
@@ -21,9 +21,6 @@ package org.apache.isis.metamodel.facets.object.ident.cssclass;
import java.lang.reflect.Method;
-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 org.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JUnit4Mockery;
@@ -31,6 +28,10 @@ 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;
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 20f0d39..52187d0 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
@@ -21,9 +21,6 @@ package org.apache.isis.metamodel.facets.object.ident.icon;
import java.lang.reflect.Method;
-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 org.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JUnit4Mockery;
@@ -31,6 +28,10 @@ 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;
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 005e84d..cbadf95 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
@@ -21,9 +21,6 @@ package org.apache.isis.metamodel.facets.object.ident.layout;
import java.lang.reflect.Method;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facetapi.FacetHolder;
-import org.apache.isis.metamodel.facets.object.layout.LayoutFacetMethod;
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JUnit4Mockery;
@@ -31,6 +28,10 @@ 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;
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 bce23f5..368dc0d 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
@@ -21,9 +21,6 @@ package org.apache.isis.metamodel.facets.object.ident.title;
import java.lang.reflect.Method;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facetapi.FacetHolder;
-import org.apache.isis.metamodel.facets.object.title.methods.TitleFacetViaTitleMethod;
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
@@ -33,6 +30,10 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.apache.isis.metamodel.adapter.ObjectAdapter;
+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;
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 2a39cc3..2c03c64 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
@@ -18,14 +18,19 @@
*/
package org.apache.isis.metamodel.facets.object.ident.title.annotation;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
+import org.jmock.Expectations;
+import org.jmock.auto.Mock;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facetapi.Facet;
@@ -38,13 +43,9 @@ import org.apache.isis.metamodel.facets.object.title.annotation.TitleFacetViaTit
import org.apache.isis.metamodel.facets.object.title.annotation.TitleFacetViaTitleAnnotation.TitleComponent;
import org.apache.isis.security.authentication.AuthenticationSession;
import org.apache.isis.security.authentication.AuthenticationSessionProvider;
-import org.jmock.Expectations;
-import org.jmock.auto.Mock;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
public class TitleAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4TestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/navparent/NavigableParentFacetMethodFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/navparent/NavigableParentFacetMethodFactoryTest.java
index 4867846..585a3c4 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/navparent/NavigableParentFacetMethodFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/navparent/NavigableParentFacetMethodFactoryTest.java
@@ -19,20 +19,19 @@
package org.apache.isis.metamodel.facets.object.navparent;
-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 java.lang.reflect.Method;
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.navparent.NavigableParentFacet;
import org.apache.isis.metamodel.facets.object.navparent.method.NavigableParentFacetMethod;
import org.apache.isis.metamodel.facets.object.navparent.method.NavigableParentFacetMethodFactory;
+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 NavigableParentFacetMethodFactoryTest extends AbstractFacetFactoryTest {
private NavigableParentFacetMethodFactory facetFactory;
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 1326f83..407a77d 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
@@ -19,15 +19,8 @@
package org.apache.isis.metamodel.facets.object.navparent;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
import java.lang.reflect.Method;
-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 org.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JUnit4Mockery;
@@ -35,6 +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;
+
public class NavigableParentFacetMethodTest {
private final Mockery mockery = new JUnit4Mockery();
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactoryTest.java
index f2bcdc5..502f0c9 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactoryTest.java
@@ -21,6 +21,13 @@ package org.apache.isis.metamodel.facets.object.navparent.annotation;
import java.lang.reflect.Method;
import java.util.Optional;
+import org.jmock.Expectations;
+import org.jmock.auto.Mock;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.isis.commons.internal._Constants;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facetapi.Facet;
@@ -31,12 +38,6 @@ import org.apache.isis.metamodel.facets.object.navparent.annotation.NavigablePar
import org.apache.isis.metamodel.facets.object.navparent.method.NavigableParentFacetMethod;
import org.apache.isis.security.authentication.AuthenticationSession;
import org.apache.isis.security.authentication.AuthenticationSessionProvider;
-import org.jmock.Expectations;
-import org.jmock.auto.Mock;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
public class NavigableParentAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4TestCase {
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 4be2fb0..a57629a 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
@@ -22,9 +22,9 @@ package org.apache.isis.metamodel.facets.object.objectspecid;
import org.datanucleus.testing.dom.CustomerAsProxiedByDataNucleus;
import org.junit.Before;
import org.junit.Test;
+
import org.apache.isis.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
import org.apache.isis.metamodel.facets.ObjectSpecIdFacetFactory;
-import org.apache.isis.metamodel.facets.object.objectspecid.ObjectSpecIdFacet;
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;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/parseable/ParseableFacetUsingParserTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/parseable/ParseableFacetUsingParserTest.java
index f2eb6b2..d92b47e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/parseable/ParseableFacetUsingParserTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/parseable/ParseableFacetUsingParserTest.java
@@ -34,7 +34,6 @@ import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.metamodel.MetaModelContext;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.facetapi.FacetHolder;
-import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.metamodel.facets.object.parseable.parser.ParseableFacetUsingParser;
import org.apache.isis.metamodel.facets.object.value.ValueFacet;
import org.apache.isis.metamodel.services.persistsession.ObjectAdapterService;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/recreatable/RecreatableObjectFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/recreatable/RecreatableObjectFacetFactoryTest.java
index 2310a05..ca6da92 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/recreatable/RecreatableObjectFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/recreatable/RecreatableObjectFacetFactoryTest.java
@@ -23,8 +23,6 @@ import org.apache.isis.applib.ViewModel;
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.recreatable.RecreatableObjectFacetFactory;
-import org.apache.isis.metamodel.facets.object.recreatable.RecreatableObjectFacetForRecreatableObjectInterface;
import org.apache.isis.metamodel.facets.object.viewmodel.ViewModelFacet;
public class RecreatableObjectFacetFactoryTest extends AbstractFacetFactoryTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/validating/validateobject/ObjectValidMethodFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/validating/validateobject/ObjectValidMethodFacetFactoryTest.java
index 9c0b10e..03aa0f1 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/validating/validateobject/ObjectValidMethodFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/validating/validateobject/ObjectValidMethodFacetFactoryTest.java
@@ -24,7 +24,6 @@ import java.lang.reflect.Method;
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.validating.validateobject.ValidateObjectFacet;
import org.apache.isis.metamodel.facets.object.validating.validateobject.method.ValidateObjectFacetMethod;
import org.apache.isis.metamodel.facets.object.validating.validateobject.method.ValidateObjectFacetMethodFactory;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
index a4bbc90..58a5402 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
@@ -32,9 +32,6 @@ import org.apache.isis.metamodel.facets.object.encodeable.EncodableFacet;
import org.apache.isis.metamodel.facets.object.immutable.ImmutableFacet;
import org.apache.isis.metamodel.facets.object.parseable.ParseableFacet;
import org.apache.isis.metamodel.facets.object.title.TitleFacet;
-import org.apache.isis.metamodel.facets.object.value.EqualByContentFacet;
-import org.apache.isis.metamodel.facets.object.value.ValueFacet;
-import org.apache.isis.metamodel.facets.object.value.ValueFacetAbstract;
import org.apache.isis.metamodel.facets.object.value.annotcfg.ValueFacetAnnotation;
import org.apache.isis.metamodel.facets.object.value.annotcfg.ValueFacetAnnotationOrConfigurationFactory;
import org.apache.isis.metamodel.facets.object.value.vsp.ValueSemanticsProviderUtil;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/ordering/memberorder/DeweyOrderSetTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/ordering/memberorder/DeweyOrderSetTest.java
index 43d7c30..d7e950d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/ordering/memberorder/DeweyOrderSetTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/ordering/memberorder/DeweyOrderSetTest.java
@@ -25,8 +25,6 @@ import org.hamcrest.Description;
import org.jmock.Expectations;
import org.jmock.api.Action;
import org.jmock.api.Invocation;
-import org.junit.After;
-import org.junit.Before;
import org.junit.Rule;
import org.apache.isis.applib.services.i18n.TranslationService;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/ordering/memberorder/MemberOrderComparatorTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/ordering/memberorder/MemberOrderComparatorTest.java
index a444f97..eb93a34 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/ordering/memberorder/MemberOrderComparatorTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/ordering/memberorder/MemberOrderComparatorTest.java
@@ -24,6 +24,7 @@ import org.jmock.Expectations;
import org.jmock.api.Action;
import org.jmock.api.Invocation;
import org.junit.Rule;
+
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.metamodel.facets.FacetedMethod;
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 78a72f9..ac92c03 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
@@ -20,6 +20,7 @@
package org.apache.isis.metamodel.facets.param.layout.annotation;
import java.lang.reflect.Method;
+
import org.apache.isis.applib.annotation.LabelPosition;
import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.metamodel.facetapi.Facet;
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 50777ed..f262008 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
@@ -20,6 +20,7 @@
package org.apache.isis.metamodel.facets.param.layout.annotation;
import java.lang.reflect.Method;
+
import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.FacetFactory;
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 28202e4..8655855 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
@@ -38,7 +38,6 @@ import org.apache.isis.metamodel.facets.objectvalue.mandatory.MandatoryFacet;
import org.apache.isis.metamodel.facets.objectvalue.maxlen.MaxLengthFacet;
import org.apache.isis.metamodel.facets.objectvalue.mustsatisfyspec.MustSatisfySpecificationFacet;
import org.apache.isis.metamodel.facets.objectvalue.regex.RegExFacet;
-import org.apache.isis.metamodel.facets.param.parameter.ParameterAnnotationFacetFactory;
import org.apache.isis.metamodel.facets.param.parameter.mandatory.MandatoryFacetForParameterAnnotation;
import org.apache.isis.metamodel.facets.param.parameter.maxlen.MaxLengthFacetForParameterAnnotation;
import org.apache.isis.metamodel.facets.param.parameter.mustsatisfy.MustSatisfySpecificationFacetForParameterAnnotation;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/param/parameter/ParameterOptionalityOrNullableAnnotationOnParameterFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/param/parameter/ParameterOptionalityOrNullableAnnotationOnParameterFacetFactoryTest.java
index 13ad47b..d836d4f 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/param/parameter/ParameterOptionalityOrNullableAnnotationOnParameterFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/param/parameter/ParameterOptionalityOrNullableAnnotationOnParameterFacetFactoryTest.java
@@ -29,7 +29,6 @@ import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessParameterContext;
import org.apache.isis.metamodel.facets.objectvalue.mandatory.MandatoryFacet;
-import org.apache.isis.metamodel.facets.param.parameter.ParameterAnnotationFacetFactory;
import org.apache.isis.metamodel.facets.param.parameter.mandatory.MandatoryFacetForParameterAnnotation;
import org.apache.isis.metamodel.facets.param.parameter.mandatory.MandatoryFacetInvertedByNullableAnnotationOnParameter;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/param/parameter/RegExAnnotationOnParameterFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/param/parameter/RegExAnnotationOnParameterFacetFactoryTest.java
index 7a7d3a7..eaddcbe 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/param/parameter/RegExAnnotationOnParameterFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/param/parameter/RegExAnnotationOnParameterFacetFactoryTest.java
@@ -24,11 +24,11 @@ import java.lang.reflect.Method;
import javax.validation.constraints.Pattern;
import org.junit.Before;
+
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessParameterContext;
import org.apache.isis.metamodel.facets.objectvalue.regex.RegExFacet;
-import org.apache.isis.metamodel.facets.param.parameter.ParameterAnnotationFacetFactory;
import org.apache.isis.metamodel.facets.param.parameter.regex.RegExFacetForPatternAnnotationOnParameter;
public class RegExAnnotationOnParameterFacetFactoryTest extends AbstractFacetFactoryTest {
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 1eb2e4d..d4934f6 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
@@ -28,7 +28,6 @@ import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
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 org.apache.isis.metamodel.facets.properties.property.PropertyAnnotationFacetFactory;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/property/MandatoryAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/property/MandatoryAnnotationFacetFactoryTest.java
index cc51b3a..2219665 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/property/MandatoryAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/property/MandatoryAnnotationFacetFactoryTest.java
@@ -20,6 +20,7 @@
package org.apache.isis.metamodel.facets.properties.property;
import java.lang.reflect.Method;
+
import org.junit.Before;
import org.apache.isis.applib.annotation.Optionality;
@@ -28,7 +29,6 @@ import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.metamodel.facets.objectvalue.mandatory.MandatoryFacet;
-import org.apache.isis.metamodel.facets.properties.property.PropertyAnnotationFacetFactory;
import org.apache.isis.metamodel.facets.properties.property.mandatory.MandatoryFacetForPropertyAnnotation;
public class MandatoryAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/property/NotPersistedAnnotationOnPropertyFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/property/NotPersistedAnnotationOnPropertyFacetFactoryTest.java
index 5245ce6..faafa05 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/property/NotPersistedAnnotationOnPropertyFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/property/NotPersistedAnnotationOnPropertyFacetFactoryTest.java
@@ -27,7 +27,6 @@ import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.metamodel.facets.propcoll.notpersisted.NotPersistedFacet;
-import org.apache.isis.metamodel.facets.properties.property.PropertyAnnotationFacetFactory;
import org.apache.isis.metamodel.facets.properties.property.notpersisted.NotPersistedFacetForPropertyAnnotation;
public class NotPersistedAnnotationOnPropertyFacetFactoryTest 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 c4ddd88..e86d061 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
@@ -52,7 +52,6 @@ import org.apache.isis.metamodel.facets.objectvalue.mustsatisfyspec.MustSatisfyS
import org.apache.isis.metamodel.facets.objectvalue.regex.RegExFacet;
import org.apache.isis.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacetAbstract;
import org.apache.isis.metamodel.facets.propcoll.notpersisted.NotPersistedFacet;
-import org.apache.isis.metamodel.facets.properties.property.PropertyAnnotationFacetFactory;
import org.apache.isis.metamodel.facets.properties.property.disabled.DisabledFacetForPropertyAnnotation;
import org.apache.isis.metamodel.facets.properties.property.hidden.HiddenFacetForPropertyAnnotation;
import org.apache.isis.metamodel.facets.properties.property.mandatory.MandatoryFacetForPropertyAnnotation;
@@ -74,7 +73,6 @@ import org.apache.isis.metamodel.facets.properties.update.modify.PropertySetterF
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.metamodel.specloader.specimpl.IntrospectionState;
import static org.apache.isis.metamodel.commons.matchers.IsisMatchers.classEqualTo;
import static org.hamcrest.CoreMatchers.is;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/property/PropertyOptionalityOrNullableAnnotationOnPropertyFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/property/PropertyOptionalityOrNullableAnnotationOnPropertyFacetFactoryTest.java
index 3f7cc44..a61dec3 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/property/PropertyOptionalityOrNullableAnnotationOnPropertyFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/property/PropertyOptionalityOrNullableAnnotationOnPropertyFacetFactoryTest.java
@@ -29,7 +29,6 @@ import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.metamodel.facets.objectvalue.mandatory.MandatoryFacet;
-import org.apache.isis.metamodel.facets.properties.property.PropertyAnnotationFacetFactory;
import org.apache.isis.metamodel.facets.properties.property.mandatory.MandatoryFacetForPropertyAnnotation;
import org.apache.isis.metamodel.facets.properties.property.mandatory.MandatoryFacetInvertedByNullableAnnotationOnProperty;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/property/RegExAnnotationOnPropertyFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/property/RegExAnnotationOnPropertyFacetFactoryTest.java
index 0bc2690..0bf144c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/property/RegExAnnotationOnPropertyFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/property/RegExAnnotationOnPropertyFacetFactoryTest.java
@@ -24,11 +24,11 @@ import java.lang.reflect.Method;
import javax.validation.constraints.Pattern;
import org.junit.Before;
+
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.metamodel.facets.objectvalue.regex.RegExFacet;
-import org.apache.isis.metamodel.facets.properties.property.PropertyAnnotationFacetFactory;
import org.apache.isis.metamodel.facets.properties.property.regex.RegExFacetForPatternAnnotationOnProperty;
public class RegExAnnotationOnPropertyFacetFactoryTest extends AbstractFacetFactoryTest {
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 1b1ef11..cfadca9 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
@@ -29,8 +29,6 @@ import org.apache.isis.metamodel.facetapi.FacetHolder;
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 org.apache.isis.metamodel.facets.properties.propertylayout.LabelAtFacetForPropertyLayoutAnnotation;
-import org.apache.isis.metamodel.facets.properties.propertylayout.PropertyLayoutFacetFactory;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.instanceOf;
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 bb276df..bb49b25 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
@@ -27,8 +27,6 @@ import org.apache.isis.metamodel.facetapi.FacetHolder;
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 org.apache.isis.metamodel.facets.properties.propertylayout.NamedFacetForPropertyLayoutAnnotation;
-import org.apache.isis.metamodel.facets.properties.propertylayout.PropertyLayoutFacetFactory;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.instanceOf;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionMoreTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionMoreTest.java
index 3a3c1f1..4650c2c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionMoreTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionMoreTest.java
@@ -19,11 +19,6 @@
package org.apache.isis.metamodel.facets.propparam.specification;
-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 java.util.Collections;
import java.util.Optional;
@@ -45,6 +40,11 @@ import org.apache.isis.metamodel.facets.object.validating.mustsatisfyspec.MustSa
import org.apache.isis.metamodel.interactions.PropertyModifyContext;
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.junit.Assert.assertThat;
+
public class MustSatisfySpecificationValidatingInteractionMoreTest {
@Rule
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionTest.java
index cb05312..d25fc7b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionTest.java
@@ -19,15 +19,7 @@
package org.apache.isis.metamodel.facets.propparam.specification;
-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;
-
import java.util.Collections;
-import java.util.Optional;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
@@ -38,8 +30,6 @@ import org.junit.Test;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.metamodel.MetaModelContext;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facetapi.IdentifiedHolder;
@@ -48,6 +38,13 @@ import org.apache.isis.metamodel.facets.object.validating.mustsatisfyspec.MustSa
import org.apache.isis.metamodel.interactions.PropertyModifyContext;
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.junit.Assert.assertThat;
+
+import lombok.val;
+
public class MustSatisfySpecificationValidatingInteractionTest {
@Rule
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 a873e08..47f81d2 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
@@ -19,16 +19,16 @@
package org.apache.isis.metamodel.facets.propparam.specification;
-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.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;
+
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 9ed9f3d..11cbac5 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
@@ -19,16 +19,16 @@
package org.apache.isis.metamodel.facets.propparam.specification;
-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.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;
+
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 2057d5b..78f8c5a 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
@@ -19,16 +19,16 @@
package org.apache.isis.metamodel.facets.propparam.specification;
-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.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;
+
public class SpecificationOrTests {
private final Specification alwaysSatisfied = new SpecificationAlwaysSatisfied();
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 d1ba65a..81c9624 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
@@ -19,10 +19,6 @@
package org.apache.isis.metamodel.facets.value;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-
import org.junit.Before;
import org.junit.Test;
@@ -31,6 +27,10 @@ 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 3921b1f..6f8cfd0 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
@@ -19,16 +19,17 @@
package org.apache.isis.metamodel.facets.value;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import org.junit.Before;
+import org.junit.Test;
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 org.junit.Before;
-import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
public class BooleanValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
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 2dce3ce..f717723 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
@@ -19,16 +19,17 @@
package org.apache.isis.metamodel.facets.value;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import org.junit.Before;
+import org.junit.Test;
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 org.junit.Before;
-import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
public class CharacterValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
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 1442078..e496760 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
@@ -19,10 +19,6 @@
package org.apache.isis.metamodel.facets.value;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-
import org.junit.Before;
import org.junit.Test;
@@ -31,6 +27,10 @@ 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/ColorValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ColorValueSemanticsProviderTest.java
index bf81fe0..1d04f70 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ColorValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ColorValueSemanticsProviderTest.java
@@ -19,9 +19,6 @@
package org.apache.isis.metamodel.facets.value;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
import org.junit.Before;
import org.junit.Test;
@@ -31,6 +28,9 @@ import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.metamodel.facets.value.color.ColorValueSemanticsProvider;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
public class ColorValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
private ColorValueSemanticsProvider value;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/MoneyValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/MoneyValueSemanticsProviderTest.java
index cad50cb..b216987 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/MoneyValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/MoneyValueSemanticsProviderTest.java
@@ -19,9 +19,6 @@
package org.apache.isis.metamodel.facets.value;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
import java.util.Locale;
import org.junit.Before;
@@ -33,6 +30,9 @@ import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.metamodel.facets.value.money.MoneyValueSemanticsProvider;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
public class MoneyValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
private static final String POUND_SYMBOL = "\u00A3";
diff --git a/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 51f517d..00d4f8a 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
@@ -19,8 +19,6 @@
package org.apache.isis.metamodel.facets.value;
-import static org.junit.Assert.assertEquals;
-
import org.junit.Before;
import org.junit.Test;
@@ -29,6 +27,8 @@ 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/PolishMoneyValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/PolishMoneyValueSemanticsProviderTest.java
index 11e931a..4ca2ed8 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/PolishMoneyValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/PolishMoneyValueSemanticsProviderTest.java
@@ -19,9 +19,6 @@
package org.apache.isis.metamodel.facets.value;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
import java.util.Locale;
import org.jmock.integration.junit4.JMock;
@@ -36,6 +33,9 @@ import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.metamodel.facets.value.money.MoneyValueSemanticsProvider;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
@Ignore
// TODO once the sematics provide has a way to reset the formatters for the new
// local then this test can be reinstated.
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 44d56c2..3298717 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
@@ -19,13 +19,14 @@
package org.apache.isis.metamodel.facets.value;
-import static org.junit.Assert.assertEquals;
+import org.junit.Before;
+import org.junit.Test;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.metamodel.facets.value.string.StringValueSemanticsProvider;
-import org.junit.Before;
-import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
public class StringValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
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 ffaaa0d..15b4fb3 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
@@ -19,17 +19,16 @@
package org.apache.isis.metamodel.facets.value;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-
import java.util.Locale;
-import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.applib.services.registry.ServiceRegistry;
+import org.jmock.Expectations;
+import org.jmock.auto.Mock;
+import org.junit.After;
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
import org.apache.isis.config.internal._Config;
import org.apache.isis.metamodel.MetaModelContext;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
@@ -44,13 +43,13 @@ import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.security.authentication.AuthenticationSessionProvider;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import org.jmock.Expectations;
-import org.jmock.auto.Mock;
-import org.junit.After;
-import org.junit.Assume;
-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;
public abstract class ValueSemanticsProviderAbstractTestCase {
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 7f1b2df..bc37a6e 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
@@ -27,7 +27,6 @@ import org.junit.Test;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.config.internal._Config;
import org.apache.isis.metamodel.facetapi.FacetHolder;
-import org.apache.isis.metamodel.facets.value.datetimejodalocal.JodaLocalDateTimeValueSemanticsProvider;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import static org.hamcrest.CoreMatchers.equalTo;
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 e0aa47d..9efb081 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
@@ -18,9 +18,6 @@
*/
package org.apache.isis.metamodel.feature;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
@@ -45,6 +42,9 @@ 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/interactions/InteractionUtils_isA_Test.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/interactions/InteractionUtils_isA_Test.java
index 77b68d4..462083c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/interactions/InteractionUtils_isA_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/interactions/InteractionUtils_isA_Test.java
@@ -25,7 +25,6 @@ import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetAbstract;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
-import org.apache.isis.metamodel.interactions.InteractionUtils;
import junit.framework.TestCase;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest.java
index 01135c4..f794f91 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorDefaultTest.java
@@ -35,7 +35,6 @@ import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.commons.internal.ioc.spring._Spring;
-import org.apache.isis.metamodel.services.ServiceInjectorDefault;
import org.apache.isis.metamodel.services.registry.ServiceRegistryDefault;
import org.apache.isis.metamodel.spec.InjectorMethodEvaluator;
import org.apache.isis.metamodel.specloader.InjectorMethodEvaluatorDefault;
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 c11afdb..29b65e9 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,7 +32,6 @@ import org.springframework.test.context.ActiveProfiles;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.metamodel.services.ServiceInjectorDefault;
import org.apache.isis.metamodel.services.registry.ServiceRegistryDefault;
import static org.hamcrest.Matchers.any;
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 fa8a54a..7265c28 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
@@ -34,7 +34,6 @@ 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.commons.internal.ioc.spring._Spring;
-import org.apache.isis.metamodel.services.ServiceInjectorDefault;
import org.apache.isis.metamodel.services.registry.ServiceRegistryDefault;
import static org.junit.jupiter.api.Assertions.assertEquals;
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 7429c8c..cec4666 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,7 +30,6 @@ import org.springframework.test.context.ActiveProfiles;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.metamodel.services.ServiceInjectorDefault;
import org.apache.isis.metamodel.services.registry.ServiceRegistryDefault;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceUtil_Test.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceUtil_Test.java
index f8f28e4..5e50714 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceUtil_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceUtil_Test.java
@@ -18,16 +18,15 @@
*/
package org.apache.isis.metamodel.services;
+import org.junit.Test;
+
+import org.apache.isis.applib.annotation.DomainService;
+
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
-import org.junit.Test;
-
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.metamodel.services.ServiceUtil;
-
public class ServiceUtil_Test {
@DomainService(objectType = "foo.SomeServiceAnnotated")
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 bb740da..916d06a 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
@@ -30,10 +30,6 @@ import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.apache.isis.applib.services.appfeat.ApplicationMemberType;
-import org.apache.isis.metamodel.services.appfeat.ApplicationFeature;
-import org.apache.isis.metamodel.services.appfeat.ApplicationFeatureId;
-import org.apache.isis.metamodel.services.appfeat.ApplicationFeatureRepositoryDefault;
-import org.apache.isis.metamodel.services.appfeat.ApplicationFeatureType;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.value.ValueTypeContractTestAbstract;
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 79ebcc0..25100cd 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
@@ -41,10 +41,6 @@ import org.apache.isis.metamodel.facets.objectvalue.maxlen.MaxLengthFacet;
import org.apache.isis.metamodel.facets.objectvalue.maxlen.MaxLengthFacetAbstract;
import org.apache.isis.metamodel.facets.objectvalue.typicallen.TypicalLengthFacet;
import org.apache.isis.metamodel.facets.properties.typicallen.annotation.TypicalLengthFacetOnPropertyAnnotation;
-import org.apache.isis.metamodel.services.appfeat.ApplicationFeature;
-import org.apache.isis.metamodel.services.appfeat.ApplicationFeatureFactory;
-import org.apache.isis.metamodel.services.appfeat.ApplicationFeatureId;
-import org.apache.isis.metamodel.services.appfeat.ApplicationFeatureRepositoryDefault;
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.spec.feature.Contributed;
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 c4ae97f..ee0e935 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
@@ -24,8 +24,6 @@ import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.apache.isis.applib.services.appfeat.ApplicationMemberType;
-import org.apache.isis.metamodel.services.appfeat.ApplicationFeature;
-import org.apache.isis.metamodel.services.appfeat.ApplicationFeatureId;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.Matchers.containsInAnyOrder;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureTypeTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureTypeTest.java
index b6ad140..da89529 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureTypeTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureTypeTest.java
@@ -26,9 +26,6 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
-import org.apache.isis.metamodel.services.appfeat.ApplicationFeatureId;
-import org.apache.isis.metamodel.services.appfeat.ApplicationFeatureType;
-
public class ApplicationFeatureTypeTest {
public static class HideClassName extends ApplicationFeatureTypeTest {
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 c769fd7..4d36900 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
@@ -22,9 +22,9 @@ package org.apache.isis.metamodel.services.exceprecog;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+
import org.apache.isis.metamodel.adapter.oid.Oid.Factory;
import org.apache.isis.metamodel.adapter.version.ConcurrencyException;
-import org.apache.isis.metamodel.services.exceprecog.ExceptionRecognizerDocDefault;
import org.apache.isis.metamodel.spec.ObjectSpecId;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
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 ffcb5ed..2afa984 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
@@ -39,7 +39,6 @@ import org.apache.isis.applib.layout.grid.bootstrap3.BS3TabGroup;
import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.metamodel.services.grid.GridServiceDefault;
import org.apache.isis.metamodel.services.grid.bootstrap3.GridSystemServiceBS3;
import static org.hamcrest.CoreMatchers.equalTo;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/grid/GridLoaderServiceDefault_resourceNameFor_Test.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/grid/GridLoaderServiceDefault_resourceNameFor_Test.java
index eb39301..d6ba3c9 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/grid/GridLoaderServiceDefault_resourceNameFor_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/grid/GridLoaderServiceDefault_resourceNameFor_Test.java
@@ -25,8 +25,6 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
-import org.apache.isis.metamodel.services.grid.GridLoaderServiceDefault;
-
public class GridLoaderServiceDefault_resourceNameFor_Test {
private GridLoaderServiceDefault gridLoaderServiceDefault;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/metamodel/MetaModelServiceDefaultTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/metamodel/MetaModelServiceDefaultTest.java
index 804bbb2..1fb5c58 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/metamodel/MetaModelServiceDefaultTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/metamodel/MetaModelServiceDefaultTest.java
@@ -49,11 +49,8 @@ import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.FacetedMethod;
-import org.apache.isis.metamodel.services.metamodel.DomainMemberDefault;
-import org.apache.isis.metamodel.services.metamodel.DomainModelDefault;
-import org.apache.isis.metamodel.services.metamodel.MetaModelServiceDefault;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.spec.Hierarchical.Depth;
+import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.spec.feature.ObjectAction;
import org.apache.isis.metamodel.specloader.specimpl.ObjectActionDefault;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/swagger/internal/GenerationTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/swagger/internal/GenerationTest.java
index 6e1a4e5..0800c83 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/swagger/internal/GenerationTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/swagger/internal/GenerationTest.java
@@ -20,7 +20,6 @@ package org.apache.isis.metamodel.services.swagger.internal;
import java.util.Set;
-import org.apache.isis.metamodel.services.swagger.internal.Generation;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/swagger/internal/TaggerTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/swagger/internal/TaggerTest.java
index ce6d06c..9160891 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/swagger/internal/TaggerTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/swagger/internal/TaggerTest.java
@@ -24,8 +24,6 @@ import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.metamodel.services.swagger.internal.Tagger;
-
public class TaggerTest {
public static class TagFor extends TaggerTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/spec/ObjectSpecIdTest_constructor.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/spec/ObjectSpecIdTest_constructor.java
index 527f801..2dc376d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/spec/ObjectSpecIdTest_constructor.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/spec/ObjectSpecIdTest_constructor.java
@@ -18,7 +18,6 @@
*/
package org.apache.isis.metamodel.spec;
-import org.apache.isis.metamodel.spec.ObjectSpecId;
import org.junit.Test;
public class ObjectSpecIdTest_constructor {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/spec/ObjectSpecIdTest_valueSemantics.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/spec/ObjectSpecIdTest_valueSemantics.java
index 990cf51..17774be 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/spec/ObjectSpecIdTest_valueSemantics.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/spec/ObjectSpecIdTest_valueSemantics.java
@@ -21,7 +21,6 @@ package org.apache.isis.metamodel.spec;
import java.util.Arrays;
import java.util.List;
-import org.apache.isis.metamodel.spec.ObjectSpecId;
import org.apache.isis.unittestsupport.value.ValueTypeContractTestAbstract;
public class ObjectSpecIdTest_valueSemantics extends ValueTypeContractTestAbstract<ObjectSpecId> {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/ServiceInitializerTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/ServiceInitializerTest.java
index ff1b7b2..b60f7ec 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/ServiceInitializerTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/ServiceInitializerTest.java
@@ -18,11 +18,6 @@
*/
package org.apache.isis.metamodel.specloader;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -30,11 +25,6 @@ import java.util.stream.Collectors;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
-import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.metamodel.specloader.ServiceInitializer;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.After;
@@ -43,6 +33,16 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
+import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+
+import static org.apache.isis.commons.internal.base._NullSafe.stream;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public class ServiceInitializerTest {
@Rule
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 04b5b90..25b802e 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
@@ -21,16 +21,16 @@ package org.apache.isis.metamodel.specloader;
import java.util.Collection;
import java.util.Map;
-import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.metamodel.spec.ObjectSpecId;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.specloader.SpecificationCacheDefault;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+
+import org.apache.isis.commons.internal.collections._Maps;
+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;
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 0f0339a..97e4dda 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
@@ -41,8 +41,6 @@ import org.apache.isis.metamodel.progmodel.ProgrammingModelAbstract.DeprecatedPo
import org.apache.isis.metamodel.progmodels.dflt.ProgrammingModelFacetsJava8;
import org.apache.isis.metamodel.services.persistsession.ObjectAdapterService;
import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.metamodel.specloader.SpecificationLoaderDefault;
import org.apache.isis.security.authentication.AuthenticationSessionProvider;
import static org.junit.jupiter.api.Assertions.assertNotNull;
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 badc33b..47eedeb 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,14 @@ 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 org.apache.isis.metamodel.specloader.SpecificationLoader;
+
+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 {
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 1985aa6..c52eb43 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
@@ -21,12 +21,12 @@ package org.apache.isis.metamodel.specloader;
import java.util.Vector;
+import org.junit.jupiter.api.Test;
+
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 org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
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 76c3655..1da52d8 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,12 +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;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
-
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 1f4f860..cc91396 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
@@ -24,8 +24,6 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-import org.apache.isis.metamodel.specloader.classsubstitutor.ClassSubstitutor;
-
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 8d7d14f..61f9df7 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
@@ -29,8 +29,6 @@ import static org.apache.isis.metamodel.specloader.specimpl.IntrospectionState.T
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.metamodel.specloader.specimpl.IntrospectionState;
-
public class IntrospectionState_comparable_Test {
@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 ddf26bb..1b243cd 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
@@ -19,8 +19,8 @@
package org.apache.isis.metamodel.specloader.specimpl;
import org.junit.Test;
+
import org.apache.isis.metamodel.commons.StringExtensions;
-import org.apache.isis.metamodel.specloader.specimpl.ObjectMemberAbstract;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
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 4b75401..d006dc4 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
@@ -20,6 +20,13 @@
package org.apache.isis.metamodel.specloader.specimpl;
import java.util.function.Predicate;
+
+import org.jmock.Expectations;
+import org.jmock.auto.Mock;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
@@ -28,13 +35,6 @@ import org.apache.isis.metamodel.facets.TypedHolder;
import org.apache.isis.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.isis.metamodel.specloader.specimpl.ObjectActionDefault;
-import org.apache.isis.metamodel.specloader.specimpl.ObjectActionParameterAbstract;
-import org.jmock.Expectations;
-import org.jmock.auto.Mock;
-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;
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 5e6878b..f73737b 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
@@ -19,9 +19,6 @@
package org.apache.isis.metamodel.specloader.specimpl;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Before;
@@ -44,10 +41,12 @@ import org.apache.isis.metamodel.services.persistsession.ObjectAdapterService;
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.metamodel.specloader.specimpl.ObjectAssociationAbstract;
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 d98f533..dc596a9 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
@@ -19,11 +19,6 @@
package org.apache.isis.metamodel.specloader.specimpl;
-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.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Before;
@@ -46,10 +41,14 @@ import org.apache.isis.metamodel.services.persistsession.ObjectAdapterService;
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.metamodel.specloader.specimpl.ObjectAssociationAbstract;
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/metamodel/src/test/java/org/apache/isis/metamodel/specloader/specimpl/ObjectMemberAbstractTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/specimpl/ObjectMemberAbstractTest.java
index fff8566..95d0b5f 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/specimpl/ObjectMemberAbstractTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/specimpl/ObjectMemberAbstractTest.java
@@ -22,9 +22,7 @@ import org.hamcrest.CoreMatchers;
import org.junit.Assert;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.*;
-
-import org.apache.isis.metamodel.specloader.specimpl.ObjectMemberAbstract;
+import static org.hamcrest.CoreMatchers.equalTo;
public class ObjectMemberAbstractTest {
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/VisitorForFromClause.java b/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/VisitorForFromClause.java
index 7683c25..a52a77a 100644
--- a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/VisitorForFromClause.java
+++ b/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/VisitorForFromClause.java
@@ -23,7 +23,6 @@ import java.util.Objects;
import org.apache.isis.metamodel.spec.Hierarchical;
import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.specloader.specimpl.IntrospectionState;
import org.apache.isis.metamodel.specloader.validator.ValidationFailures;
class VisitorForFromClause extends VisitorForClauseAbstract {
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactory.java b/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactory.java
index f88a752..a244e5f 100644
--- a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactory.java
+++ b/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactory.java
@@ -21,7 +21,6 @@ package org.apache.isis.jdo.metamodel.facets.object.version;
import javax.jdo.annotations.Version;
-import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.metamodel.JdoMetamodelUtil;
import org.apache.isis.metamodel.facetapi.FacetUtil;
import org.apache.isis.metamodel.facetapi.FeatureType;
@@ -31,8 +30,8 @@ import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorVisiting;
-import org.apache.isis.metamodel.specloader.validator.ValidationFailures;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorVisiting.Visitor;
+import org.apache.isis.metamodel.specloader.validator.ValidationFailures;
public class JdoVersionAnnotationFacetFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactory.java b/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactory.java
index af8c81d..4e6dfb5 100644
--- a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactory.java
+++ b/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactory.java
@@ -41,8 +41,8 @@ import org.apache.isis.metamodel.spec.feature.Contributed;
import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorVisiting;
-import org.apache.isis.metamodel.specloader.validator.ValidationFailures;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorVisiting.Visitor;
+import org.apache.isis.metamodel.specloader.validator.ValidationFailures;
public class BigDecimalDerivedFromJdoColumnAnnotationFacetFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java b/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java
index e2bbd40..fe1488b 100644
--- a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java
+++ b/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java
@@ -43,8 +43,8 @@ import org.apache.isis.metamodel.spec.feature.Contributed;
import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorVisiting;
-import org.apache.isis.metamodel.specloader.validator.ValidationFailures;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorVisiting.Visitor;
+import org.apache.isis.metamodel.specloader.validator.ValidationFailures;
public class MandatoryFromJdoColumnAnnotationFacetFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java b/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java
index 208b7f5..b452c0d 100644
--- a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java
+++ b/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java
@@ -41,8 +41,8 @@ import org.apache.isis.metamodel.spec.feature.Contributed;
import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorVisiting;
-import org.apache.isis.metamodel.specloader.validator.ValidationFailures;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorVisiting.Visitor;
+import org.apache.isis.metamodel.specloader.validator.ValidationFailures;
public class MaxLengthDerivedFromJdoColumnAnnotationFacetFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/persistence/IsisPlatformTransactionManagerForJdo.java b/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/persistence/IsisPlatformTransactionManagerForJdo.java
index b24f766..52b5d83 100644
--- a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/persistence/IsisPlatformTransactionManagerForJdo.java
+++ b/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/persistence/IsisPlatformTransactionManagerForJdo.java
@@ -21,6 +21,11 @@ package org.apache.isis.jdo.persistence;
import javax.inject.Inject;
import javax.inject.Singleton;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionException;
+import org.springframework.transaction.support.AbstractPlatformTransactionManager;
+import org.springframework.transaction.support.DefaultTransactionStatus;
+
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.runtime.system.context.IsisContext;
import org.apache.isis.runtime.system.internal.InitialisationSession;
@@ -29,10 +34,6 @@ import org.apache.isis.runtime.system.session.IsisSessionFactory;
import org.apache.isis.runtime.system.transaction.IsisTransactionAspectSupport;
import org.apache.isis.runtime.system.transaction.IsisTransactionObject;
import org.apache.isis.security.authentication.AuthenticationSession;
-import org.springframework.transaction.TransactionDefinition;
-import org.springframework.transaction.TransactionException;
-import org.springframework.transaction.support.AbstractPlatformTransactionManager;
-import org.springframework.transaction.support.DefaultTransactionStatus;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/core/plugins/jdo-common/src/test/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java b/core/plugins/jdo-common/src/test/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java
index 20b9806..252f018 100644
--- a/core/plugins/jdo-common/src/test/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java
+++ b/core/plugins/jdo-common/src/test/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java
@@ -20,8 +20,8 @@ package org.apache.isis.jdo.exceprecog;
import org.junit.Before;
import org.junit.Test;
+
import org.apache.isis.config.internal._Config;
-import org.apache.isis.jdo.exceprecog.ExceptionRecognizerCompositeForJdoObjectStore;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
diff --git a/core/plugins/jdo-common/src/test/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java b/core/plugins/jdo-common/src/test/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java
index 8ae8469..ac275c4 100644
--- a/core/plugins/jdo-common/src/test/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java
+++ b/core/plugins/jdo-common/src/test/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java
@@ -20,7 +20,6 @@ package org.apache.isis.jdo.exceprecog;
import java.sql.SQLIntegrityConstraintViolationException;
-import org.apache.isis.jdo.exceprecog.ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/plugins/jdo-common/src/test/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_refineMetaModel.java b/core/plugins/jdo-common/src/test/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_refineMetaModel.java
index a44a523..fd943a0 100644
--- a/core/plugins/jdo-common/src/test/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_refineMetaModel.java
+++ b/core/plugins/jdo-common/src/test/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_refineMetaModel.java
@@ -19,15 +19,16 @@
package org.apache.isis.jdo.metamodel.facets.object.version;
import javax.jdo.annotations.Version;
+
import org.jmock.Expectations;
import org.jmock.Sequence;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.jdo.metamodel.facets.object.version.JdoVersionAnnotationFacetFactory;
+
import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.specloader.validator.ValidationFailures;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorVisiting.Visitor;
+import org.apache.isis.metamodel.specloader.validator.ValidationFailures;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/IsisBootDataNucleus.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/IsisBootDataNucleus.java
index f61a397..9a86185 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/IsisBootDataNucleus.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/IsisBootDataNucleus.java
@@ -18,17 +18,17 @@
*/
package org.apache.isis.jdo;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.FilterType;
+import org.springframework.context.annotation.Import;
+
import org.apache.isis.config.beans.IsisBeanScanInterceptorForSpring;
import org.apache.isis.jdo.jdosupport.IsisJdoSupportDN5;
import org.apache.isis.jdo.jdosupport.mixins.Persistable_datanucleusIdLong;
import org.apache.isis.jdo.metrics.MetricsServiceDefault;
import org.apache.isis.jdo.persistence.IsisPlatformTransactionManagerForJdo;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.FilterType;
-import org.springframework.context.annotation.Import;
-
@Configuration
@Import({
//TimestampService.class, //FIXME initializes too early
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/CreateSchemaObjectFromClassMetadata.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/CreateSchemaObjectFromClassMetadata.java
index aec8b1d..aa44645 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/CreateSchemaObjectFromClassMetadata.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/CreateSchemaObjectFromClassMetadata.java
@@ -25,14 +25,14 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.util.Map;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.jdo.datanucleus.DataNucleusPropertiesAware;
import org.datanucleus.ClassLoaderResolver;
import org.datanucleus.enhancer.EnhancementNucleusContextImpl;
import org.datanucleus.metadata.AbstractClassMetaData;
import org.datanucleus.metadata.MetaDataListener;
import org.datanucleus.store.ConnectionEncryptionProvider;
+import org.apache.isis.commons.internal.base._Strings;
+
import lombok.extern.log4j.Log4j2;
/**
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/DataNucleusLifeCycleHelper.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/DataNucleusLifeCycleHelper.java
index 87e6dba..1c53d69 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/DataNucleusLifeCycleHelper.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/DataNucleusLifeCycleHelper.java
@@ -20,9 +20,10 @@ package org.apache.isis.jdo.datanucleus;
import javax.jdo.PersistenceManagerFactory;
-import org.apache.isis.runtime.system.context.IsisContext;
import org.datanucleus.enhancer.EnhancementHelper;
+import org.apache.isis.runtime.system.context.IsisContext;
+
/**
*
* Purges any state associated with DataNucleus.
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/JDOStateManagerForIsis.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/JDOStateManagerForIsis.java
index a8746b4..2d68d1f 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/JDOStateManagerForIsis.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/JDOStateManagerForIsis.java
@@ -19,8 +19,6 @@
package org.apache.isis.jdo.datanucleus;
-import org.apache.isis.runtime.system.context.IsisContext;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
import org.datanucleus.ExecutionContext;
import org.datanucleus.cache.CachedPC;
import org.datanucleus.enhancement.Persistable;
@@ -29,6 +27,9 @@ import org.datanucleus.state.ReferentialStateManagerImpl;
import org.datanucleus.store.FieldValues;
import org.datanucleus.store.fieldmanager.FieldManager;
+import org.apache.isis.runtime.system.context.IsisContext;
+import org.apache.isis.runtime.system.session.IsisSessionFactory;
+
public class JDOStateManagerForIsis extends ReferentialStateManagerImpl {
public JDOStateManagerForIsis(ExecutionContext ec, AbstractClassMetaData cmd) {
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java
index 7426a56..e10c14d 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java
@@ -23,9 +23,9 @@ import java.util.List;
import javax.jdo.listener.InstanceLifecycleEvent;
import org.datanucleus.enhancement.Persistable;
+
import org.apache.isis.commons.internal.assertions._Assert;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.jdo.datanucleus.persistence.queries.PersistenceQueryProcessor;
import org.apache.isis.jdo.jdosupport.IsisJdoSupport_v3_2;
import org.apache.isis.jdo.persistence.IsisLifecycleListener;
import org.apache.isis.jdo.persistence.PersistenceSession5;
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java
index 2379c8a..166b955 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java
@@ -33,6 +33,8 @@ import javax.jdo.identity.LongIdentity;
import javax.jdo.identity.ObjectIdentity;
import javax.jdo.identity.StringIdentity;
+import org.datanucleus.identity.DatastoreId;
+
import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.jdo.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacet;
import org.apache.isis.metamodel.adapter.oid.RootOid;
@@ -41,7 +43,6 @@ import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.runtime.system.context.IsisContext;
import org.apache.isis.runtime.system.session.IsisSessionFactory;
-import org.datanucleus.identity.DatastoreId;
public final class JdoObjectIdSerializer {
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/typeconverters/IsisPasswordConverter.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/typeconverters/IsisPasswordConverter.java
index 604b384..e75aff1 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/typeconverters/IsisPasswordConverter.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/typeconverters/IsisPasswordConverter.java
@@ -19,6 +19,7 @@
package org.apache.isis.jdo.datanucleus.typeconverters;
import org.datanucleus.store.types.converters.TypeConverter;
+
import org.apache.isis.applib.value.Password;
public class IsisPasswordConverter implements TypeConverter<Password, String>{
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/valuetypes/IsisBlobMapping.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/valuetypes/IsisBlobMapping.java
index db9d06f..1e74f99 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/valuetypes/IsisBlobMapping.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/valuetypes/IsisBlobMapping.java
@@ -21,6 +21,7 @@ package org.apache.isis.jdo.datanucleus.valuetypes;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
+
import org.datanucleus.ClassLoaderResolver;
import org.datanucleus.ClassNameConstants;
import org.datanucleus.ExecutionContext;
@@ -29,6 +30,7 @@ import org.datanucleus.metadata.AbstractMemberMetaData;
import org.datanucleus.store.rdbms.RDBMSStoreManager;
import org.datanucleus.store.rdbms.mapping.java.SingleFieldMultiMapping;
import org.datanucleus.store.rdbms.table.Table;
+
import org.apache.isis.applib.value.Blob;
public class IsisBlobMapping extends SingleFieldMultiMapping {
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/valuetypes/IsisMoneyMapping.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/valuetypes/IsisMoneyMapping.java
index e476ebe..dda7ddf 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/valuetypes/IsisMoneyMapping.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/valuetypes/IsisMoneyMapping.java
@@ -20,6 +20,7 @@ package org.apache.isis.jdo.datanucleus.valuetypes;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
+
import org.datanucleus.ClassLoaderResolver;
import org.datanucleus.ClassNameConstants;
import org.datanucleus.ExecutionContext;
@@ -30,6 +31,7 @@ import org.datanucleus.store.rdbms.mapping.MappingManager;
import org.datanucleus.store.rdbms.mapping.java.SingleFieldMultiMapping;
import org.datanucleus.store.rdbms.table.Column;
import org.datanucleus.store.rdbms.table.Table;
+
import org.apache.isis.applib.value.Money;
public class IsisMoneyMapping extends SingleFieldMultiMapping {
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/IsisJdoSupportDN5.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/IsisJdoSupportDN5.java
index 25ad0a5..5f4a97e 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/IsisJdoSupportDN5.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/IsisJdoSupportDN5.java
@@ -19,8 +19,6 @@
package org.apache.isis.jdo.jdosupport;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
@@ -48,6 +46,8 @@ import org.apache.isis.runtime.system.context.IsisContext;
import org.apache.isis.runtime.system.persistence.PersistenceSession;
import org.apache.isis.runtime.system.session.IsisSessionFactory;
+import static org.apache.isis.commons.internal.base._NullSafe.stream;
+
/**
* This service provides a number of utility methods to supplement/support the capabilities of the JDO Objectstore.
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_downloadJdoMetadata.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_downloadJdoMetadata.java
index 73541a6..09f93e6 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_downloadJdoMetadata.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_downloadJdoMetadata.java
@@ -25,6 +25,8 @@ import javax.jdo.PersistenceManagerFactory;
import javax.jdo.metadata.TypeMetadata;
import javax.xml.bind.JAXBException;
+import org.datanucleus.enhancement.Persistable;
+
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.Contributed;
@@ -36,7 +38,6 @@ import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.jdosupport.IsisJdoSupport;
import org.apache.isis.applib.value.Clob;
import org.apache.isis.commons.internal.base._Strings;
-import org.datanucleus.enhancement.Persistable;
@Mixin(method = "act")
public class Persistable_downloadJdoMetadata {
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/DataNucleusApplicationComponents5.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/DataNucleusApplicationComponents5.java
index e15a695..e38cf9c 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/DataNucleusApplicationComponents5.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/DataNucleusApplicationComponents5.java
@@ -33,6 +33,7 @@ import org.datanucleus.api.jdo.JDOPersistenceManagerFactory;
import org.datanucleus.metadata.MetaDataListener;
import org.datanucleus.metadata.MetaDataManager;
import org.datanucleus.store.schema.SchemaAwareStoreManager;
+
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.commons.internal.components.ApplicationScopedComponent;
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/PersistenceSession5.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/PersistenceSession5.java
index ae299b0..5fb5f3e 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/PersistenceSession5.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/PersistenceSession5.java
@@ -18,9 +18,6 @@
*/
package org.apache.isis.jdo.persistence;
-import static java.util.Objects.requireNonNull;
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
-
import java.sql.Timestamp;
import java.text.MessageFormat;
import java.util.ArrayList;
@@ -39,6 +36,10 @@ import javax.jdo.PersistenceManagerFactory;
import javax.jdo.identity.SingleFieldIdentity;
import javax.jdo.listener.InstanceLifecycleListener;
+import org.datanucleus.enhancement.Persistable;
+import org.datanucleus.exceptions.NucleusObjectNotFoundException;
+import org.datanucleus.identity.DatastoreIdImpl;
+
import org.apache.isis.applib.query.Query;
import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
@@ -96,9 +97,9 @@ import org.apache.isis.runtime.system.persistence.PersistenceQuery;
import org.apache.isis.runtime.system.persistence.PersistenceSession;
import org.apache.isis.runtime.system.persistence.adaptermanager.ObjectAdapterContext;
import org.apache.isis.security.authentication.AuthenticationSession;
-import org.datanucleus.enhancement.Persistable;
-import org.datanucleus.exceptions.NucleusObjectNotFoundException;
-import org.datanucleus.identity.DatastoreIdImpl;
+
+import static java.util.Objects.requireNonNull;
+import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
import lombok.Getter;
import lombok.val;
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/PersistenceSessionFactory5.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/PersistenceSessionFactory5.java
index fcfdccf..dddfc3f 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/PersistenceSessionFactory5.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/PersistenceSessionFactory5.java
@@ -25,6 +25,9 @@ import java.util.Objects;
import javax.enterprise.inject.Vetoed;
import javax.jdo.PersistenceManagerFactory;
+import org.datanucleus.PropertyNames;
+import org.datanucleus.api.jdo.JDOPersistenceManagerFactory;
+
import org.apache.isis.commons.internal.base._Blackhole;
import org.apache.isis.commons.internal.base._Lazy;
import org.apache.isis.commons.internal.components.ApplicationScopedComponent;
@@ -38,8 +41,6 @@ import org.apache.isis.runtime.persistence.FixturesInstalledStateHolder;
import org.apache.isis.runtime.system.persistence.PersistenceSession;
import org.apache.isis.runtime.system.persistence.PersistenceSessionFactory;
import org.apache.isis.security.authentication.AuthenticationSession;
-import org.datanucleus.PropertyNames;
-import org.datanucleus.api.jdo.JDOPersistenceManagerFactory;
import lombok.Getter;
import lombok.Setter;
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/Utils.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/Utils.java
index ac4cc87..2e9fde5 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/Utils.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/Utils.java
@@ -23,6 +23,7 @@ import java.sql.Timestamp;
import javax.jdo.listener.InstanceLifecycleEvent;
import org.datanucleus.enhancement.Persistable;
+
import org.apache.isis.metamodel.adapter.version.Version;
import org.apache.isis.security.authentication.AuthenticationSession;
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/GivenJdoDatastoreIdentityAnnotationFacetFactoryTest.java b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/GivenJdoDatastoreIdentityAnnotationFacetFactoryTest.java
index 7f4de9d..904a4bc 100644
--- a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/GivenJdoDatastoreIdentityAnnotationFacetFactoryTest.java
+++ b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/GivenJdoDatastoreIdentityAnnotationFacetFactoryTest.java
@@ -25,9 +25,7 @@ import javax.jdo.annotations.IdGeneratorStrategy;
import javax.jdo.annotations.PersistenceCapable;
import org.datanucleus.enhancement.Persistable;
-import org.apache.isis.jdo.metamodel.facets.object.datastoreidentity.JdoDatastoreIdentityAnnotationFacetFactory;
-import org.apache.isis.jdo.metamodel.facets.object.datastoreidentity.JdoDatastoreIdentityFacet;
-import org.apache.isis.jdo.metamodel.facets.object.datastoreidentity.JdoDatastoreIdentityFacetAnnotation;
+
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/discriminator/GivenJdoDiscriminatorAnnotationFacetFactoryTest.java b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/discriminator/GivenJdoDiscriminatorAnnotationFacetFactoryTest.java
index a43af27..db735ca 100644
--- a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/discriminator/GivenJdoDiscriminatorAnnotationFacetFactoryTest.java
+++ b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/discriminator/GivenJdoDiscriminatorAnnotationFacetFactoryTest.java
@@ -24,10 +24,7 @@ import javax.jdo.annotations.Discriminator;
import javax.jdo.annotations.PersistenceCapable;
import org.datanucleus.enhancement.Persistable;
-import org.apache.isis.jdo.metamodel.facets.object.discriminator.JdoDiscriminatorAnnotationFacetFactory;
-import org.apache.isis.jdo.metamodel.facets.object.discriminator.JdoDiscriminatorFacet;
-import org.apache.isis.jdo.metamodel.facets.object.discriminator.JdoDiscriminatorFacetDefault;
-import org.apache.isis.jdo.metamodel.facets.object.discriminator.ObjectSpecIdFacetInferredFromJdoDiscriminatorValueAnnotation;
+
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/GivenJdoPersistenceCapableAnnotationFacetFactoryTest.java b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/GivenJdoPersistenceCapableAnnotationFacetFactoryTest.java
index b815b44..a597f9d 100644
--- a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/GivenJdoPersistenceCapableAnnotationFacetFactoryTest.java
+++ b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/GivenJdoPersistenceCapableAnnotationFacetFactoryTest.java
@@ -24,9 +24,7 @@ import javax.jdo.annotations.IdentityType;
import javax.jdo.annotations.PersistenceCapable;
import org.datanucleus.enhancement.Persistable;
-import org.apache.isis.jdo.metamodel.facets.object.persistencecapable.JdoPersistenceCapableAnnotationFacetFactory;
-import org.apache.isis.jdo.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacet;
-import org.apache.isis.jdo.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacetAnnotation;
+
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactoryTest.java b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactoryTest.java
index e9598bd..542007c 100644
--- a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactoryTest.java
+++ b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactoryTest.java
@@ -25,8 +25,6 @@ import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.nullValue;
import static org.junit.Assert.assertThat;
-import org.apache.isis.jdo.metamodel.facets.object.query.JdoQueryAnnotationFacetFactory;
-
public class JdoQueryAnnotationFacetFactoryTest {
public static class From_Test extends JdoQueryAnnotationFacetFactoryTest {
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest.java b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest.java
index 67cd6c0..8d22528 100644
--- a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest.java
+++ b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest.java
@@ -24,9 +24,7 @@ import javax.jdo.annotations.PersistenceCapable;
import javax.jdo.annotations.Version;
import org.datanucleus.enhancement.Persistable;
-import org.apache.isis.jdo.metamodel.facets.object.version.JdoVersionAnnotationFacetFactory;
-import org.apache.isis.jdo.metamodel.facets.object.version.JdoVersionFacet;
-import org.apache.isis.jdo.metamodel.facets.object.version.JdoVersionFacetFromAnnotation;
+
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactoryTest.java b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactoryTest.java
index 92b46bd..b5251a9 100644
--- a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactoryTest.java
+++ b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactoryTest.java
@@ -18,21 +18,18 @@
*/
package org.apache.isis.jdo.metamodel.facets.prop.column;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.lang.reflect.Method;
import java.util.List;
-import org.apache.isis.jdo.metamodel.facets.prop.column.BigDecimalDerivedFromJdoColumnAnnotationFacetFactory;
-import org.apache.isis.jdo.metamodel.facets.prop.column.BigDecimalFacetDerivedFromJdoColumn;
-import org.apache.isis.jdo.metamodel.facets.prop.column.BigDecimalFacetFallback;
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;
+
public class BigDecimalDerivedFromJdoColumnAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
private BigDecimalDerivedFromJdoColumnAnnotationFacetFactory facetFactory;
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/column/MandatoryDerivedFromJdoColumnAnnotationFacetFactoryTest.java b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/column/MandatoryDerivedFromJdoColumnAnnotationFacetFactoryTest.java
index 2fff255..e59e51f 100644
--- a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/column/MandatoryDerivedFromJdoColumnAnnotationFacetFactoryTest.java
+++ b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/column/MandatoryDerivedFromJdoColumnAnnotationFacetFactoryTest.java
@@ -18,20 +18,17 @@
*/
package org.apache.isis.jdo.metamodel.facets.prop.column;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.lang.reflect.Method;
import java.util.List;
-import org.apache.isis.jdo.metamodel.facets.prop.column.MandatoryFacetDerivedFromJdoColumn;
-import org.apache.isis.jdo.metamodel.facets.prop.column.MandatoryFacetInferredFromAbsenceOfJdoColumn;
-import org.apache.isis.jdo.metamodel.facets.prop.column.MandatoryFromJdoColumnAnnotationFacetFactory;
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;
+
public class MandatoryDerivedFromJdoColumnAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
private MandatoryFromJdoColumnAnnotationFacetFactory facetFactory;
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/GivenJdoNotPersistentAnnotationFacetFactoryTest.java b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/GivenJdoNotPersistentAnnotationFacetFactoryTest.java
index 76ffd92..8d1cb51 100644
--- a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/GivenJdoNotPersistentAnnotationFacetFactoryTest.java
+++ b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/GivenJdoNotPersistentAnnotationFacetFactoryTest.java
@@ -23,9 +23,6 @@ import java.util.List;
import javax.jdo.annotations.NotPersistent;
-import org.apache.isis.jdo.metamodel.facets.prop.notpersistent.JdoNotPersistentAnnotationFacetFactory;
-import org.apache.isis.jdo.metamodel.facets.prop.notpersistent.JdoNotPersistentFacet;
-import org.apache.isis.jdo.metamodel.facets.prop.notpersistent.NotPersistedFacetDerivedFromJdoNotPersistentAnnotation;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java
index 4bfc23a..5729f4c 100644
--- a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java
+++ b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java
@@ -23,10 +23,6 @@ import java.util.List;
import javax.jdo.annotations.PrimaryKey;
-import org.apache.isis.jdo.metamodel.facets.prop.primarykey.DisabledFacetDerivedFromJdoPrimaryKeyAnnotation;
-import org.apache.isis.jdo.metamodel.facets.prop.primarykey.JdoPrimaryKeyAnnotationFacetFactory;
-import org.apache.isis.jdo.metamodel.facets.prop.primarykey.JdoPrimaryKeyFacet;
-import org.apache.isis.jdo.metamodel.facets.prop.primarykey.OptionalFacetDerivedFromJdoPrimaryKeyAnnotation;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/metamodel/specloader/ObjectReflectorDefaultTest_object.java b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/metamodel/specloader/ObjectReflectorDefaultTest_object.java
index 54111f7..b252e02 100644
--- a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/metamodel/specloader/ObjectReflectorDefaultTest_object.java
+++ b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/metamodel/specloader/ObjectReflectorDefaultTest_object.java
@@ -22,11 +22,6 @@ 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;
@@ -36,8 +31,11 @@ import org.apache.isis.metamodel.facets.object.objectvalidprops.ObjectValidPrope
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 org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.metamodel.specloader.SpecificationLoaderTestAbstract;
+
+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 {
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
index 54d0fe5..ab7ee29 100644
--- a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
+++ b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
@@ -26,16 +26,14 @@ import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+
import org.apache.isis.jdo.persistence.PersistenceSession5;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.adapter.oid.Oid.Factory;
-import org.apache.isis.metamodel.adapter.version.ConcurrencyException;
import org.apache.isis.metamodel.adapter.version.Version;
import org.apache.isis.metamodel.spec.ObjectSpecId;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.runtime.persistence.adapter.PojoAdapter;
-import org.apache.isis.runtime.persistence.adapterfactory.pojo.RuntimeTestPojo;
-import org.apache.isis.runtime.persistence.objectstore.transaction.PojoAdapterBuilder;
import org.apache.isis.security.authentication.AuthenticationSession;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
index c758a86..0e3644f 100644
--- a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
+++ b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
@@ -24,8 +24,8 @@ import java.util.Iterator;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.jdo.persistence.PersistenceSession5;
import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.adapter.oid.RootOid;
import org.apache.isis.metamodel.adapter.oid.Oid.Factory;
+import org.apache.isis.metamodel.adapter.oid.RootOid;
import org.apache.isis.metamodel.adapter.version.Version;
import org.apache.isis.metamodel.spec.ObjectSpecId;
import org.apache.isis.metamodel.spec.ObjectSpecification;
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java
index 496cbd6..231443e 100644
--- a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java
+++ b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java
@@ -19,14 +19,12 @@
package org.apache.isis.runtime.system;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
-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.datanucleus.enhancement.Persistable;
+import org.jmock.Expectations;
+import org.jmock.auto.Mock;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.metamodel.MetaModelContext;
@@ -61,12 +59,15 @@ import org.apache.isis.security.authentication.AuthenticationSession;
import org.apache.isis.security.authentication.AuthenticationSessionProvider;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import org.datanucleus.enhancement.Persistable;
-import org.jmock.Expectations;
-import org.jmock.auto.Mock;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isEmptyString;
+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 {
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject.java b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
index 4d73fe6..9a341bc 100644
--- a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
+++ b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
@@ -69,7 +69,6 @@ import org.apache.isis.security.authentication.AuthenticationSessionProvider;
import org.apache.isis.security.authentication.standard.SimpleSession;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.isis.wrapper.WrapperFactoryDefault;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
index 8247ae3..86ee110 100644
--- a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
+++ b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
@@ -62,7 +62,6 @@ import org.apache.isis.security.authentication.AuthenticationSessionProvider;
import org.apache.isis.security.authentication.standard.SimpleSession;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.isis.wrapper.WrapperFactoryDefault;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/IsisBootSecurityShiro.java b/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/IsisBootSecurityShiro.java
index 326c50d..d95bee5 100644
--- a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/IsisBootSecurityShiro.java
+++ b/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/IsisBootSecurityShiro.java
@@ -20,15 +20,16 @@ package org.apache.isis.security.shiro;
import javax.inject.Singleton;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
import org.apache.isis.security.authentication.manager.AuthorizationManagerStandard;
import org.apache.isis.security.authentication.standard.AuthenticationManagerStandard;
import org.apache.isis.security.authentication.standard.Authenticator;
import org.apache.isis.security.authorization.standard.Authorizor;
import org.apache.isis.security.shiro.authentication.ShiroAuthenticator;
import org.apache.isis.security.shiro.authorization.ShiroAuthorizor;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
/**
* Configuration Bean to support Isis Security using Shiro.
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroSecurityContext.java b/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroSecurityContext.java
index 8679fea..a98501a 100644
--- a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroSecurityContext.java
+++ b/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroSecurityContext.java
@@ -18,13 +18,14 @@
*/
package org.apache.isis.security.shiro;
-import org.apache.isis.security.authentication.standard.Authenticator;
-import org.apache.isis.security.authorization.standard.Authorizor;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.UnavailableSecurityManagerException;
import org.apache.shiro.mgt.RealmSecurityManager;
import org.apache.shiro.mgt.SecurityManager;
+import org.apache.isis.security.authentication.standard.Authenticator;
+import org.apache.isis.security.authorization.standard.Authorizor;
+
/**
* @since 2.0
*/
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/WebModuleShiro.java b/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/WebModuleShiro.java
index 186dc13..c8c71ed 100644
--- a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/WebModuleShiro.java
+++ b/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/WebModuleShiro.java
@@ -18,25 +18,26 @@
*/
package org.apache.isis.security.shiro;
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
-import static org.apache.isis.commons.internal.context._Context.getDefaultClassLoader;
-import static org.apache.isis.commons.internal.exceptions._Exceptions.unexpectedCodeReach;
-
import javax.inject.Singleton;
import javax.servlet.FilterRegistration.Dynamic;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextListener;
import javax.servlet.ServletException;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.webapp.modules.WebModule;
-import org.apache.isis.webapp.modules.WebModuleContext;
import org.apache.shiro.config.Ini;
import org.apache.shiro.web.env.IniWebEnvironment;
import org.apache.shiro.web.env.WebEnvironment;
import org.springframework.core.Ordered;
import org.springframework.core.annotation.Order;
+import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.webapp.modules.WebModule;
+import org.apache.isis.webapp.modules.WebModuleContext;
+
+import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+import static org.apache.isis.commons.internal.context._Context.getDefaultClassLoader;
+import static org.apache.isis.commons.internal.exceptions._Exceptions.unexpectedCodeReach;
+
import lombok.val;
/**
diff --git a/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_setParts.java b/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_setParts.java
index ae4d27c..f203773 100644
--- a/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_setParts.java
+++ b/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_setParts.java
@@ -19,11 +19,12 @@
package org.apache.isis.security.shiro;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import org.junit.Test;
import org.apache.isis.security.shiro.authorization.IsisPermission;
-import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
public class IsisPermissionTest_setParts {
diff --git a/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_typicalUsage.java b/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_typicalUsage.java
index 0593e3e..297bf62 100644
--- a/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_typicalUsage.java
+++ b/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_typicalUsage.java
@@ -18,10 +18,6 @@
*/
package org.apache.isis.security.shiro;
-import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
-
-import org.apache.isis.security.shiro.authorization.IsisPermission;
import org.apache.shiro.authz.Permission;
import org.apache.shiro.authz.permission.WildcardPermission;
import org.hamcrest.Description;
@@ -31,6 +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;
+
public class IsisPermissionTest_typicalUsage {
diff --git a/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIniTest.java b/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIniTest.java
index 58fd461..f40c72d 100644
--- a/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIniTest.java
+++ b/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIniTest.java
@@ -16,10 +16,6 @@
*/
package org.apache.isis.security.shiro.permrolemapper;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.util.Map;
import java.util.Set;
@@ -28,6 +24,10 @@ 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;
+
public class PermissionToRoleMapperFromIniTest {
@Test
diff --git a/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromStringTest.java b/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromStringTest.java
index 448bddd..8053c74 100644
--- a/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromStringTest.java
+++ b/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromStringTest.java
@@ -16,10 +16,6 @@
*/
package org.apache.isis.security.shiro.permrolemapper;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.util.Map;
import java.util.Set;
@@ -27,6 +23,10 @@ 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;
+
public class PermissionToRoleMapperFromStringTest {
@Test
diff --git a/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/UtilTest_parse.java b/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/UtilTest_parse.java
index aa106e5..0431206 100644
--- a/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/UtilTest_parse.java
+++ b/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/UtilTest_parse.java
@@ -18,17 +18,15 @@
*/
package org.apache.isis.security.shiro.permrolemapper;
-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 java.util.Map;
import java.util.Set;
import org.junit.Test;
-import org.apache.isis.security.shiro.permrolemapper.Util;
+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 UtilTest_parse {
diff --git a/core/runtime-extensions/src/main/java/org/apache/isis/runtime/services/hsqldb/HsqlDbManagerMenu.java b/core/runtime-extensions/src/main/java/org/apache/isis/runtime/services/hsqldb/HsqlDbManagerMenu.java
index a9d9f79..6eb8756 100644
--- a/core/runtime-extensions/src/main/java/org/apache/isis/runtime/services/hsqldb/HsqlDbManagerMenu.java
+++ b/core/runtime-extensions/src/main/java/org/apache/isis/runtime/services/hsqldb/HsqlDbManagerMenu.java
@@ -20,6 +20,8 @@ package org.apache.isis.runtime.services.hsqldb;
import javax.annotation.PostConstruct;
+import org.hsqldb.util.DatabaseManagerSwing;
+
import org.apache.isis.applib.IsisApplibModule;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
@@ -32,7 +34,6 @@ import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.runtime.system.context.IsisContext;
-import org.hsqldb.util.DatabaseManagerSwing;
@DomainService(
nature = NatureOfService.VIEW,
diff --git a/core/runtime-extensions/src/main/java/org/apache/isis/wrapper/handlers/AbstractCollectionInvocationHandler.java b/core/runtime-extensions/src/main/java/org/apache/isis/wrapper/handlers/AbstractCollectionInvocationHandler.java
index aea0b8c..322eb2e 100644
--- a/core/runtime-extensions/src/main/java/org/apache/isis/wrapper/handlers/AbstractCollectionInvocationHandler.java
+++ b/core/runtime-extensions/src/main/java/org/apache/isis/wrapper/handlers/AbstractCollectionInvocationHandler.java
@@ -22,10 +22,10 @@ package org.apache.isis.wrapper.handlers;
import java.lang.reflect.Method;
import java.util.List;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.applib.services.wrapper.events.CollectionMethodEvent;
import org.apache.isis.applib.services.wrapper.events.InteractionEvent;
+import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
abstract class AbstractCollectionInvocationHandler<T, C> extends DelegatingInvocationHandlerDefault<C> {
diff --git a/core/runtime-extensions/src/test/java/org/apache/isis/runtime/profiler/ProfilerTest.java b/core/runtime-extensions/src/test/java/org/apache/isis/runtime/profiler/ProfilerTest.java
index c7acd9a..9185e8a 100644
--- a/core/runtime-extensions/src/test/java/org/apache/isis/runtime/profiler/ProfilerTest.java
+++ b/core/runtime-extensions/src/test/java/org/apache/isis/runtime/profiler/ProfilerTest.java
@@ -19,8 +19,6 @@
package org.apache.isis.runtime.profiler;
-import org.apache.isis.runtime.profiler.Profiler;
-
import junit.framework.TestCase;
public class ProfilerTest extends TestCase {
diff --git a/core/runtime-extensions/src/test/java/org/apache/isis/runtime/profiler/ProfilerTestSystem.java b/core/runtime-extensions/src/test/java/org/apache/isis/runtime/profiler/ProfilerTestSystem.java
index 29114e2..27c761a 100644
--- a/core/runtime-extensions/src/test/java/org/apache/isis/runtime/profiler/ProfilerTestSystem.java
+++ b/core/runtime-extensions/src/test/java/org/apache/isis/runtime/profiler/ProfilerTestSystem.java
@@ -19,8 +19,6 @@
package org.apache.isis.runtime.profiler;
-import org.apache.isis.runtime.profiler.ProfilerSystem;
-
public class ProfilerTestSystem extends ProfilerSystem {
long[] memory = new long[] { 10000, 20300, 30000 };
int memoryIndex = 0;
diff --git a/core/runtime-extensions/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest.java b/core/runtime-extensions/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest.java
index 810fd6c..ac60a7d 100644
--- a/core/runtime-extensions/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest.java
+++ b/core/runtime-extensions/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest.java
@@ -27,7 +27,6 @@ import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.wrapper.WrappingObject;
import org.apache.isis.runtime.system.session.IsisSessionFactory;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.wrapper.WrapperFactoryDefault;
import org.apache.isis.wrapper.proxy.ProxyCreator;
import static org.hamcrest.CoreMatchers.is;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/BackgroundServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/BackgroundServiceDefault.java
index 31c9f90..a40cb5b 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/BackgroundServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/BackgroundServiceDefault.java
@@ -18,14 +18,14 @@
*/
package org.apache.isis.runtime.services.background;
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
-
import java.lang.reflect.InvocationHandler;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.inject.Inject;
+import org.springframework.stereotype.Service;
+
import org.apache.isis.applib.services.background.BackgroundCommandService;
import org.apache.isis.applib.services.background.BackgroundService;
import org.apache.isis.applib.services.command.CommandContext;
@@ -40,7 +40,8 @@ import org.apache.isis.metamodel.services.command.CommandDtoServiceInternal;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.metamodel.specloader.classsubstitutor.ProxyEnhanced;
-import org.springframework.stereotype.Service;
+
+import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
import lombok.val;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/ForkingInvocationHandler.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/ForkingInvocationHandler.java
index e222edf..62def77 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/ForkingInvocationHandler.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/ForkingInvocationHandler.java
@@ -18,8 +18,6 @@
*/
package org.apache.isis.runtime.services.background;
-import static org.apache.isis.commons.internal.functions._Functions.uncheckedSupplier;
-
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.util.concurrent.ExecutorService;
@@ -30,6 +28,8 @@ import org.apache.isis.runtime.system.internal.InitialisationSession;
import org.apache.isis.runtime.system.session.IsisSession;
import org.apache.isis.runtime.system.transaction.IsisTransactionAspectSupport;
+import static org.apache.isis.commons.internal.functions._Functions.uncheckedSupplier;
+
import lombok.AllArgsConstructor;
import lombok.NonNull;
import lombok.val;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/email/EmailServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/email/EmailServiceDefault.java
index b13fa71..ce2dde6 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/email/EmailServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/email/EmailServiceDefault.java
@@ -30,6 +30,7 @@ import org.apache.commons.mail.DefaultAuthenticator;
import org.apache.commons.mail.EmailException;
import org.apache.commons.mail.ImageHtmlEmail;
import org.apache.commons.mail.resolver.DataSourceClassPathResolver;
+
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.services.email.EmailService;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/error/EmailTicket.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/error/EmailTicket.java
index 5477731..5deeec2 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/error/EmailTicket.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/error/EmailTicket.java
@@ -18,8 +18,6 @@
*/
package org.apache.isis.runtime.services.error;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-
import java.io.Serializable;
import java.util.List;
import java.util.stream.Collectors;
@@ -27,6 +25,8 @@ import java.util.stream.Collectors;
import org.apache.isis.applib.services.error.ErrorDetails;
import org.apache.isis.applib.services.error.ErrorReportingService;
+import static org.apache.isis.commons.internal.base._NullSafe.stream;
+
/**
* Response from the {@link ErrorReportingService}, containing information to show to the end-user.
*
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/error/SimpleTicket.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/error/SimpleTicket.java
index b5ea11a..a853f04 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/error/SimpleTicket.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/error/SimpleTicket.java
@@ -18,8 +18,6 @@
*/
package org.apache.isis.runtime.services.error;
-import static org.apache.isis.commons.internal.base._NullSafe.isEmpty;
-
import java.io.Serializable;
import java.util.function.UnaryOperator;
@@ -27,6 +25,8 @@ import org.apache.isis.applib.services.error.ErrorReportingService;
import org.apache.isis.applib.services.error.Ticket;
import org.apache.isis.commons.internal.base._Strings;
+import static org.apache.isis.commons.internal.base._NullSafe.isEmpty;
+
/**
* Response from the {@link ErrorReportingService}, containing information to show to the end-user.
*
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/factory/FactoryServiceInternalDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/factory/FactoryServiceInternalDefault.java
index 53819b1..91ca957 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/factory/FactoryServiceInternalDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/factory/FactoryServiceInternalDefault.java
@@ -19,8 +19,6 @@
package org.apache.isis.runtime.services.factory;
-import static org.apache.isis.commons.internal.base._With.requires;
-
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
@@ -41,6 +39,8 @@ import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.runtime.system.session.IsisSessionFactory;
+import static org.apache.isis.commons.internal.base._With.requires;
+
import lombok.val;
@Singleton
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/PoWriter.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/PoWriter.java
index d0fd127..ddb7b00 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/PoWriter.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/PoWriter.java
@@ -21,11 +21,12 @@ package org.apache.isis.runtime.services.i18n.po;
import java.util.SortedMap;
import java.util.SortedSet;
+import org.joda.time.LocalDateTime;
+
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.commons.internal.collections._Sets;
import org.apache.isis.runtime.system.context.IsisContext;
-import org.joda.time.LocalDateTime;
import lombok.extern.log4j.Log4j2;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/TranslationServicePo.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/TranslationServicePo.java
index 73959f9..bf3d64e 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/TranslationServicePo.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/TranslationServicePo.java
@@ -18,8 +18,6 @@
*/
package org.apache.isis.runtime.services.i18n.po;
-import static org.apache.isis.config.internal._Config.getConfiguration;
-
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.inject.Singleton;
@@ -32,6 +30,8 @@ import org.apache.isis.commons.internal.base._Lazy;
import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.runtime.system.context.IsisContext;
+import static org.apache.isis.config.internal._Config.getConfiguration;
+
@Singleton
public class TranslationServicePo implements TranslationService {
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/MenuBarsLoaderServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/MenuBarsLoaderServiceDefault.java
index fe0ce31..c37b72e 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/MenuBarsLoaderServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/MenuBarsLoaderServiceDefault.java
@@ -24,14 +24,15 @@ import java.util.Optional;
import javax.inject.Inject;
import javax.inject.Singleton;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.AbstractResource;
+
import org.apache.isis.applib.layout.menubars.bootstrap3.BS3MenuBars;
import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.services.menu.MenuBarsLoaderService;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.config.beans.WebAppConfigBean;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.AbstractResource;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/message/MessageServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/message/MessageServiceDefault.java
index ad096fa..611f04a 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/message/MessageServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/message/MessageServiceDefault.java
@@ -21,13 +21,14 @@ package org.apache.isis.runtime.services.message;
import javax.inject.Inject;
import javax.inject.Singleton;
+import org.springframework.context.annotation.Primary;
+
import org.apache.isis.applib.RecoverableException;
import org.apache.isis.applib.services.i18n.TranslatableString;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.runtime.system.session.IsisSessionFactory;
import org.apache.isis.security.authentication.MessageBroker;
-import org.springframework.context.annotation.Primary;
@Singleton @Primary
public class MessageServiceDefault implements MessageService {
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 7b153da..55623e9 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
@@ -18,9 +18,6 @@
*/
package org.apache.isis.runtime.services.userreg;
-import static java.util.regex.Pattern.compile;
-import static java.util.regex.Pattern.quote;
-
import java.io.IOException;
import java.net.URL;
import java.util.Collections;
@@ -39,6 +36,9 @@ 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;
+
/**
* A service that sends email notifications when specific events occur
*/
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xactn/TransactionServiceSpring.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xactn/TransactionServiceSpring.java
index 2c37899..612e1a5 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xactn/TransactionServiceSpring.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xactn/TransactionServiceSpring.java
@@ -24,17 +24,18 @@ import java.util.function.Supplier;
import javax.annotation.Nonnull;
import javax.inject.Singleton;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.TransactionCallback;
+import org.springframework.transaction.support.TransactionCallbackWithoutResult;
+import org.springframework.transaction.support.TransactionTemplate;
+
import org.apache.isis.applib.services.xactn.TransactionId;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.applib.services.xactn.TransactionState;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.runtime.system.transaction.IsisTransactionAspectSupport;
import org.apache.isis.runtime.system.transaction.IsisTransactionObject;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.support.TransactionCallback;
-import org.springframework.transaction.support.TransactionCallbackWithoutResult;
-import org.springframework.transaction.support.TransactionTemplate;
import lombok.val;
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 4ae780a..8ee161c 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
@@ -18,14 +18,14 @@
*/
package org.apache.isis.runtime.services.changes;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
import org.junit.Test;
import org.apache.isis.runtime.system.transaction.IsisTransactionPlaceholder;
import org.apache.isis.runtime.system.transaction.PreAndPostValues;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
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 e1aba27..a9cc761 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
@@ -18,10 +18,10 @@
*/
package org.apache.isis.runtime.services.email;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.runtime.services.email.EmailServiceDefault;
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;
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/email/EmailServiceDefaultTest_notEmpty.java b/core/runtime-services/src/test/java/org/apache/isis/runtime/services/email/EmailServiceDefaultTest_notEmpty.java
index ce27891..de36c41 100644
--- a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/email/EmailServiceDefaultTest_notEmpty.java
+++ b/core/runtime-services/src/test/java/org/apache/isis/runtime/services/email/EmailServiceDefaultTest_notEmpty.java
@@ -23,8 +23,6 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.runtime.services.email.EmailServiceDefault;
-
public class EmailServiceDefaultTest_notEmpty {
@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 9ed8047..f2788f5 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
@@ -32,8 +32,6 @@ import org.apache.isis.applib.services.i18n.LocaleProvider;
import org.apache.isis.applib.services.i18n.TranslationsResolver;
import org.apache.isis.commons.collections.Bin;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.runtime.services.i18n.po.PoReader;
-import org.apache.isis.runtime.services.i18n.po.TranslationServicePo;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import static org.hamcrest.CoreMatchers.equalTo;
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/i18n/po/PoWriterTest_escape.java b/core/runtime-services/src/test/java/org/apache/isis/runtime/services/i18n/po/PoWriterTest_escape.java
index cbffc75..b0c17b7 100644
--- a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/i18n/po/PoWriterTest_escape.java
+++ b/core/runtime-services/src/test/java/org/apache/isis/runtime/services/i18n/po/PoWriterTest_escape.java
@@ -24,8 +24,6 @@ import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.runtime.services.i18n.po.PoWriter;
-
public class PoWriterTest_escape {
@Test
diff --git a/core/runtime-web/src/main/java/org/apache/isis/webapp/IsisBootWebApp.java b/core/runtime-web/src/main/java/org/apache/isis/webapp/IsisBootWebApp.java
index 82442b9..854e3d8 100644
--- a/core/runtime-web/src/main/java/org/apache/isis/webapp/IsisBootWebApp.java
+++ b/core/runtime-web/src/main/java/org/apache/isis/webapp/IsisBootWebApp.java
@@ -18,13 +18,14 @@
*/
package org.apache.isis.webapp;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
import org.apache.isis.webapp.modules.h2console.H2ManagerMenu;
import org.apache.isis.webapp.modules.h2console.WebModuleH2Console;
import org.apache.isis.webapp.modules.logonlog.WebModuleLogOnExceptionLogger;
import org.apache.isis.webapp.modules.resources.WebModuleStaticResources;
import org.apache.isis.webapp.modules.sse.WebModuleServerSentEvents;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
@Configuration
@Import({
diff --git a/core/runtime-web/src/main/java/org/apache/isis/webapp/IsisWebAppContextInitializer.java b/core/runtime-web/src/main/java/org/apache/isis/webapp/IsisWebAppContextInitializer.java
index c6e539f..9dc2417 100644
--- a/core/runtime-web/src/main/java/org/apache/isis/webapp/IsisWebAppContextInitializer.java
+++ b/core/runtime-web/src/main/java/org/apache/isis/webapp/IsisWebAppContextInitializer.java
@@ -21,10 +21,11 @@ package org.apache.isis.webapp;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
-import org.apache.isis.commons.internal.context._Context;
import org.springframework.boot.web.servlet.ServletContextInitializer;
import org.springframework.context.annotation.Configuration;
+import org.apache.isis.commons.internal.context._Context;
+
import lombok.extern.log4j.Log4j2;
@Configuration @Log4j2
diff --git a/core/runtime-web/src/main/java/org/apache/isis/webapp/IsisWebAppContextListener.java b/core/runtime-web/src/main/java/org/apache/isis/webapp/IsisWebAppContextListener.java
index 625b34a..00b4526 100644
--- a/core/runtime-web/src/main/java/org/apache/isis/webapp/IsisWebAppContextListener.java
+++ b/core/runtime-web/src/main/java/org/apache/isis/webapp/IsisWebAppContextListener.java
@@ -24,12 +24,13 @@ import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
+import org.springframework.context.ApplicationContext;
+
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.commons.internal.resources._Resources;
import org.apache.isis.webapp.modules.WebModule;
import org.apache.isis.webapp.modules.WebModuleContext;
-import org.springframework.context.ApplicationContext;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/WebModule.java b/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/WebModule.java
index 35e90d1..bbd5505 100644
--- a/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/WebModule.java
+++ b/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/WebModule.java
@@ -28,9 +28,10 @@ import javax.servlet.ServletContextListener;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebListener;
+import org.springframework.core.annotation.Order;
+
import org.apache.isis.runtime.system.context.IsisContext;
import org.apache.isis.webapp.IsisWebAppContextListener;
-import org.springframework.core.annotation.Order;
import lombok.val;
diff --git a/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java b/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java
index 811855c..87306fa 100644
--- a/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java
+++ b/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java
@@ -18,8 +18,6 @@
*/
package org.apache.isis.webapp.modules;
-import static org.apache.isis.commons.internal.base._With.acceptIfPresent;
-
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -35,6 +33,8 @@ import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.internal._Config;
+import static org.apache.isis.commons.internal.base._With.acceptIfPresent;
+
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/h2console/WebModuleH2Console.java b/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/h2console/WebModuleH2Console.java
index ca2adb7..32b31a6 100644
--- a/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/h2console/WebModuleH2Console.java
+++ b/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/h2console/WebModuleH2Console.java
@@ -24,13 +24,14 @@ import javax.servlet.ServletContext;
import javax.servlet.ServletContextListener;
import javax.servlet.ServletException;
+import org.springframework.core.annotation.Order;
+
import org.apache.isis.applib.value.LocalResourcePath;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.webapp.modules.WebModule;
import org.apache.isis.webapp.modules.WebModuleContext;
-import org.springframework.core.annotation.Order;
import lombok.Getter;
import lombok.val;
diff --git a/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java b/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java
index 841115a..2880d2f 100644
--- a/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java
+++ b/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java
@@ -18,10 +18,6 @@
*/
package org.apache.isis.webapp.modules.logonlog;
-import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
-import static org.apache.isis.commons.internal.context._Context.getDefaultClassLoader;
-import static org.apache.isis.commons.internal.exceptions._Exceptions.unexpectedCodeReach;
-
import javax.inject.Singleton;
import javax.servlet.Filter;
import javax.servlet.FilterRegistration.Dynamic;
@@ -29,11 +25,16 @@ import javax.servlet.ServletContext;
import javax.servlet.ServletContextListener;
import javax.servlet.ServletException;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
+
import org.apache.isis.commons.internal.collections._Arrays;
import org.apache.isis.webapp.modules.WebModule;
import org.apache.isis.webapp.modules.WebModuleContext;
-import org.springframework.core.Ordered;
-import org.springframework.core.annotation.Order;
+
+import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+import static org.apache.isis.commons.internal.context._Context.getDefaultClassLoader;
+import static org.apache.isis.commons.internal.exceptions._Exceptions.unexpectedCodeReach;
/**
* WebModule to log log-on exceptions.
diff --git a/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/resources/ResourceServlet.java b/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/resources/ResourceServlet.java
index 409ee98..612a662 100644
--- a/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/resources/ResourceServlet.java
+++ b/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/resources/ResourceServlet.java
@@ -19,11 +19,6 @@
package org.apache.isis.webapp.modules.resources;
-import static org.apache.isis.commons.internal.base._Strings.pair;
-import static org.apache.isis.commons.internal.base._Strings.prefix;
-import static org.apache.isis.commons.internal.base._With.ifPresentElse;
-import static org.apache.isis.commons.internal.base._With.ifPresentElseGet;
-
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
@@ -41,6 +36,11 @@ import org.apache.isis.metamodel.commons.InputStreamExtensions;
import org.apache.isis.metamodel.commons.ResourceUtil;
import org.apache.isis.metamodel.commons.StringExtensions;
+import static org.apache.isis.commons.internal.base._Strings.pair;
+import static org.apache.isis.commons.internal.base._Strings.prefix;
+import static org.apache.isis.commons.internal.base._With.ifPresentElse;
+import static org.apache.isis.commons.internal.base._With.ifPresentElseGet;
+
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/resources/ResourceServlet_HtmlTemplateVariables.java b/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/resources/ResourceServlet_HtmlTemplateVariables.java
index 234f01f..ccc7943 100644
--- a/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/resources/ResourceServlet_HtmlTemplateVariables.java
+++ b/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/resources/ResourceServlet_HtmlTemplateVariables.java
@@ -19,15 +19,15 @@
package org.apache.isis.webapp.modules.resources;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-import static org.apache.isis.commons.internal.base._With.requires;
-
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import org.apache.isis.commons.internal.base._Strings.KeyValuePair;
+import static org.apache.isis.commons.internal.base._NullSafe.stream;
+import static org.apache.isis.commons.internal.base._With.requires;
+
/**
* Package private mixin for ResourceServlet
* @since 2.0
diff --git a/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/resources/WebModuleStaticResources.java b/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/resources/WebModuleStaticResources.java
index 7fc2799..8948b00 100644
--- a/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/resources/WebModuleStaticResources.java
+++ b/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/resources/WebModuleStaticResources.java
@@ -24,9 +24,10 @@ import javax.servlet.ServletContext;
import javax.servlet.ServletContextListener;
import javax.servlet.ServletException;
+import org.springframework.core.annotation.Order;
+
import org.apache.isis.webapp.modules.WebModule;
import org.apache.isis.webapp.modules.WebModuleContext;
-import org.springframework.core.annotation.Order;
/**
* WebModule to provide static resources utilizing an in-memory cache.
diff --git a/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/sse/WebModuleServerSentEvents.java b/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/sse/WebModuleServerSentEvents.java
index 9f265b5..6fba3c0 100644
--- a/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/sse/WebModuleServerSentEvents.java
+++ b/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/sse/WebModuleServerSentEvents.java
@@ -23,9 +23,10 @@ import javax.servlet.ServletContext;
import javax.servlet.ServletContextListener;
import javax.servlet.ServletException;
+import org.springframework.core.annotation.Order;
+
import org.apache.isis.webapp.modules.WebModule;
import org.apache.isis.webapp.modules.WebModuleContext;
-import org.springframework.core.annotation.Order;
import lombok.val;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapter/PojoAdapter.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapter/PojoAdapter.java
index 736f88c..cf54f41 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapter/PojoAdapter.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapter/PojoAdapter.java
@@ -19,8 +19,6 @@
package org.apache.isis.runtime.persistence.adapter;
-import static org.apache.isis.commons.internal.base._With.requires;
-
import java.io.Serializable;
import java.util.Objects;
import java.util.UUID;
@@ -40,6 +38,8 @@ import org.apache.isis.runtime.system.persistence.PersistenceSession;
import org.apache.isis.runtime.system.session.IsisSession;
import org.apache.isis.security.authentication.AuthenticationSession;
+import static org.apache.isis.commons.internal.base._With.requires;
+
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeEventSupport_Spring.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeEventSupport_Spring.java
index 33002a4..73b74e9 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeEventSupport_Spring.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeEventSupport_Spring.java
@@ -20,11 +20,12 @@ package org.apache.isis.runtime.system.context.session;
import javax.enterprise.event.Event;
-import org.apache.isis.commons.internal.ioc.spring._Spring;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import org.apache.isis.commons.internal.ioc.spring._Spring;
+
@Configuration
public class RuntimeEventSupport_Spring {
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/JdoPersistenceLifecycleService.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/JdoPersistenceLifecycleService.java
index 2923429..27759b8 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/JdoPersistenceLifecycleService.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/JdoPersistenceLifecycleService.java
@@ -21,6 +21,9 @@ package org.apache.isis.runtime.system.persistence;
import javax.annotation.PostConstruct;
import javax.inject.Singleton;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.event.EventListener;
+
import org.apache.isis.commons.internal.base._With;
import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.commons.internal.exceptions._Exceptions;
@@ -30,8 +33,6 @@ import org.apache.isis.runtime.system.context.session.AppLifecycleEvent;
import org.apache.isis.runtime.system.context.session.SessionLifecycleEvent;
import org.apache.isis.runtime.system.session.IsisSession;
import org.apache.isis.runtime.system.session.IsisSessionFactory;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.event.EventListener;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext.java
index c9b6b2f..3a8c7b2 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext.java
@@ -21,8 +21,8 @@ package org.apache.isis.runtime.system.persistence.adaptermanager;
import java.util.Objects;
import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.commons.internal.assertions._Assert;
import org.apache.isis.commons.internal.assertions.IsisAssertException;
+import org.apache.isis.commons.internal.assertions._Assert;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.adapter.ObjectAdapterByIdProvider;
import org.apache.isis.metamodel.adapter.ObjectAdapterProvider;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext_Factories.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext_Factories.java
index f72ad1b..be60bd4 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext_Factories.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext_Factories.java
@@ -18,6 +18,7 @@
*/
package org.apache.isis.runtime.system.persistence.adaptermanager;
+import org.apache.isis.commons.internal.assertions._Assert;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.adapter.oid.Oid;
import org.apache.isis.metamodel.adapter.oid.ParentedOid;
@@ -31,8 +32,6 @@ import org.apache.isis.runtime.system.session.IsisSession;
import static org.apache.isis.commons.internal.base._With.requires;
-import org.apache.isis.commons.internal.assertions._Assert;
-
import lombok.RequiredArgsConstructor;
/**
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterLegacy.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterLegacy.java
index fd89210..dfd0626 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterLegacy.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterLegacy.java
@@ -24,8 +24,8 @@ import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.oid.RootOid;
import org.apache.isis.metamodel.adapter.oid.Oid.Factory;
+import org.apache.isis.metamodel.adapter.oid.RootOid;
import org.apache.isis.runtime.system.context.IsisContext;
import org.apache.isis.runtime.system.persistence.PersistenceSession;
import org.apache.isis.schema.common.v1.CollectionDto;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/IsisTransactionObject.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/IsisTransactionObject.java
index 8a89cc9..8e6f6ba 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/IsisTransactionObject.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/IsisTransactionObject.java
@@ -20,9 +20,10 @@ package org.apache.isis.runtime.system.transaction;
import java.util.concurrent.CountDownLatch;
+import org.springframework.transaction.support.SmartTransactionObject;
+
import org.apache.isis.applib.services.xactn.Transaction;
import org.apache.isis.applib.services.xactn.TransactionId;
-import org.springframework.transaction.support.SmartTransactionObject;
import lombok.Getter;
import lombok.Setter;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/PersistenceSessionServiceInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/PersistenceSessionServiceInternalDefault.java
index 37e457a..eda7a9f 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/PersistenceSessionServiceInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/PersistenceSessionServiceInternalDefault.java
@@ -18,9 +18,6 @@
*/
package org.apache.isis.runtime.system.transaction;
-import static org.apache.isis.commons.internal.base._With.acceptIfPresent;
-import static org.apache.isis.commons.internal.base._With.mapIfPresentElse;
-
import java.util.List;
import javax.inject.Inject;
@@ -42,6 +39,9 @@ import org.apache.isis.runtime.system.context.IsisContext;
import org.apache.isis.runtime.system.persistence.PersistenceSession;
import org.apache.isis.runtime.system.session.IsisSessionFactory;
+import static org.apache.isis.commons.internal.base._With.acceptIfPresent;
+import static org.apache.isis.commons.internal.base._With.mapIfPresentElse;
+
@Singleton
public class PersistenceSessionServiceInternalDefault
implements PersistenceSessionServiceInternal {
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/MethodFinderUtilsTest.java b/core/runtime/src/test/java/org/apache/isis/runtime/system/MethodFinderUtilsTest.java
index 24b1673..fb2ca4e 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/MethodFinderUtilsTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/runtime/system/MethodFinderUtilsTest.java
@@ -19,24 +19,25 @@
package org.apache.isis.runtime.system;
-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 java.lang.reflect.Method;
import java.util.Arrays;
import java.util.Collection;
-import org.apache.isis.metamodel.commons.ClassExtensions;
-import org.apache.isis.metamodel.commons.MethodUtil;
-import org.apache.isis.metamodel.methodutils.MethodScope;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+import org.apache.isis.metamodel.commons.ClassExtensions;
+import org.apache.isis.metamodel.commons.MethodUtil;
+import org.apache.isis.metamodel.methodutils.MethodScope;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
@RunWith(Parameterized.class)
public class MethodFinderUtilsTest {
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 9fc48f7..c62bc09 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
@@ -19,11 +19,6 @@
package org.apache.isis.runtime.system;
-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.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Before;
@@ -31,7 +26,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.config.internal._Config;
import org.apache.isis.metamodel.MetaModelContext;
import org.apache.isis.metamodel.facets.FacetedMethod;
import org.apache.isis.metamodel.facets.all.named.NamedFacet;
@@ -43,6 +37,11 @@ import org.apache.isis.security.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 1f2b6e0..8cddf1c 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
@@ -19,10 +19,6 @@
package org.apache.isis.runtime.system;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Before;
@@ -31,7 +27,6 @@ import org.junit.Test;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.services.message.MessageService;
-import org.apache.isis.config.internal._Config;
import org.apache.isis.metamodel.MetaModelContext;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
@@ -48,6 +43,10 @@ import org.apache.isis.security.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 4ef44ef..71c57d9 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
@@ -19,17 +19,18 @@
package org.apache.isis.runtime.system;
-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 java.lang.reflect.Method;
import java.util.List;
-import org.apache.isis.metamodel.specloader.traverser.TypeExtractorMethodReturn;
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;
+
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 7866a29..d013695 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
@@ -22,12 +22,13 @@ package org.apache.isis.runtime.system;
import java.lang.reflect.Method;
import java.util.List;
-import org.apache.isis.metamodel.specloader.traverser.TypeExtractorMethodParameters;
import org.hamcrest.Description;
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;
diff --git a/core/security/src/main/java/org/apache/isis/security/IsisBootSecurityBypass.java b/core/security/src/main/java/org/apache/isis/security/IsisBootSecurityBypass.java
index a8580db..2d15db2 100644
--- a/core/security/src/main/java/org/apache/isis/security/IsisBootSecurityBypass.java
+++ b/core/security/src/main/java/org/apache/isis/security/IsisBootSecurityBypass.java
@@ -20,15 +20,16 @@ package org.apache.isis.security;
import javax.inject.Singleton;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
import org.apache.isis.security.authentication.bypass.AuthenticatorBypass;
import org.apache.isis.security.authentication.manager.AuthorizationManagerStandard;
import org.apache.isis.security.authentication.standard.AuthenticationManagerStandard;
import org.apache.isis.security.authentication.standard.Authenticator;
import org.apache.isis.security.authorization.bypass.AuthorizorBypass;
import org.apache.isis.security.authorization.standard.Authorizor;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
/**
* Auth/bypass for eg. Integration Testing
diff --git a/core/security/src/test/java/org/apache/isis/security/EncodabilityContractTest.java b/core/security/src/test/java/org/apache/isis/security/EncodabilityContractTest.java
index 99ce9d5..29ce025 100644
--- a/core/security/src/test/java/org/apache/isis/security/EncodabilityContractTest.java
+++ b/core/security/src/test/java/org/apache/isis/security/EncodabilityContractTest.java
@@ -19,11 +19,6 @@
package org.apache.isis.security;
-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 java.io.IOException;
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
@@ -32,12 +27,18 @@ import org.jmock.Mockery;
import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Before;
import org.junit.Test;
+
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.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/src/test/java/org/apache/isis/security/authentication/fixture/LogonFixtureAuthenticatorTest.java b/core/security/src/test/java/org/apache/isis/security/authentication/fixture/LogonFixtureAuthenticatorTest.java
index 7f22122..db94934 100644
--- a/core/security/src/test/java/org/apache/isis/security/authentication/fixture/LogonFixtureAuthenticatorTest.java
+++ b/core/security/src/test/java/org/apache/isis/security/authentication/fixture/LogonFixtureAuthenticatorTest.java
@@ -26,13 +26,13 @@ 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.authentication.AuthenticationRequestAbstract;
import org.apache.isis.security.authentication.fixtures.AuthenticationRequestLogonFixture;
import org.apache.isis.security.authentication.fixtures.LogonFixtureAuthenticator;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
@RunWith(JMock.class)
public class LogonFixtureAuthenticatorTest {
diff --git a/core/security/src/test/java/org/apache/isis/security/authentication/standard/AuthenticatorDefaultTest.java b/core/security/src/test/java/org/apache/isis/security/authentication/standard/AuthenticatorDefaultTest.java
index a6e9007..a075438 100644
--- a/core/security/src/test/java/org/apache/isis/security/authentication/standard/AuthenticatorDefaultTest.java
+++ b/core/security/src/test/java/org/apache/isis/security/authentication/standard/AuthenticatorDefaultTest.java
@@ -26,12 +26,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.security.authentication.AuthenticationRequest;
-import org.apache.isis.security.authentication.standard.AuthenticatorAbstract;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
@RunWith(JMock.class)
public class AuthenticatorDefaultTest {
diff --git a/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java b/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java
index a86c26b..796954e 100644
--- a/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java
+++ b/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java
@@ -21,8 +21,8 @@ package org.apache.isis.security.authentication.standard;
import org.jmock.integration.junit4.JMock;
import org.junit.runner.RunWith;
+
import org.apache.isis.commons.internal.encoding.Encodable;
-import org.apache.isis.security.authentication.standard.SimpleSession;
@RunWith(JMock.class)
public class SimpleSessionEncodabilityNoRolesTest extends SimpleSessionEncodabilityTestAbstract {
diff --git a/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java b/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java
index 1b457ec..d1c5b62 100644
--- a/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java
+++ b/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java
@@ -19,13 +19,12 @@
package org.apache.isis.security.authentication.standard;
+import org.apache.isis.security.EncodabilityContractTest;
+
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.authentication.standard.SimpleSession;
-
public abstract class SimpleSessionEncodabilityTestAbstract extends EncodabilityContractTest {
@Override
diff --git a/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java b/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java
index 697d5d2..a51dc33 100644
--- a/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java
+++ b/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java
@@ -21,8 +21,8 @@ package org.apache.isis.security.authentication.standard;
import org.jmock.integration.junit4.JMock;
import org.junit.runner.RunWith;
+
import org.apache.isis.commons.internal.encoding.Encodable;
-import org.apache.isis.security.authentication.standard.SimpleSession;
@RunWith(JMock.class)
public class SimpleSessionEncodabilityWithRolesTest extends SimpleSessionEncodabilityTestAbstract {
diff --git a/core/security/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java b/core/security/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
index 171c5d6..7f48956 100644
--- a/core/security/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
+++ b/core/security/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
@@ -30,15 +30,12 @@ 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.authentication.AuthenticationRequest;
import org.apache.isis.security.authentication.AuthenticationRequestPassword;
import org.apache.isis.security.authentication.AuthenticationSession;
-import org.apache.isis.security.authentication.standard.AuthenticationManagerStandard;
-import org.apache.isis.security.authentication.standard.Authenticator;
-import org.apache.isis.security.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/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticatorsTest.java b/core/security/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticatorsTest.java
index 2bde68c..13eab36 100644
--- a/core/security/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticatorsTest.java
+++ b/core/security/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticatorsTest.java
@@ -21,10 +21,6 @@ package org.apache.isis.security.authentication.standard;
import java.util.List;
-import org.apache.isis.security.authentication.AuthenticationRequestPassword;
-import org.apache.isis.security.authentication.standard.AuthenticationManagerStandard;
-import org.apache.isis.security.authentication.standard.Authenticator;
-import org.apache.isis.security.authentication.standard.NoAuthenticatorException;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
@@ -32,6 +28,8 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.apache.isis.security.authentication.AuthenticationRequestPassword;
+
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.sameInstance;
import static org.junit.Assert.assertThat;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java
index b1fc4c1..206ab13 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java
@@ -18,20 +18,6 @@
*/
package org.apache.isis.unittestsupport.bidir;
-import static org.apache.isis.commons.internal.collections._Collections.toHashSet;
-import static org.apache.isis.commons.internal.reflection._Reflect.streamAllFields;
-import static org.apache.isis.commons.internal.reflection._Reflect.streamAllMethods;
-import static org.apache.isis.commons.internal.reflection._Reflect.withName;
-import static org.apache.isis.unittestsupport.utils.ReflectUtils.withEntityParameter;
-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.apache.isis.commons.internal.reflection._Reflect.withMethodParametersCount;
-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 java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
@@ -42,11 +28,26 @@ import java.util.function.Predicate;
import javax.jdo.annotations.Persistent;
+import org.hamcrest.Matchers;
+
import org.apache.isis.unittestsupport.AbstractApplyToAllContractTest;
import org.apache.isis.unittestsupport.utils.CollectUtils;
import org.apache.isis.unittestsupport.utils.ReflectUtils;
import org.apache.isis.unittestsupport.utils.StringUtils;
-import org.hamcrest.Matchers;
+
+import static org.apache.isis.commons.internal.collections._Collections.toHashSet;
+import static org.apache.isis.commons.internal.reflection._Reflect.streamAllFields;
+import static org.apache.isis.commons.internal.reflection._Reflect.streamAllMethods;
+import static org.apache.isis.commons.internal.reflection._Reflect.withMethodParametersCount;
+import static org.apache.isis.commons.internal.reflection._Reflect.withName;
+import static org.apache.isis.unittestsupport.utils.ReflectUtils.withEntityParameter;
+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/unittestsupport/src/main/java/org/apache/isis/unittestsupport/comparable/ComparableContractTester.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/comparable/ComparableContractTester.java
index 5533dbf..176abe3 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/comparable/ComparableContractTester.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/comparable/ComparableContractTester.java
@@ -18,14 +18,15 @@
*/
package org.apache.isis.unittestsupport.comparable;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.util.List;
-import org.apache.isis.commons.internal.collections._Lists;
import org.hamcrest.Matchers;
+import org.apache.isis.commons.internal.collections._Lists;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public class ComparableContractTester<T extends Comparable<T>> {
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAbstract.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAbstract.java
index 5228cad..700408a 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAbstract.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAbstract.java
@@ -18,11 +18,6 @@
*/
package org.apache.isis.unittestsupport.inject;
-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;
-
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.Set;
@@ -30,6 +25,11 @@ import java.util.Set;
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
* is defined in a superclass.
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jaxb/JaxbMatchers.java b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jaxb/JaxbMatchers.java
index 3536d2d..cfd5b35 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jaxb/JaxbMatchers.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jaxb/JaxbMatchers.java
@@ -33,11 +33,12 @@ import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.resources._Resources;
import org.hamcrest.Matcher;
... 7547 lines suppressed ...