You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/04/14 08:54:25 UTC
[isis] branch master updated: ISIS-2493: housekeeping: organize
imports on metamodel
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 2fb1432 ISIS-2493: housekeeping: organize imports on metamodel
2fb1432 is described below
commit 2fb1432c252e3186712f29cefd1593b472805461
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Apr 14 10:54:14 2021 +0200
ISIS-2493: housekeeping: organize imports on metamodel
---
.../core/metamodel/adapter/oid/Oid_Marshaller.java | 2 +-
.../core/metamodel/consent/InteractionAdvisor.java | 1 -
.../isis/core/metamodel/facets/ActionSupport.java | 10 ++++----
.../core/metamodel/facets/ParameterSupport.java | 26 ++++++++++-----------
.../action/explicit/ActionExplicitFacet.java | 6 -----
.../explicit/ActionExplicitFacetAbstract.java | 27 ----------------------
...ctionInvocationFacetForDomainEventAbstract.java | 11 ---------
...tributingFacetDerivedFromMixinFacetFactory.java | 2 +-
.../ActionDefaultsFacetViaMethodFactory.java | 4 ++--
.../facets/collections/CollectionFacet.java | 3 +--
.../modify/CollectionDomainEventFacet.java | 2 --
.../DisableForContextFacetViaMethodFactory.java | 6 ++---
.../facets/members/hidden/HiddenFacetAbstract.java | 15 ++++++++----
.../HideForContextFacetViaMethodFactory.java | 6 ++---
.../members/layout/group/LayoutGroupFacet.java | 2 +-
.../method/ActionChoicesFacetViaMethodFactory.java | 4 ++--
...ActionParameterHiddenFacetViaMethodFactory.java | 2 +-
.../PropertyAutoCompleteFacetMethodFactory.java | 4 ++--
.../PropertyChoicesFacetViaMethodFactory.java | 4 ++--
.../PropertyDefaultFacetViaMethodFactory.java | 4 ++--
...sfySpecificationFacetForPropertyAnnotation.java | 3 ---
.../SnapshotExcludeFacetForPropertyAnnotation.java | 2 +-
.../PropertyValidateFacetViaMethodFactory.java | 4 ++--
.../cmd/v2/CommandDtoValueSemanticsProvider.java | 3 ---
.../datesql/JavaSqlDateValueSemanticsProvider.java | 1 -
.../localtime/LocalTimeValueSemanticsProvider.java | 2 --
.../OffsetDateTimeValueSemanticsProvider.java | 2 --
.../{MethodFinder2.java => MethodFinder.java} | 2 +-
.../MethodPrefixBasedFacetFactoryAbstract.java | 2 --
.../services/grid/GridLoaderServiceDefault.java | 2 +-
.../services/grid/GridSystemServiceAbstract.java | 4 ++--
.../grid/bootstrap3/GridSystemServiceBS3.java | 4 ++--
.../services/ixn/InteractionDtoFactory.java | 2 --
.../core/metamodel/spec/feature/ObjectAction.java | 4 ++--
.../specloader/facetprocessor/FacetProcessor.java | 2 +-
35 files changed, 61 insertions(+), 119 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Marshaller.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Marshaller.java
index 1e0a10e..86abeec 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Marshaller.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Marshaller.java
@@ -141,7 +141,7 @@ final class Oid_Marshaller implements Oid.Marshaller, Oid.Unmarshaller {
throw _Exceptions.illegalArgument("Could not parse OID '" + oidStr + "'; should match pattern: " + OIDSTR_PATTERN.pattern());
}
- final String isTransientOrViewModelStr = getGroup(matcher, 3); // deprecated
+ //final String isTransientOrViewModelStr = getGroup(matcher, 3); // deprecated
final String rootObjectType = getGroup(matcher, 4);
if(_Strings.isEmpty(rootObjectType)) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisor.java
index 3c27a1a..a4bcdee 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisor.java
@@ -26,7 +26,6 @@ import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.interactions.InteractionAdvisorFacet;
-import org.apache.isis.core.metamodel.interactions.InteractionContext;
/**
* Marker interface for implementations (specifically, {@link Facet}s) that can
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ActionSupport.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ActionSupport.java
index c73ecd4..cc87175 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ActionSupport.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ActionSupport.java
@@ -29,7 +29,7 @@ import javax.annotation.Nullable;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.collections._Arrays;
-import org.apache.isis.core.metamodel.methods.MethodFinder2;
+import org.apache.isis.core.metamodel.methods.MethodFinder;
import org.apache.isis.core.metamodel.methods.MethodFinderUtils.MethodAndPpmConstructor;
import lombok.Builder;
@@ -118,13 +118,13 @@ public final class ActionSupport {
switch(searchRequest.getReturnType()) {
case BOOLEAN:
- MethodFinder2
+ MethodFinder
.findMethodWithPPMArg_returningBoolean(type, methodNames, paramTypes, additionalParamTypes)
.map(ActionSupport::toSearchResult)
.forEach(onMethodFound);
break;
case TEXT:
- MethodFinder2
+ MethodFinder
.findMethodWithPPMArg_returningText(type, methodNames, paramTypes, additionalParamTypes)
.map(ActionSupport::toSearchResult)
.forEach(onMethodFound);
@@ -163,13 +163,13 @@ public final class ActionSupport {
switch(searchRequest.getReturnType()) {
case BOOLEAN:
- MethodFinder2
+ MethodFinder
.findMethod_returningBoolean(type, methodNames, paramTypesToLookFor)
.map(ActionSupport::toSearchResult)
.forEach(onMethodFound);
break;
case TEXT:
- MethodFinder2
+ MethodFinder
.findMethod_returningText(type, methodNames, paramTypesToLookFor)
.map(ActionSupport::toSearchResult)
.forEach(onMethodFound);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ParameterSupport.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ParameterSupport.java
index 72b512c..7f6dd47 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ParameterSupport.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ParameterSupport.java
@@ -30,7 +30,7 @@ import javax.annotation.Nullable;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.collections._Arrays;
-import org.apache.isis.core.metamodel.methods.MethodFinder2;
+import org.apache.isis.core.metamodel.methods.MethodFinder;
import org.apache.isis.core.metamodel.methods.MethodFinderUtils.MethodAndPpmConstructor;
import lombok.Builder;
@@ -137,25 +137,25 @@ public final class ParameterSupport {
switch(searchRequest.getReturnType()) {
case BOOLEAN:
- MethodFinder2
+ MethodFinder
.findMethodWithPPMArg_returningBoolean(type, methodNames, paramTypes, additionalParamTypes)
.map(methodAndPpmConstructor->toSearchResult(paramIndex, paramType, methodAndPpmConstructor))
.forEach(onMethodFound);
break;
case TEXT:
- MethodFinder2
+ MethodFinder
.findMethodWithPPMArg_returningText(type, methodNames, paramTypes, additionalParamTypes)
.map(methodAndPpmConstructor->toSearchResult(paramIndex, paramType, methodAndPpmConstructor))
.forEach(onMethodFound);
break;
case NON_SCALAR:
- MethodFinder2
+ MethodFinder
.findMethodWithPPMArg_returningNonScalar(type, methodNames, paramType, paramTypes, additionalParamTypes)
.map(methodAndPpmConstructor->toSearchResult(paramIndex, paramType, methodAndPpmConstructor))
.forEach(onMethodFound);
break;
case SAME_AS_PARAMETER_TYPE:
- MethodFinder2
+ MethodFinder
.findMethodWithPPMArg(type, methodNames, paramType, paramTypes, additionalParamTypes)
.map(methodAndPpmConstructor->toSearchResult(paramIndex, paramType, methodAndPpmConstructor))
.forEach(onMethodFound);
@@ -191,25 +191,25 @@ public final class ParameterSupport {
switch(searchRequest.getReturnType()) {
case BOOLEAN:
- MethodFinder2
+ MethodFinder
.findMethod_returningBoolean(type, methodNames, singleArg)
.map(supportingMethod->toSearchResult(paramIndex, paramType, supportingMethod))
.forEach(onMethodFound);
break;
case TEXT:
- MethodFinder2
+ MethodFinder
.findMethod_returningText(type, methodNames, singleArg)
.map(supportingMethod->toSearchResult(paramIndex, paramType, supportingMethod))
.forEach(onMethodFound);
break;
case NON_SCALAR:
- MethodFinder2
+ MethodFinder
.findMethod_returningNonScalar(type, methodNames, paramType, singleArg)
.map(supportingMethod->toSearchResult(paramIndex, paramType, supportingMethod))
.forEach(onMethodFound);
break;
case SAME_AS_PARAMETER_TYPE:
- MethodFinder2
+ MethodFinder
.findMethod(type, methodNames, paramType, singleArg)
.map(supportingMethod->toSearchResult(paramIndex, paramType, supportingMethod))
.forEach(onMethodFound);
@@ -244,25 +244,25 @@ public final class ParameterSupport {
switch(searchRequest.getReturnType()) {
case BOOLEAN:
- supportingMethod = MethodFinder2
+ supportingMethod = MethodFinder
.findMethod_returningBoolean(type, methodNames, paramTypesToLookFor)
.findFirst()
.orElse(null);
break;
case TEXT:
- supportingMethod = MethodFinder2
+ supportingMethod = MethodFinder
.findMethod_returningText(type, methodNames, paramTypesToLookFor)
.findFirst()
.orElse(null);
break;
case NON_SCALAR:
- supportingMethod = MethodFinder2
+ supportingMethod = MethodFinder
.findMethod_returningNonScalar(type, methodNames, paramType, paramTypesToLookFor)
.findFirst()
.orElse(null);
break;
case SAME_AS_PARAMETER_TYPE:
- supportingMethod = MethodFinder2
+ supportingMethod = MethodFinder
.findMethod(type, methodNames, paramType, paramTypesToLookFor)
.findFirst()
.orElse(null);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/explicit/ActionExplicitFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/explicit/ActionExplicitFacet.java
index b5d3380..393330b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/explicit/ActionExplicitFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/explicit/ActionExplicitFacet.java
@@ -19,13 +19,7 @@
package org.apache.isis.core.metamodel.facets.actions.action.explicit;
-import java.util.List;
-
-import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
/**
* Indicates that this method has been explicitly indicated as an action.
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/explicit/ActionExplicitFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/explicit/ActionExplicitFacetAbstract.java
index ab2fff6..1b3cb8b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/explicit/ActionExplicitFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/explicit/ActionExplicitFacetAbstract.java
@@ -19,35 +19,8 @@
package org.apache.isis.core.metamodel.facets.actions.action.explicit;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.isis.applib.events.domain.AbstractDomainEvent;
-import org.apache.isis.applib.events.domain.ActionDomainEvent;
-import org.apache.isis.applib.services.i18n.TranslatableString;
-import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.applib.services.wrapper.events.InteractionEvent;
-import org.apache.isis.applib.services.wrapper.events.UsabilityEvent;
-import org.apache.isis.applib.services.wrapper.events.ValidityEvent;
-import org.apache.isis.applib.services.wrapper.events.VisibilityEvent;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facetapi.IdentifiedHolder;
-import org.apache.isis.core.metamodel.facets.DomainEventHelper;
-import org.apache.isis.core.metamodel.facets.SingleClassValueFacetAbstract;
-import org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionDomainEventFacet;
-import org.apache.isis.core.metamodel.interactions.ActionInteractionContext;
-import org.apache.isis.core.metamodel.interactions.ActionValidityContext;
-import org.apache.isis.core.metamodel.interactions.InteractionContext;
-import org.apache.isis.core.metamodel.interactions.UsabilityContext;
-import org.apache.isis.core.metamodel.interactions.ValidityContext;
-import org.apache.isis.core.metamodel.interactions.VisibilityContext;
-import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-
-import lombok.Getter;
-import lombok.Setter;
-import lombok.val;
public abstract class ActionExplicitFacetAbstract
extends FacetAbstract
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
index 01d0638..91cc31d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
@@ -33,7 +33,6 @@ import org.apache.isis.applib.services.queryresultscache.QueryResultsCache;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.assertions._Assert;
-import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.collections._Arrays;
import org.apache.isis.core.metamodel.commons.CanonicalParameterUtil;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
@@ -151,16 +150,6 @@ implements ImperativeFacet {
getIdentified());
}
- private static String trim(String message, final int maxLen) {
- if(!_Strings.isNullOrEmpty(message)) {
- message = message.substring(0, Math.min(message.length(), maxLen));
- if(message.length() == maxLen) {
- message += " ...";
- }
- }
- return message;
- }
-
private Object invokeMethodElseFromCache(
final ManagedObject targetAdapter,
final Can<ManagedObject> arguments)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/derived/ContributingFacetDerivedFromMixinFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/derived/ContributingFacetDerivedFromMixinFacetFactory.java
index 3d36899..409c1bd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/derived/ContributingFacetDerivedFromMixinFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/derived/ContributingFacetDerivedFromMixinFacetFactory.java
@@ -24,8 +24,8 @@ import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.actions.contributing.ContributingFacetAbstract;
import org.apache.isis.core.metamodel.facets.actions.contributing.ContributingFacet.Contributing;
+import org.apache.isis.core.metamodel.facets.actions.contributing.ContributingFacetAbstract;
import org.apache.isis.core.metamodel.facets.object.mixin.MixinFacet;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/defaults/method/ActionDefaultsFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/defaults/method/ActionDefaultsFacetViaMethodFactory.java
index fbdcefb..49d0d21 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/defaults/method/ActionDefaultsFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/defaults/method/ActionDefaultsFacetViaMethodFactory.java
@@ -25,7 +25,7 @@ import java.util.List;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.methods.MethodFinder2;
+import org.apache.isis.core.metamodel.methods.MethodFinder;
import org.apache.isis.core.metamodel.methods.MethodLiteralConstants;
import org.apache.isis.core.metamodel.methods.MethodPrefixBasedFacetFactoryAbstract;
@@ -71,7 +71,7 @@ public class ActionDefaultsFacetViaMethodFactory extends MethodPrefixBasedFacetF
val cls = processMethodContext.getCls();
val namingConvention = getNamingConventionForActionSupport(processMethodContext, PREFIX);
- return MethodFinder2.findMethod(
+ return MethodFinder.findMethod(
cls, namingConvention, returnType, NO_ARG)
.findFirst()
.orElse(null);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/CollectionFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/CollectionFacet.java
index 848da1c..f6affcc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/CollectionFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/CollectionFacet.java
@@ -49,11 +49,10 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ManagedObjects.UnwrapUtil;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import static org.apache.isis.commons.internal.base._With.requires;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-
import lombok.val;
import lombok.experimental.UtilityClass;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacet.java
index 8d79acb..d379bc5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacet.java
@@ -20,9 +20,7 @@
package org.apache.isis.core.metamodel.facets.collections.collection.modify;
import org.apache.isis.core.metamodel.facets.SingleClassValueFacet;
-import org.apache.isis.core.metamodel.interactions.DisablingInteractionAdvisor;
import org.apache.isis.core.metamodel.interactions.HidingInteractionAdvisor;
-import org.apache.isis.core.metamodel.interactions.ValidatingInteractionAdvisor;
/**
* Corresponds to <tt>@Collection(domainEvent=...)</tt> annotation in the Isis programming model.
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java
index d02814d..c042f1f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java
@@ -25,7 +25,7 @@ import org.apache.isis.applib.services.i18n.TranslationContext;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facetapi.IdentifiedHolder;
-import org.apache.isis.core.metamodel.methods.MethodFinder2;
+import org.apache.isis.core.metamodel.methods.MethodFinder;
import org.apache.isis.core.metamodel.methods.MethodLiteralConstants;
import org.apache.isis.core.metamodel.methods.MethodPrefixBasedFacetFactoryAbstract;
@@ -59,7 +59,7 @@ extends MethodPrefixBasedFacetFactoryAbstract {
boolean searchExactMatch = !noParamsOnly;
if(searchExactMatch) {
// search for exact match
- disableMethod = MethodFinder2.findMethod_returningText(
+ disableMethod = MethodFinder.findMethod_returningText(
cls,
namingConvention,
actionOrGetter.getParameterTypes())
@@ -68,7 +68,7 @@ extends MethodPrefixBasedFacetFactoryAbstract {
}
if (disableMethod == null) {
// search for no-arg version
- disableMethod = MethodFinder2.findMethod_returningText(
+ disableMethod = MethodFinder.findMethod_returningText(
cls,
namingConvention,
NO_ARG)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstract.java
index 6814317..8835fd1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstract.java
@@ -29,18 +29,23 @@ import org.apache.isis.core.metamodel.interactions.VisibilityContext;
import org.apache.isis.core.metamodel.spec.ManagedObject;
/**
- * This implements {@link org.apache.isis.core.metamodel.facetapi.MultiTypedFacet} so that each concrete implementation
- * is added to the eventual {@link FacetHolder} twice: once under
- * <tt>HiddeFacet.class</tt> and once under its own concrete type class (eg <tt>HiddenFacetForActionAnnotation</tt>).
+ * This once implemented {@code org.apache.isis.core.metamodel.facetapi.MultiTypedFacet}
+ * so that each concrete implementation
+ * is added to the eventual {@link FacetHolder} twice:
+ * once under <tt>HiddeFacet.class</tt> and
+ * once under its own concrete type class (eg <tt>HiddenFacetForActionAnnotation</tt>).
* This satisfies a couple of (independent) requirements:
* <ul>
* <li>that we don't have the concept of a single (blessed?) HiddenFacet; rather there are simply facets some of
* which implement {@link HidingInteractionAdvisor}</li>
* <li>that there is nevertheless always at least one facet that is registered under <tt>HiddenFacet.class</tt>;
- * this is used by the {@link org.apache.isis.core.metamodel.layoutmetadata.json.LayoutMetadataReaderFromJson} exporter</li>
+ * this was once used by the
+ * {@code org.apache.isis.core.metamodel.layoutmetadata.json.LayoutMetadataReaderFromJson} exporter</li>
* </ul>
*/
-public abstract class HiddenFacetAbstract extends WhereValueFacetAbstract implements HiddenFacet {
+public abstract class HiddenFacetAbstract
+extends WhereValueFacetAbstract
+implements HiddenFacet {
public HiddenFacetAbstract(
Class<? extends Facet> facetType,
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/method/HideForContextFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/method/HideForContextFacetViaMethodFactory.java
index a8cd349..967465a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/method/HideForContextFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/method/HideForContextFacetViaMethodFactory.java
@@ -25,7 +25,7 @@ import org.apache.isis.commons.collections.Can;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.methods.MethodFinder2;
+import org.apache.isis.core.metamodel.methods.MethodFinder;
import org.apache.isis.core.metamodel.methods.MethodLiteralConstants;
import org.apache.isis.core.metamodel.methods.MethodPrefixBasedFacetFactoryAbstract;
@@ -52,7 +52,7 @@ extends MethodPrefixBasedFacetFactoryAbstract {
val namingConvention = getNamingConventionForPropertyAndCollectionSupport(processMethodContext, PREFIX);
val cls = processMethodContext.getCls();
- Method hideMethod = MethodFinder2.findMethod(
+ Method hideMethod = MethodFinder.findMethod(
cls,
namingConvention,
boolean.class,
@@ -64,7 +64,7 @@ extends MethodPrefixBasedFacetFactoryAbstract {
boolean noParamsOnly = getConfiguration().getCore().getMetaModel().getValidator().isNoParamsOnly();
boolean searchExactMatch = !noParamsOnly;
if(searchExactMatch) {
- hideMethod = MethodFinder2.findMethod(
+ hideMethod = MethodFinder.findMethod(
cls,
namingConvention,
boolean.class,
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/LayoutGroupFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/LayoutGroupFacet.java
index 3c3900b..264b0fa 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/LayoutGroupFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/LayoutGroupFacet.java
@@ -30,7 +30,7 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
* {@link ActionLayout#fieldSetName()} and {@link PropertyLayout#fieldSetName()}.
* <p>
* Collections don't support grouping, but can be associated using
- * {@link ActionLayout#associateWith()}.
+ * {@link Action#associateWith()}.
* </p><p>
* An alternative is to use the <code>Xxx.layout.xml</code> file,
* where <code>Xxx</code> is the domain object name.
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethodFactory.java
index 88249f5..421e66f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethodFactory.java
@@ -25,7 +25,7 @@ import java.util.Collection;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.methods.MethodFinder2;
+import org.apache.isis.core.metamodel.methods.MethodFinder;
import org.apache.isis.core.metamodel.methods.MethodLiteralConstants;
import org.apache.isis.core.metamodel.methods.MethodPrefixBasedFacetFactoryAbstract;
@@ -82,7 +82,7 @@ public class ActionChoicesFacetViaMethodFactory extends MethodPrefixBasedFacetFa
val namingConvention = getNamingConventionForActionSupport(processMethodContext, PREFIX);
Method choicesMethod =
- MethodFinder2.findMethod(cls, namingConvention, returnType, NO_ARG)
+ MethodFinder.findMethod(cls, namingConvention, returnType, NO_ARG)
.findFirst()
.orElse(null);
return choicesMethod;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/hide/method/ActionParameterHiddenFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/hide/method/ActionParameterHiddenFacetViaMethodFactory.java
index 195f220..b55cf01 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/hide/method/ActionParameterHiddenFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/hide/method/ActionParameterHiddenFacetViaMethodFactory.java
@@ -25,8 +25,8 @@ import org.apache.isis.applib.exceptions.unrecoverable.MetaModelException;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.ParameterSupport;
-import org.apache.isis.core.metamodel.facets.ParameterSupport.SearchAlgorithm;
import org.apache.isis.core.metamodel.facets.ParameterSupport.ParamSupportingMethodSearchRequest.ReturnType;
+import org.apache.isis.core.metamodel.facets.ParameterSupport.SearchAlgorithm;
import org.apache.isis.core.metamodel.facets.param.hide.ActionParameterHiddenFacet;
import org.apache.isis.core.metamodel.methods.MethodLiteralConstants;
import org.apache.isis.core.metamodel.methods.MethodPrefixBasedFacetFactoryAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethodFactory.java
index 9b2c3e5..99a8395 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethodFactory.java
@@ -23,7 +23,7 @@ import org.apache.isis.commons.collections.Can;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.methods.MethodFinder2;
+import org.apache.isis.core.metamodel.methods.MethodFinder;
import org.apache.isis.core.metamodel.methods.MethodLiteralConstants;
import org.apache.isis.core.metamodel.methods.MethodPrefixBasedFacetFactoryAbstract;
@@ -59,7 +59,7 @@ public class PropertyAutoCompleteFacetMethodFactory extends MethodPrefixBasedFac
val cls = processMethodContext.getCls();
val returnType = getterOrMixinMain.getReturnType();
- val autoCompleteMethod = MethodFinder2
+ val autoCompleteMethod = MethodFinder
.findMethod(
cls,
namingConvention,
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethodFactory.java
index b101eb6..1224d7a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethodFactory.java
@@ -23,7 +23,7 @@ import org.apache.isis.commons.collections.Can;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.methods.MethodFinder2;
+import org.apache.isis.core.metamodel.methods.MethodFinder;
import org.apache.isis.core.metamodel.methods.MethodLiteralConstants;
import org.apache.isis.core.metamodel.methods.MethodPrefixBasedFacetFactoryAbstract;
@@ -58,7 +58,7 @@ public class PropertyChoicesFacetViaMethodFactory extends MethodPrefixBasedFacet
val cls = processMethodContext.getCls();
val returnType = getterOrMixinMain.getReturnType();
- val choicesMethod = MethodFinder2
+ val choicesMethod = MethodFinder
.findMethod(
cls,
namingConvention,
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethodFactory.java
index 93ec364..e7a8ecf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethodFactory.java
@@ -23,7 +23,7 @@ import org.apache.isis.commons.collections.Can;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.methods.MethodFinder2;
+import org.apache.isis.core.metamodel.methods.MethodFinder;
import org.apache.isis.core.metamodel.methods.MethodLiteralConstants;
import org.apache.isis.core.metamodel.methods.MethodPrefixBasedFacetFactoryAbstract;
@@ -58,7 +58,7 @@ public class PropertyDefaultFacetViaMethodFactory extends MethodPrefixBasedFacet
val cls = processMethodContext.getCls();
val returnType = getterOrMixinMain.getReturnType();
- val method = MethodFinder2
+ val method = MethodFinder
.findMethod(
cls,
namingConvention,
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/mustsatisfy/MustSatisfySpecificationFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/mustsatisfy/MustSatisfySpecificationFacetForPropertyAnnotation.java
index b28aa78..c1622e6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/mustsatisfy/MustSatisfySpecificationFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/mustsatisfy/MustSatisfySpecificationFacetForPropertyAnnotation.java
@@ -19,12 +19,9 @@
package org.apache.isis.core.metamodel.facets.properties.property.mustsatisfy;
-import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import java.util.Objects;
import java.util.Optional;
-import java.util.stream.Collectors;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.services.factory.FactoryService;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/notpersisted/SnapshotExcludeFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/notpersisted/SnapshotExcludeFacetForPropertyAnnotation.java
index 494ebfc..66d7156 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/notpersisted/SnapshotExcludeFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/notpersisted/SnapshotExcludeFacetForPropertyAnnotation.java
@@ -21,8 +21,8 @@ package org.apache.isis.core.metamodel.facets.properties.property.notpersisted;
import java.util.Optional;
-import org.apache.isis.applib.annotation.Snapshot;
import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.Snapshot;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.propcoll.memserexcl.SnapshotExcludeFacet;
import org.apache.isis.core.metamodel.facets.propcoll.memserexcl.SnapshotExcludeFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/method/PropertyValidateFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/method/PropertyValidateFacetViaMethodFactory.java
index f475e1d..8835784 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/method/PropertyValidateFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/method/PropertyValidateFacetViaMethodFactory.java
@@ -22,7 +22,7 @@ package org.apache.isis.core.metamodel.facets.properties.validating.method;
import org.apache.isis.applib.services.i18n.TranslationContext;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.methods.MethodFinder2;
+import org.apache.isis.core.metamodel.methods.MethodFinder;
import org.apache.isis.core.metamodel.methods.MethodLiteralConstants;
import org.apache.isis.core.metamodel.methods.MethodPrefixBasedFacetFactoryAbstract;
@@ -50,7 +50,7 @@ public class PropertyValidateFacetViaMethodFactory extends MethodPrefixBasedFace
val namingConvention = getNamingConventionForPropertyAndCollectionSupport(processMethodContext, PREFIX);
val returnType = getterMethod.getReturnType();
- val validateMethod = MethodFinder2.findMethod_returningText(
+ val validateMethod = MethodFinder.findMethod_returningText(
cls,
namingConvention,
new Class[] { returnType })
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/cmd/v2/CommandDtoValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/cmd/v2/CommandDtoValueSemanticsProvider.java
index 043fd96..7604f76 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/cmd/v2/CommandDtoValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/cmd/v2/CommandDtoValueSemanticsProvider.java
@@ -21,16 +21,13 @@ package org.apache.isis.core.metamodel.facets.schema.cmd.v2;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
-import org.apache.isis.applib.util.schema.ChangesDtoUtils;
import org.apache.isis.applib.util.schema.CommandDtoUtils;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract;
import org.apache.isis.core.metamodel.facets.schema.cmd.CommandDtoValueFacet;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.schema.chg.v2.ChangesDto;
import org.apache.isis.schema.cmd.v2.CommandDto;
-import org.apache.isis.schema.cmd.v2.CommandsDto;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datesql/JavaSqlDateValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datesql/JavaSqlDateValueSemanticsProvider.java
index c4cacc3..129a528 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datesql/JavaSqlDateValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datesql/JavaSqlDateValueSemanticsProvider.java
@@ -20,7 +20,6 @@
package org.apache.isis.core.metamodel.facets.value.datesql;
import java.sql.Date;
-import java.sql.Time;
import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Calendar;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/temporal/localtime/LocalTimeValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/temporal/localtime/LocalTimeValueSemanticsProvider.java
index 1df25ea..68f0b18 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/temporal/localtime/LocalTimeValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/temporal/localtime/LocalTimeValueSemanticsProvider.java
@@ -23,8 +23,6 @@ import java.time.LocalTime;
import java.time.format.DateTimeFormatter;
import java.time.format.FormatStyle;
import java.util.Locale;
-import java.util.Optional;
-import java.util.stream.Stream;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/temporal/offsetdatetime/OffsetDateTimeValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/temporal/offsetdatetime/OffsetDateTimeValueSemanticsProvider.java
index e8d2dad..088cd04 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/temporal/offsetdatetime/OffsetDateTimeValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/temporal/offsetdatetime/OffsetDateTimeValueSemanticsProvider.java
@@ -23,8 +23,6 @@ import java.time.OffsetDateTime;
import java.time.format.DateTimeFormatter;
import java.time.format.FormatStyle;
import java.util.Locale;
-import java.util.Optional;
-import java.util.stream.Stream;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/methods/MethodFinder2.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/methods/MethodFinder.java
similarity index 99%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/methods/MethodFinder2.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/methods/MethodFinder.java
index 356e647..28b5c7a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/methods/MethodFinder2.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/methods/MethodFinder.java
@@ -30,7 +30,7 @@ import org.apache.isis.core.metamodel.methods.MethodFinderUtils.MethodAndPpmCons
* @apiNote each method name candidate is processed in sequence as given by {@code Can<String> names}
*/
//@Log4j2
-public final class MethodFinder2 {
+public final class MethodFinder {
public static Stream<Method> findMethod(
final Class<?> type,
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/methods/MethodPrefixBasedFacetFactoryAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/methods/MethodPrefixBasedFacetFactoryAbstract.java
index 9692919..8d18e67 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/methods/MethodPrefixBasedFacetFactoryAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/methods/MethodPrefixBasedFacetFactoryAbstract.java
@@ -23,9 +23,7 @@ import java.util.function.IntFunction;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.collections.ImmutableEnumSet;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facets.FacetFactory;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.MixedIn;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
index 7ae8827..2689b75 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
@@ -38,8 +38,8 @@ import org.apache.isis.applib.services.grid.GridLoaderService;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.core.config.environment.IsisSystemEnvironment;
import org.apache.isis.commons.internal.resources._Resources;
+import org.apache.isis.core.config.environment.IsisSystemEnvironment;
import lombok.Value;
import lombok.extern.log4j.Log4j2;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java
index 5373b53..e2ee052 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java
@@ -18,8 +18,6 @@
*/
package org.apache.isis.core.metamodel.services.grid;
-import static org.apache.isis.core.metamodel.facetapi.FacetUtil.addOrReplaceFacet;
-
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
@@ -87,6 +85,8 @@ import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import static org.apache.isis.core.metamodel.facetapi.FacetUtil.addOrReplaceFacet;
+
import lombok.Value;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
index fd90dcc..00577a8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
@@ -18,8 +18,6 @@
*/
package org.apache.isis.core.metamodel.services.grid.bootstrap3;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
@@ -71,6 +69,8 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+import static org.apache.isis.commons.internal.base._NullSafe.stream;
+
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ixn/InteractionDtoFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ixn/InteractionDtoFactory.java
index dc54aba..2b3b68a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ixn/InteractionDtoFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ixn/InteractionDtoFactory.java
@@ -18,12 +18,10 @@
*/
package org.apache.isis.core.metamodel.services.ixn;
-import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.schema.cmd.v2.CommandDto;
import org.apache.isis.schema.ixn.v2.ActionInvocationDto;
import org.apache.isis.schema.ixn.v2.PropertyEditDto;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
index 617e929..7946c83 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
@@ -17,8 +17,6 @@
package org.apache.isis.core.metamodel.spec.feature;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-
import java.util.Collections;
import java.util.List;
import java.util.Objects;
@@ -59,6 +57,8 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.specimpl.MixedInMember;
+import static org.apache.isis.commons.internal.base._NullSafe.stream;
+
import lombok.NonNull;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java
index 2a1aa24..7396c61 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java
@@ -45,10 +45,10 @@ import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.facets.FacetedMethodParameter;
import org.apache.isis.core.metamodel.facets.ObjectSpecIdFacetFactory;
import org.apache.isis.core.metamodel.facets.ObjectSpecIdFacetFactory.ProcessObjectSpecIdContext;
+import org.apache.isis.core.metamodel.facets.PropertyOrCollectionIdentifyingFacetFactory;
import org.apache.isis.core.metamodel.methods.MethodFilteringFacetFactory;
import org.apache.isis.core.metamodel.methods.MethodPrefixBasedFacetFactory;
import org.apache.isis.core.metamodel.methods.MethodRemoverConstants;
-import org.apache.isis.core.metamodel.facets.PropertyOrCollectionIdentifyingFacetFactory;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;