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/09/07 11:04:26 UTC
[isis] 01/02: ISIS-2774: minor cleanup
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit c26d7044de34aac3bbf9e0a8d5e9c9d007f93e5c
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Sep 7 11:01:38 2021 +0200
ISIS-2774: minor cleanup
---
.../progmodel/ProgrammingModelConstants.java | 28 ++++++++--------------
1 file changed, 10 insertions(+), 18 deletions(-)
diff --git a/core/config/src/main/java/org/apache/isis/core/config/progmodel/ProgrammingModelConstants.java b/core/config/src/main/java/org/apache/isis/core/config/progmodel/ProgrammingModelConstants.java
index f917bd3..e5e83c8 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/progmodel/ProgrammingModelConstants.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/progmodel/ProgrammingModelConstants.java
@@ -172,7 +172,7 @@ public final class ProgrammingModelConstants {
private final Can<String> methodNames;
}
- // -- MEMBER SUPPORT
+ // -- MEMBER SUPPORT PREFIXES
public static final String DEFAULT_PREFIX = "default";
public static final String CHOICES_PREFIX = "choices";
@@ -200,27 +200,19 @@ public final class ProgrammingModelConstants {
final Can<Class<? extends Annotation>> prohibits;
}
- // -- METHOD NAMING CONVENTIONS
-
- @FunctionalInterface
- public static interface SupportingMethodNameProviderForPropertyAndCollection {
- /** automatically deals with properties getters and actions */
- @Nullable String getMemberSupportingMethodName(Member member, String prefix, boolean isMixin);
- }
-
// -- SUPPORTING METHOD NAMING CONVENTION
public static enum ActionSupportNaming {
/** eg. hideAct() */
PREFIXED_ACTION_NAME {
- @Override
+ @Override @Nullable
String nameFor(final Method actionMethod, final String prefix, final boolean isMixin) {
return prefix + _Strings.capitalize(actionMethod.getName());
}
},
/** eg. hide() */
PREFIX_ONLY {
- @Override
+ @Override @Nullable
String nameFor(final Method actionMethod, final String prefix, final boolean isMixin) {
return isMixin
// prefix-only notation is restricted to mixins
@@ -228,7 +220,7 @@ public final class ProgrammingModelConstants {
: null;
}
};
- abstract String nameFor(Method actionMethod, String prefix, boolean isMixin);
+ abstract @Nullable String nameFor(Method actionMethod, String prefix, boolean isMixin);
public static Can<String> namesFor(final Method actionMethod, final String prefix, final boolean isMixin) {
return Stream.of(ActionSupportNaming.values())
.map(naming->naming.nameFor(actionMethod, prefix, isMixin))
@@ -239,14 +231,14 @@ public final class ProgrammingModelConstants {
public static enum ParameterSupportNaming {
/** eg. hide2Act(..) */
PREFIX_PARAM_INDEX_ACTION_NAME {
- @Override
+ @Override @Nullable
String nameFor(final Method actionMethod, final String prefix, final boolean isMixin, final int paramNum) {
return prefix + paramNum + _Strings.capitalize(actionMethod.getName());
}
},
/** eg. hideEmail() .. where email is the referenced parameter's name */
PREFIXED_PARAM_NAME {
- @Override
+ @Override @Nullable
String nameFor(final Method actionMethod, final String prefix, final boolean isMixin, final int paramNum) {
return isMixin
// no-action-name-reference notation is restricted to mixins
@@ -254,7 +246,7 @@ public final class ProgrammingModelConstants {
: null;
}
};
- abstract String nameFor(Method actionMethod, String prefix, boolean isMixin, int paramNum);
+ abstract @Nullable String nameFor(Method actionMethod, String prefix, boolean isMixin, int paramNum);
public static Can<IntFunction<String>> namesFor(final Method actionMethod, final String prefix, final boolean isMixin) {
return Stream.of(ParameterSupportNaming.values())
.<IntFunction<String>>map(naming->(paramNum->naming.nameFor(actionMethod, prefix, isMixin, paramNum)))
@@ -266,14 +258,14 @@ public final class ProgrammingModelConstants {
public static enum MemberSupportNaming {
/** eg. hideProp() */
PREFIXED_MEMBER_NAME {
- @Override
+ @Override @Nullable
String nameFor(final Member member, final String prefix, final boolean isMixin) {
return prefix + getCapitalizedMemberName(member);
}
},
/** eg. hide() */
PREFIX_ONLY {
- @Override
+ @Override @Nullable
String nameFor(final Member member, final String prefix, final boolean isMixin) {
return isMixin
// prefix-only notation is restricted to mixins
@@ -281,7 +273,7 @@ public final class ProgrammingModelConstants {
: null;
}
};
- abstract String nameFor(Member member, String prefix, boolean isMixin);
+ abstract @Nullable String nameFor(Member member, String prefix, boolean isMixin);
public static Can<String> namesFor(final Member member, final String prefix, final boolean isMixin) {
return Stream.of(MemberSupportNaming.values())
.map(naming->naming.nameFor(member, prefix, isMixin))