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 c82d2e3a4cec9fd71cd5d692d3b4893a0420de84 Author: andi-huber <[email protected]> AuthorDate: Sat Sep 17 21:43:03 2022 +0200 ISIS-3215: more misnomer (2) --- .../java/org/apache/isis/core/metamodel/facetapi/FeatureType.java | 4 ++-- .../specloader/specimpl/ObjectActionParameterAbstract.java | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FeatureType.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FeatureType.java index 94e228d377..a3f6758512 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FeatureType.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FeatureType.java @@ -66,7 +66,7 @@ public enum FeatureType { return Identifier.actionIdentifier(typeIdentifier, fullMethodName, parameterTypes); } }, - ACTION_PARAMETER_SINGULAR("Scalar Parameter") { + ACTION_PARAMETER_SINGULAR("Singular Parameter") { /** * Always returns <tt>null</tt>. */ @@ -75,7 +75,7 @@ public enum FeatureType { return null; } }, - ACTION_PARAMETER_PLURAL("Collection Parameter") { + ACTION_PARAMETER_PLURAL("Plural Parameter") { /** * Always returns <tt>null</tt>. */ diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java index 0d67e5a06c..ad45cb72a9 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java @@ -240,14 +240,12 @@ implements .map(defaultsFacet->defaultsFacet.getDefault(pendingArgs)) .orElseGet(Can::empty); - val paramMeta = pendingArgs.getParamMetamodel(getParameterIndex()); - - if(paramMeta.isPlural()) { - final Can<ManagedObject> nonScalarDefaults = defaults + if(this.isPlural()) { + final Can<ManagedObject> pluralDefaults = defaults // post processing each entry .map(obj->ManagedObjects.emptyToDefault(paramSpec, !isOptional(), obj)); // pack up - val packed = ManagedObject.packed(paramSpec, nonScalarDefaults); + val packed = ManagedObject.packed(paramSpec, pluralDefaults); return packed; }
