You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/07/18 20:11:02 UTC
[isis] branch master updated: ISIS-2362: further simplify naming
convention stuff
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 113fec6 ISIS-2362: further simplify naming convention stuff
113fec6 is described below
commit 113fec6b35011cf879ab8fb15d756ac4341fbd17
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Jul 18 22:10:50 2020 +0200
ISIS-2362: further simplify naming convention stuff
---
.../metamodel/facets/MethodLiteralConstants.java | 102 +--------------------
.../MethodPrefixBasedFacetFactoryAbstract.java | 11 +--
.../ActionDefaultsFacetViaMethodFactory.java | 4 +-
.../ActionValidationFacetViaMethodFactory.java | 4 +-
.../DisableForContextFacetViaMethodFactory.java | 6 +-
.../HideForContextFacetViaMethodFactory.java | 6 +-
...ParameterAutoCompleteFacetViaMethodFactory.java | 2 +-
.../method/ActionChoicesFacetViaMethodFactory.java | 4 +-
...ctionParameterChoicesFacetViaMethodFactory.java | 2 +-
...tionParameterDefaultsFacetViaMethodFactory.java | 2 +-
...tionParameterDisabledFacetViaMethodFactory.java | 2 +-
...ActionParameterHiddenFacetViaMethodFactory.java | 2 +-
...onParameterValidationFacetViaMethodFactory.java | 2 +-
.../PropertyAutoCompleteFacetMethodFactory.java | 6 +-
.../PropertyChoicesFacetViaMethodFactory.java | 6 +-
.../PropertyDefaultFacetViaMethodFactory.java | 6 +-
.../PropertyValidateFacetViaMethodFactory.java | 4 +-
17 files changed, 35 insertions(+), 136 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodLiteralConstants.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodLiteralConstants.java
index 701833f..93a95d6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodLiteralConstants.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodLiteralConstants.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.facets;
import java.lang.reflect.Member;
import java.lang.reflect.Method;
import java.util.function.IntFunction;
-import java.util.function.Supplier;
import javax.annotation.Nullable;
@@ -72,11 +71,6 @@ public final class MethodLiteralConstants {
@FunctionalInterface
public static interface SupportingMethodNameProviderForAction {
@Nullable String getActionSupportingMethodName(Method actionMethod, String prefix);
-
- /** action-supporting-method name provider */
- default Supplier<String> providerForAction(Method actionMethod, String prefix) {
- return ()->getActionSupportingMethodName(actionMethod, prefix);
- }
}
@FunctionalInterface
@@ -85,8 +79,7 @@ public final class MethodLiteralConstants {
/** paramNum to param-supporting-method name provider */
default IntFunction<String> providerForParam(Method actionMethod, String prefix) {
- return paramNum->getParameterSupportingMethodName(
- actionMethod, prefix, paramNum);
+ return paramNum->getParameterSupportingMethodName(actionMethod, prefix, paramNum);
}
}
@@ -94,12 +87,6 @@ public final class MethodLiteralConstants {
public static interface SupportingMethodNameProviderForPropertyAndCollection {
/** automatically deals with properties getters and actions */
@Nullable String getMemberSupportingMethodName(Member member, String prefix);
-
- /** member-supporting-method name provider */
- default Supplier<String> providerForMember(Member member, String prefix) {
- return ()->getMemberSupportingMethodName(member, prefix);
- }
-
}
// -- SUPPORTING METHOD NAMING CONVENTION
@@ -143,93 +130,6 @@ public final class MethodLiteralConstants {
return capitalizedName;
}
- // -- SUPPORTING METHOD NAMING CONVENTION
-
-// public static enum SupportingMethodNamingConvention {
-//
-// /** version 1.x classic eg. hideAct(...), hide0Act(...)*/
-// PREFIX_PARAMNUM_ACTION {
-//
-// @Override
-// protected String getActionSupportingMethodName(Method actionMethod, String prefix) {
-// final String capitalizedActionName =
-// StringExtensions.asCapitalizedName(actionMethod.getName());
-// return prefix + capitalizedActionName;
-// }
-//
-// @Override
-// protected String getParameterSupportingMethodName(Method actionMethod, String prefix, int paramNum) {
-// final String capitalizedActionName =
-// StringExtensions.asCapitalizedName(actionMethod.getName());
-// return prefix + paramNum + capitalizedActionName;
-// }
-//
-// @Override
-// protected String getMemberSupportingMethodName(Member member, String prefix) {
-// if(member instanceof Method) {
-// final Method method = (Method)member;
-// if(method.getParameterCount()>0) {
-// // definitely an action not a getter
-// return getActionSupportingMethodName(method, prefix);
-// }
-// // either a no-arg action or a getter
-// final String capitalizedName =
-// StringExtensions.asJavaBaseNameStripAccessorPrefixIfRequired(member.getName());
-// return prefix + capitalizedName;
-// }
-// // must be a field then
-// final String capitalizedName =
-// StringExtensions.asCapitalizedName(member.getName());
-// return prefix + capitalizedName;
-// }
-//
-// },
-//
-// /** version 2.x, introduced for mixins eg. hide(...), hideParamname(...)*/
-// PREFIX_PARAMNAME_USING_PARAMETERS_RECORD {
-// @Override
-// protected String getActionSupportingMethodName(Method actionMethod, String prefix) {
-// return prefix;
-// }
-// @Override
-// protected String getParameterSupportingMethodName(Method actionMethod, String prefix, int paramNum) {
-// final String capitalizedParamName =
-// StringExtensions.asCapitalizedName(actionMethod.getParameters()[paramNum].getName());
-// return prefix + capitalizedParamName;
-// }
-// @Override
-// protected String getMemberSupportingMethodName(Member member, String prefix) {
-// // prefix only
-// return prefix;
-// }
-// }
-//
-// ;
-//
-// protected abstract String getActionSupportingMethodName(Method actionMethod, String prefix);
-// protected abstract String getParameterSupportingMethodName(Method actionMethod, String prefix, int paramNum);
-// /** automatically deals with properties getters and actions */
-// protected abstract String getMemberSupportingMethodName(Member member, String prefix);
-//
-// /** paramNum to param-supporting-method name provider */
-// public IntFunction<String> providerForParam(Method actionMethod, String prefix) {
-// return paramNum->getParameterSupportingMethodName(
-// actionMethod, prefix, paramNum);
-// }
-//
-// /** action-supporting-method name provider */
-// public Supplier<String> providerForAction(Method actionMethod, String prefix) {
-// return ()->getActionSupportingMethodName(actionMethod, prefix);
-// }
-//
-// /** member-supporting-method name provider */
-// public Supplier<String> providerForMember(Member member, String prefix) {
-// return ()->getMemberSupportingMethodName(member, prefix);
-// }
-//
-// }
-
-
// -- DEPRECATIONS
@Deprecated public static final String VALIDATE_ADD_TO_PREFIX = "validateAddTo";
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java
index f33f04f..37fbb1b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java
@@ -20,7 +20,6 @@ package org.apache.isis.core.metamodel.facets;
import java.lang.reflect.Method;
import java.util.function.IntFunction;
-import java.util.function.Supplier;
import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.core.commons.collections.ImmutableEnumSet;
@@ -39,22 +38,22 @@ public abstract class MethodPrefixBasedFacetFactoryAbstract
extends FacetFactoryAbstract
implements MethodPrefixBasedFacetFactory {
- protected static final Can<Supplier<String>> getNamingProvidersForActions(
+ protected static final Can<String> getNamingConventionForActionSupport(
final Method actionMethod, final String prefix) {
return MethodLiteralConstants.ACTIONS
- .map(naming->naming.providerForAction(actionMethod, prefix));
+ .map(naming->naming.getActionSupportingMethodName(actionMethod, prefix));
}
- protected static final Can<IntFunction<String>> getNamingProvidersForParameters(
+ protected static final Can<IntFunction<String>> getNamingConventionForParameterSupport(
final Method actionMethod, final String prefix) {
return MethodLiteralConstants.PARAMETERS
.map(naming->naming.providerForParam(actionMethod, prefix));
}
- protected static final Can<Supplier<String>> getNamingProvidersForPropertiesAndCollections(
+ protected static final Can<String> getNamingConventionForPropertyAndCollectionSupport(
final Method actionMethod, final String prefix) {
return MethodLiteralConstants.PROPERTIES_AND_COLLECTIONS
- .map(naming->naming.providerForMember(actionMethod, prefix));
+ .map(naming->naming.getMemberSupportingMethodName(actionMethod, prefix));
}
@Getter(onMethod = @__(@Override))
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 ffc7e89..28c8233 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
@@ -71,9 +71,9 @@ public class ActionDefaultsFacetViaMethodFactory extends MethodPrefixBasedFacetF
val actionMethod = processMethodContext.getMethod();
val cls = processMethodContext.getCls();
- val namingConvention = getNamingProvidersForActions(actionMethod, PREFIX);
+ val namingConvention = getNamingConventionForActionSupport(actionMethod, PREFIX);
return MethodFinder2.findMethod(
- cls, namingConvention.map(x->x.get()), returnType, NO_ARG)
+ cls, namingConvention, returnType, NO_ARG)
.findFirst()
.orElse(null);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethodFactory.java
index 79d3267..b1f46e3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethodFactory.java
@@ -55,12 +55,12 @@ extends MethodPrefixBasedFacetFactoryAbstract {
val actionMethod = processMethodContext.getMethod();
val facetHolder = processMethodContext.getFacetHolder();
- val namingConvention = getNamingProvidersForActions(actionMethod, PREFIX);
+ val namingConvention = getNamingConventionForActionSupport(actionMethod, PREFIX);
val searchRequest = ActionSupport.ActionSupportingMethodSearchRequest.builder()
.processMethodContext(processMethodContext)
.returnType(ActionSupport.ActionSupportingMethodSearchRequest.ReturnType.TEXT)
- .methodNames(namingConvention.map(x->x.get()))
+ .methodNames(namingConvention)
.searchAlgorithms(EnumSet.of(SearchAlgorithm.PPM, SearchAlgorithm.ALL_PARAM_TYPES))
.build();
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 9e981b2..27bbee0 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
@@ -54,7 +54,7 @@ extends MethodPrefixBasedFacetFactoryAbstract {
Method disableMethod = null;
- val namingConvention = getNamingProvidersForPropertiesAndCollections(actionOrGetter, PREFIX);
+ val namingConvention = getNamingConventionForPropertyAndCollectionSupport(actionOrGetter, PREFIX);
boolean noParamsOnly = getConfiguration().getCore().getMetaModel().getValidator().isNoParamsOnly();
boolean searchExactMatch = !noParamsOnly;
@@ -62,7 +62,7 @@ extends MethodPrefixBasedFacetFactoryAbstract {
// search for exact match
disableMethod = MethodFinder2.findMethod_returningText(
cls,
- namingConvention.map(x->x.get()),
+ namingConvention,
actionOrGetter.getParameterTypes())
.findFirst()
.orElse(null);
@@ -71,7 +71,7 @@ extends MethodPrefixBasedFacetFactoryAbstract {
// search for no-arg version
disableMethod = MethodFinder2.findMethod_returningText(
cls,
- namingConvention.map(x->x.get()),
+ namingConvention,
NO_ARG)
.findFirst()
.orElse(null);
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 fba8d67..5b125c0 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
@@ -49,12 +49,12 @@ extends MethodPrefixBasedFacetFactoryAbstract {
final Method actionOrGetter = processMethodContext.getMethod();
- val namingConvention = getNamingProvidersForPropertiesAndCollections(actionOrGetter, PREFIX);
+ val namingConvention = getNamingConventionForPropertyAndCollectionSupport(actionOrGetter, PREFIX);
val cls = processMethodContext.getCls();
Method hideMethod = MethodFinder2.findMethod(
cls,
- namingConvention.map(x->x.get()),
+ namingConvention,
boolean.class,
NO_ARG)
.findFirst()
@@ -66,7 +66,7 @@ extends MethodPrefixBasedFacetFactoryAbstract {
if(searchExactMatch) {
hideMethod = MethodFinder2.findMethod(
cls,
- namingConvention.map(x->x.get()),
+ namingConvention,
boolean.class,
actionOrGetter.getParameterTypes())
.findFirst()
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethodFactory.java
index 041d9f3..0cef8e3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethodFactory.java
@@ -54,7 +54,7 @@ public class ActionParameterAutoCompleteFacetViaMethodFactory extends MethodPref
// attach ActionParameterChoicesFacet if autoCompleteNumMethod is found ...
val actionMethod = processMethodContext.getMethod();
- val namingConvention = getNamingProvidersForParameters(actionMethod, PREFIX);
+ val namingConvention = getNamingConventionForParameterSupport(actionMethod, PREFIX);
val searchRequest = ParameterSupport.ParamSupportingMethodSearchRequest.builder()
.processMethodContext(processMethodContext)
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 e44219a..68d1bb3 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
@@ -80,10 +80,10 @@ public class ActionChoicesFacetViaMethodFactory extends MethodPrefixBasedFacetFa
val cls = processMethodContext.getCls();
val actionMethod = processMethodContext.getMethod();
- val namingConvention = getNamingProvidersForActions(actionMethod, PREFIX);
+ val namingConvention = getNamingConventionForActionSupport(actionMethod, PREFIX);
Method choicesMethod =
- MethodFinder2.findMethod(cls, namingConvention.map(x->x.get()), returnType, NO_ARG)
+ MethodFinder2.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/choices/methodnum/ActionParameterChoicesFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethodFactory.java
index 2aa4f4f..b54b484 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethodFactory.java
@@ -59,7 +59,7 @@ extends MethodPrefixBasedFacetFactoryAbstract {
// attach ActionChoicesFacet if choicesNumMethod is found ...
val actionMethod = processMethodContext.getMethod();
- val namingConvention = getNamingProvidersForParameters(actionMethod, PREFIX);
+ val namingConvention = getNamingConventionForParameterSupport(actionMethod, PREFIX);
val searchRequest = ParameterSupport.ParamSupportingMethodSearchRequest.builder()
.processMethodContext(processMethodContext)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethodFactory.java
index 5a2b39a..f409048 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethodFactory.java
@@ -62,7 +62,7 @@ public class ActionParameterDefaultsFacetViaMethodFactory extends MethodPrefixBa
// attach DefaultFacetForParameters if defaultNumMethod is found ...
val actionMethod = processMethodContext.getMethod();
- val namingConvention = getNamingProvidersForParameters(actionMethod, PREFIX);
+ val namingConvention = getNamingConventionForParameterSupport(actionMethod, PREFIX);
val searchRequest = ParameterSupport.ParamSupportingMethodSearchRequest.builder()
.processMethodContext(processMethodContext)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/disable/method/ActionParameterDisabledFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/disable/method/ActionParameterDisabledFacetViaMethodFactory.java
index 4425f0b..0aee626 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/disable/method/ActionParameterDisabledFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/disable/method/ActionParameterDisabledFacetViaMethodFactory.java
@@ -58,7 +58,7 @@ extends MethodPrefixBasedFacetFactoryAbstract {
// attach ActionParameterDisabledFacet if disableNumMethod is found ...
val actionMethod = processMethodContext.getMethod();
- val namingConvention = getNamingProvidersForParameters(actionMethod, PREFIX);
+ val namingConvention = getNamingConventionForParameterSupport(actionMethod, PREFIX);
val searchRequest = ParameterSupport.ParamSupportingMethodSearchRequest.builder()
.processMethodContext(processMethodContext)
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 fe73982..ba27275 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
@@ -57,7 +57,7 @@ public class ActionParameterHiddenFacetViaMethodFactory extends MethodPrefixBase
// attach ActionParameterHiddenFacet if hideNumMethod is found ...
val actionMethod = processMethodContext.getMethod();
- val namingConvention = getNamingProvidersForParameters(actionMethod, PREFIX);
+ val namingConvention = getNamingConventionForParameterSupport(actionMethod, PREFIX);
val searchRequest = ParameterSupport.ParamSupportingMethodSearchRequest.builder()
.processMethodContext(processMethodContext)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validate/method/ActionParameterValidationFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validate/method/ActionParameterValidationFacetViaMethodFactory.java
index a7350ba..1cfedfa 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validate/method/ActionParameterValidationFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validate/method/ActionParameterValidationFacetViaMethodFactory.java
@@ -58,7 +58,7 @@ public class ActionParameterValidationFacetViaMethodFactory extends MethodPrefix
// in any case single-arg, either same as param-type or PPM style
val actionMethod = processMethodContext.getMethod();
- val namingConvention = getNamingProvidersForParameters(actionMethod, PREFIX);
+ val namingConvention = getNamingConventionForParameterSupport(actionMethod, PREFIX);
val searchRequest = ParameterSupport.ParamSupportingMethodSearchRequest.builder()
.processMethodContext(processMethodContext)
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 8b82f82..a2be912 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
@@ -54,15 +54,15 @@ public class PropertyAutoCompleteFacetMethodFactory extends MethodPrefixBasedFac
val getterOrMixinMain = processMethodContext.getMethod();
val namingConvention = processMethodContext.isMixinMain()
- ? getNamingProvidersForActions(getterOrMixinMain, PREFIX)
- : getNamingProvidersForPropertiesAndCollections(getterOrMixinMain, PREFIX); // handles getters
+ ? getNamingConventionForActionSupport(getterOrMixinMain, PREFIX)
+ : getNamingConventionForPropertyAndCollectionSupport(getterOrMixinMain, PREFIX); // handles getters
val cls = processMethodContext.getCls();
val returnType = getterOrMixinMain.getReturnType();
val autoCompleteMethod = MethodFinder2
.findMethod(
cls,
- namingConvention.map(x->x.get()),
+ namingConvention,
NO_RETURN,
STRING_ARG)
.findFirst()
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 37ff699..057ff1e 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
@@ -53,15 +53,15 @@ public class PropertyChoicesFacetViaMethodFactory extends MethodPrefixBasedFacet
val getterOrMixinMain = processMethodContext.getMethod();
val namingConvention = processMethodContext.isMixinMain()
- ? getNamingProvidersForActions(getterOrMixinMain, PREFIX)
- : getNamingProvidersForPropertiesAndCollections(getterOrMixinMain, PREFIX); // handles getters
+ ? getNamingConventionForActionSupport(getterOrMixinMain, PREFIX)
+ : getNamingConventionForPropertyAndCollectionSupport(getterOrMixinMain, PREFIX); // handles getters
val cls = processMethodContext.getCls();
val returnType = getterOrMixinMain.getReturnType();
val choicesMethod = MethodFinder2
.findMethod(
cls,
- namingConvention.map(x->x.get()),
+ namingConvention,
NO_RETURN,
NO_ARG)
.findFirst()
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 c87577f..052545c 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
@@ -53,15 +53,15 @@ public class PropertyDefaultFacetViaMethodFactory extends MethodPrefixBasedFacet
val getterOrMixinMain = processMethodContext.getMethod();
val namingConvention = processMethodContext.isMixinMain()
- ? getNamingProvidersForActions(getterOrMixinMain, PREFIX)
- : getNamingProvidersForPropertiesAndCollections(getterOrMixinMain, PREFIX); // handles getters
+ ? getNamingConventionForActionSupport(getterOrMixinMain, PREFIX)
+ : getNamingConventionForPropertyAndCollectionSupport(getterOrMixinMain, PREFIX); // handles getters
val cls = processMethodContext.getCls();
val returnType = getterOrMixinMain.getReturnType();
val method = MethodFinder2
.findMethod(
cls,
- namingConvention.map(x->x.get()),
+ namingConvention,
returnType,
NO_ARG)
.findFirst()
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 006f67b..36a3fb5 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
@@ -46,12 +46,12 @@ public class PropertyValidateFacetViaMethodFactory extends MethodPrefixBasedFace
val cls = processMethodContext.getCls();
val getterMethod = processMethodContext.getMethod();
- val namingConvention = getNamingProvidersForPropertiesAndCollections(getterMethod, PREFIX);
+ val namingConvention = getNamingConventionForPropertyAndCollectionSupport(getterMethod, PREFIX);
val returnType = getterMethod.getReturnType();
val validateMethod = MethodFinder2.findMethod_returningText(
cls,
- namingConvention.map(x->x.get()),
+ namingConvention,
new Class[] { returnType })
.findFirst()
.orElse(null);