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 afd9add321 ISIS-3215: more misnomer
afd9add321 is described below
commit afd9add321a4efe4fae85b8b5d8f40a207e882a8
Author: andi-huber <[email protected]>
AuthorDate: Sat Sep 17 21:13:25 2022 +0200
ISIS-3215: more misnomer
---
.../apache/isis/core/metamodel/facetapi/FeatureType.java | 14 +++++++-------
.../apache/isis/core/metamodel/facets/FacetedMethod.java | 6 +++---
.../ActionChoicesForCollectionParameterFacetFactory.java | 2 +-
.../object/title/parser/TitleFacetFromValueFacet.java | 4 ++--
.../core/metamodel/facets/object/value/ValueFacet.java | 4 ++--
.../core/metamodel/interactions/managed/_BindingUtil.java | 2 +-
.../services/schema/SchemaValueMarshallerAbstract.java | 4 ++--
.../core/metamodel/spec/feature/ObjectActionParameter.java | 4 ++--
.../metamodel/specloader/specimpl/ObjectActionDefault.java | 2 +-
.../specimpl/OneToManyActionParameterDefault.java | 2 +-
.../specimpl/OneToOneActionParameterDefault.java | 2 +-
.../facets/AbstractFacetFactoryJupiterTestCase.java | 2 +-
.../core/metamodel/facets/AbstractFacetFactoryTest.java | 2 +-
.../metamodel/facets/object/mixin/MixinIntendedAs.java | 2 +-
.../runtimeservices/command/CommandDtoFactoryDefault.java | 2 +-
...ivenJdoDatastoreIdentityAnnotationFacetFactoryTest.java | 2 +-
.../GivenJdoPersistenceCapableFacetFactoryTest.java | 2 +-
.../version/JdoVersionAnnotationFacetFactoryTest.java | 2 +-
.../BigDecimalFromJdoColumnAnnotationFacetFactoryTest.java | 8 ++++----
.../MandatoryFromJdoColumnAnnotationFacetFactoryTest.java | 8 ++++----
.../GivenJdoNotPersistentAnnotationFacetFactoryTest.java | 2 +-
.../GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java | 2 +-
.../jdo/metamodel/testing/AbstractFacetFactoryTest.java | 2 +-
.../apache/isis/viewer/commons/model/scalar/UiScalar.java | 4 ++--
24 files changed, 43 insertions(+), 43 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 4d88bf879c..94e228d377 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_SCALAR("Scalar Parameter") {
+ ACTION_PARAMETER_SINGULAR("Scalar Parameter") {
/**
* Always returns <tt>null</tt>.
*/
@@ -75,7 +75,7 @@ public enum FeatureType {
return null;
}
},
- ACTION_PARAMETER_COLLECTION("Collection Parameter") {
+ ACTION_PARAMETER_PLURAL("Collection Parameter") {
/**
* Always returns <tt>null</tt>.
*/
@@ -88,7 +88,7 @@ public enum FeatureType {
public static final ImmutableEnumSet<FeatureType> COLLECTIONS_ONLY =
ImmutableEnumSet.of(COLLECTION);
public static final ImmutableEnumSet<FeatureType> COLLECTIONS_AND_ACTIONS
= ImmutableEnumSet.of(COLLECTION, ACTION);
public static final ImmutableEnumSet<FeatureType> ACTIONS_ONLY =
ImmutableEnumSet.of(ACTION);
- public static final ImmutableEnumSet<FeatureType> PARAMETERS_ONLY =
ImmutableEnumSet.of(ACTION_PARAMETER_SCALAR, ACTION_PARAMETER_COLLECTION);
+ public static final ImmutableEnumSet<FeatureType> PARAMETERS_ONLY =
ImmutableEnumSet.of(ACTION_PARAMETER_SINGULAR, ACTION_PARAMETER_PLURAL);
public static final ImmutableEnumSet<FeatureType> PROPERTIES_ONLY =
ImmutableEnumSet.of(PROPERTY);
public static final ImmutableEnumSet<FeatureType> PROPERTIES_AND_ACTIONS =
ImmutableEnumSet.of(PROPERTY, ACTION);
public static final ImmutableEnumSet<FeatureType> OBJECTS_ONLY =
ImmutableEnumSet.of(OBJECT);
@@ -98,7 +98,7 @@ public enum FeatureType {
public static final ImmutableEnumSet<FeatureType> OBJECTS_AND_COLLECTIONS
= ImmutableEnumSet.of(OBJECT, COLLECTION);
public static final ImmutableEnumSet<FeatureType> OBJECTS_AND_ACTIONS =
ImmutableEnumSet.of(OBJECT, ACTION);
public static final ImmutableEnumSet<FeatureType>
OBJECTS_PROPERTIES_AND_COLLECTIONS = ImmutableEnumSet.of(OBJECT, PROPERTY,
COLLECTION);
- public static final ImmutableEnumSet<FeatureType> ACTIONS_AND_PARAMETERS =
ImmutableEnumSet.of(ACTION, ACTION_PARAMETER_SCALAR,
ACTION_PARAMETER_COLLECTION);
+ public static final ImmutableEnumSet<FeatureType> ACTIONS_AND_PARAMETERS =
ImmutableEnumSet.of(ACTION, ACTION_PARAMETER_SINGULAR, ACTION_PARAMETER_PLURAL);
/**
* Use of this is discouraged; instead use multiple {@link FacetFactory}s
@@ -106,7 +106,7 @@ public enum FeatureType {
*/
public static final ImmutableEnumSet<FeatureType>
EVERYTHING_BUT_PARAMETERS =
ImmutableEnumSet.complementOf(
- ImmutableEnumSet.of(ACTION_PARAMETER_SCALAR,
ACTION_PARAMETER_COLLECTION));
+ ImmutableEnumSet.of(ACTION_PARAMETER_SINGULAR,
ACTION_PARAMETER_PLURAL));
/**
* Use of this is discouraged; instead use multiple {@link FacetFactory}s
* for different features.
@@ -139,8 +139,8 @@ public enum FeatureType {
public boolean isCollection() { return this == COLLECTION; }
public boolean isAction() { return this == ACTION; }
public boolean isActionParameter() {
- return this == ACTION_PARAMETER_SCALAR
- || this == ACTION_PARAMETER_COLLECTION;
+ return this == ACTION_PARAMETER_SINGULAR
+ || this == ACTION_PARAMETER_PLURAL;
}
/**
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetedMethod.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetedMethod.java
index f49a9059f2..50f36425fe 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetedMethod.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetedMethod.java
@@ -86,13 +86,13 @@ extends TypedHolderAbstract {
final FeatureType featureType =
ProgrammingModelConstants.CollectionSemantics.valueOf(parameterType).isPresent()
- ? FeatureType.ACTION_PARAMETER_COLLECTION
- : FeatureType.ACTION_PARAMETER_SCALAR;
+ ? FeatureType.ACTION_PARAMETER_PLURAL
+ : FeatureType.ACTION_PARAMETER_SINGULAR;
val facetedMethodParam =
new FacetedMethodParameter(mmc, featureType,
declaringType, actionMethod, paramIndex);
- if(featureType != FeatureType.ACTION_PARAMETER_COLLECTION) {
+ if(featureType != FeatureType.ACTION_PARAMETER_PLURAL) {
actionParams.add(facetedMethodParam);
continue;
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionChoicesForCollectionParameterFacetFactory.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionChoicesForCollectionParameterFacetFactory.java
index 62f6e4f684..57c3ec93b8 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionChoicesForCollectionParameterFacetFactory.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionChoicesForCollectionParameterFacetFactory.java
@@ -77,7 +77,7 @@ implements MetaModelRefiner {
int paramNum = 0;
for (ObjectActionParameter parameter :
objectAction.getParameters()) {
- if(parameter.getFeatureType() ==
FeatureType.ACTION_PARAMETER_COLLECTION) {
+ if(parameter.getFeatureType() ==
FeatureType.ACTION_PARAMETER_PLURAL) {
validateActionParameter_whenCollection(
objectSpec, objectAction, parameter, paramNum);
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/parser/TitleFacetFromValueFacet.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/parser/TitleFacetFromValueFacet.java
index 6be31fdca3..8c97515c81 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/parser/TitleFacetFromValueFacet.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/parser/TitleFacetFromValueFacet.java
@@ -80,8 +80,8 @@ implements TitleFacet {
.titlePresentation(valueFacet
.createValueSemanticsContext(coll), pojo);
}
- case ACTION_PARAMETER_SCALAR:
- case ACTION_PARAMETER_COLLECTION:{
+ case ACTION_PARAMETER_SINGULAR:
+ case ACTION_PARAMETER_PLURAL:{
val param = (ObjectActionParameter)renderRequest.getFeature();
final Renderer renderer = valueFacet
.selectRendererForParameterElseFallback(param);
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacet.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacet.java
index 9b44f9aea1..11594728ac 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacet.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacet.java
@@ -92,7 +92,7 @@ extends
return selectDefaultParser();
}
switch(feature.getFeatureType()) {
- case ACTION_PARAMETER_SCALAR:
+ case ACTION_PARAMETER_SINGULAR:
return selectParserForParameter((ObjectActionParameter)feature);
case PROPERTY:
return selectParserForProperty((OneToOneAssociation)feature);
@@ -133,7 +133,7 @@ extends
return selectDefaultRenderer();
}
switch(feature.getFeatureType()) {
- case ACTION_PARAMETER_SCALAR:
+ case ACTION_PARAMETER_SINGULAR:
return selectRendererForParameter((ObjectActionParameter)feature);
case PROPERTY:
return selectRendererForProperty((OneToOneAssociation)feature);
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/_BindingUtil.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/_BindingUtil.java
index 250a3d8180..d74f359df7 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/_BindingUtil.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/_BindingUtil.java
@@ -130,7 +130,7 @@ class _BindingUtil {
// -- HELPER
private boolean isNonScalarParam(final @NonNull ObjectActionParameter
param) {
- return param.getFeatureType() ==
FeatureType.ACTION_PARAMETER_COLLECTION;
+ return param.getFeatureType() == FeatureType.ACTION_PARAMETER_PLURAL;
}
private void guardAgainstNonScalarParam(final @NonNull
ObjectActionParameter param) {
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/schema/SchemaValueMarshallerAbstract.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/schema/SchemaValueMarshallerAbstract.java
index 9f02465f3c..7e5ce9b39a 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/schema/SchemaValueMarshallerAbstract.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/schema/SchemaValueMarshallerAbstract.java
@@ -152,7 +152,7 @@ implements SchemaValueMarshaller, HasMetaModelContext {
final @NonNull ObjectActionParameter actionParameter,
final @NonNull ManagedObject value) {
- _Assert.assertTrue(actionParameter.getFeatureType() ==
FeatureType.ACTION_PARAMETER_SCALAR);
+ _Assert.assertTrue(actionParameter.getFeatureType() ==
FeatureType.ACTION_PARAMETER_SINGULAR);
val feature = actionParameter;
val elementTypeAsClass =
feature.getElementType().getCorrespondingClass();
@@ -175,7 +175,7 @@ implements SchemaValueMarshaller, HasMetaModelContext {
final @NonNull ObjectActionParameter actionParameter,
final @NonNull Can<ManagedObject> values) {
- _Assert.assertTrue(actionParameter.getFeatureType() ==
FeatureType.ACTION_PARAMETER_COLLECTION);
+ _Assert.assertTrue(actionParameter.getFeatureType() ==
FeatureType.ACTION_PARAMETER_PLURAL);
val feature = actionParameter;
val valueCls = feature.getElementType().getCorrespondingClass();
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java
index 5e412735df..2fb825279d 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java
@@ -59,11 +59,11 @@ extends ObjectFeature, CurrentHolder {
int getParameterIndex();
default boolean isSingular() {
- return getFeatureType()==FeatureType.ACTION_PARAMETER_SCALAR;
+ return getFeatureType()==FeatureType.ACTION_PARAMETER_SINGULAR;
}
default boolean isPlural() {
- return getFeatureType()==FeatureType.ACTION_PARAMETER_COLLECTION;
+ return getFeatureType()==FeatureType.ACTION_PARAMETER_PLURAL;
}
/**
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java
index b17d8d3435..cd705c3996 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java
@@ -197,7 +197,7 @@ implements ObjectAction {
val paramElementType =
specLoader.loadSpecification(facetedParam.getType().getElementType()); //
preload
return
- facetedParam.getFeatureType() ==
FeatureType.ACTION_PARAMETER_SCALAR
+ facetedParam.getFeatureType() ==
FeatureType.ACTION_PARAMETER_SINGULAR
? new OneToOneActionParameterDefault(paramElementType,
paramIndex, this)
: new
OneToManyActionParameterDefault(paramElementType, paramIndex, this);
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyActionParameterDefault.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyActionParameterDefault.java
index fcfa4e7b37..365974c0c1 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyActionParameterDefault.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyActionParameterDefault.java
@@ -35,7 +35,7 @@ implements OneToManyActionParameter {
final ObjectSpecification paramElementType,
final int index,
final ObjectActionDefault actionImpl) {
- super(FeatureType.ACTION_PARAMETER_COLLECTION, index,
paramElementType, actionImpl);
+ super(FeatureType.ACTION_PARAMETER_PLURAL, index, paramElementType,
actionImpl);
}
// -- UNDERLYING TYPE
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneActionParameterDefault.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneActionParameterDefault.java
index c037ae8ee8..252ed8f9aa 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneActionParameterDefault.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneActionParameterDefault.java
@@ -30,7 +30,7 @@ implements OneToOneActionParameter {
final ObjectSpecification paramElementType,
final int index,
final ObjectActionDefault actionImpl) {
- super(FeatureType.ACTION_PARAMETER_SCALAR, index, paramElementType,
actionImpl);
+ super(FeatureType.ACTION_PARAMETER_SINGULAR, index, paramElementType,
actionImpl);
}
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryJupiterTestCase.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryJupiterTestCase.java
index 45f58bedf0..35fe9d28f2 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryJupiterTestCase.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryJupiterTestCase.java
@@ -90,7 +90,7 @@ implements HasMetaModelContext {
facetedMethod = facetedSetter(
AbstractFacetFactoryTest.Customer.class, "firstName");
facetedMethodParameter = new
FacetedMethodParameter(getMetaModelContext(),
- FeatureType.ACTION_PARAMETER_SCALAR,
facetedMethod.getOwningType(),
+ FeatureType.ACTION_PARAMETER_SINGULAR,
facetedMethod.getOwningType(),
facetedMethod.getMethod(), 0);
}
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
index 634f4c9f07..9bcdbe14f9 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
@@ -90,7 +90,7 @@ public abstract class AbstractFacetFactoryTest {
facetedMethod =
FacetedMethod.createSetterForProperty(metaModelContext, Customer.class,
"firstName");
facetedMethodParameter = new FacetedMethodParameter(
metaModelContext,
- FeatureType.ACTION_PARAMETER_SCALAR,
+ FeatureType.ACTION_PARAMETER_SINGULAR,
facetedMethod.getOwningType(),
facetedMethod.getMethod(), 0);
}
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAs.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAs.java
index 6175be46e9..ac9c11687b 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAs.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAs.java
@@ -82,7 +82,7 @@ abstract class MixinIntendedAs {
val facetedMethodParameter = new FacetedMethodParameter(
metaModelContext,
- FeatureType.ACTION_PARAMETER_SCALAR,
+ FeatureType.ACTION_PARAMETER_SINGULAR,
owningType,
actionMethod,
0);
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandDtoFactoryDefault.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandDtoFactoryDefault.java
index a25200fc82..d419762384 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandDtoFactoryDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandDtoFactoryDefault.java
@@ -129,7 +129,7 @@ public class CommandDtoFactoryDefault implements
CommandDtoFactory {
actionParameter.getFeatureIdentifier();
- if(actionParameter.getFeatureType() !=
FeatureType.ACTION_PARAMETER_COLLECTION) {
+ if(actionParameter.getFeatureType() !=
FeatureType.ACTION_PARAMETER_PLURAL) {
//scalar
valueMarshaller.recordParamScalar(paramDto, actionParameter,
argAdapter);
} else {
diff --git
a/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/object/datastoreidentity/GivenJdoDatastoreIdentityAnnotationFacetFactoryTest.java
b/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/object/datastoreidentity/GivenJdoDatastoreIdentityAnnotationFacetFactoryTest.java
index 87300459d2..3235a5c32f 100644
---
a/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/object/datastoreidentity/GivenJdoDatastoreIdentityAnnotationFacetFactoryTest.java
+++
b/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/object/datastoreidentity/GivenJdoDatastoreIdentityAnnotationFacetFactoryTest.java
@@ -54,7 +54,7 @@ extends AbstractFacetFactoryTest {
assertFalse(contains(featureTypes, FeatureType.PROPERTY));
assertFalse(contains(featureTypes, FeatureType.COLLECTION));
assertFalse(contains(featureTypes, FeatureType.ACTION));
- assertFalse(contains(featureTypes,
FeatureType.ACTION_PARAMETER_SCALAR));
+ assertFalse(contains(featureTypes,
FeatureType.ACTION_PARAMETER_SINGULAR));
}
public void testDatastoreIdentityAnnotationPickedUpOnClass() {
diff --git
a/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/object/persistencecapable/GivenJdoPersistenceCapableFacetFactoryTest.java
b/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/object/persistencecapable/GivenJdoPersistenceCapableFacetFactoryTest.java
index 628e51f7f0..24f01beff2 100644
---
a/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/object/persistencecapable/GivenJdoPersistenceCapableFacetFactoryTest.java
+++
b/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/object/persistencecapable/GivenJdoPersistenceCapableFacetFactoryTest.java
@@ -54,7 +54,7 @@ extends AbstractFacetFactoryTest {
assertFalse(contains(featureTypes, FeatureType.PROPERTY));
assertFalse(contains(featureTypes, FeatureType.COLLECTION));
assertFalse(contains(featureTypes, FeatureType.ACTION));
- assertFalse(contains(featureTypes,
FeatureType.ACTION_PARAMETER_SCALAR));
+ assertFalse(contains(featureTypes,
FeatureType.ACTION_PARAMETER_SINGULAR));
}
public void testPersistenceCapableAnnotationPickedUpOnClass() {
diff --git
a/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest.java
b/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest.java
index 09835fe280..e94b6a4aa2 100644
---
a/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest.java
+++
b/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest.java
@@ -52,7 +52,7 @@ public class JdoVersionAnnotationFacetFactoryTest extends
AbstractFacetFactoryTe
assertFalse(contains(featureTypes, FeatureType.PROPERTY));
assertFalse(contains(featureTypes, FeatureType.COLLECTION));
assertFalse(contains(featureTypes, FeatureType.ACTION));
- assertFalse(contains(featureTypes,
FeatureType.ACTION_PARAMETER_SCALAR));
+ assertFalse(contains(featureTypes,
FeatureType.ACTION_PARAMETER_SINGULAR));
}
public void testVersionAnnotationPickedUpOnClass() {
diff --git
a/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/BigDecimalFromJdoColumnAnnotationFacetFactoryTest.java
b/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/BigDecimalFromJdoColumnAnnotationFacetFactoryTest.java
index 07e894ca85..c15d9e1493 100644
---
a/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/BigDecimalFromJdoColumnAnnotationFacetFactoryTest.java
+++
b/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/BigDecimalFromJdoColumnAnnotationFacetFactoryTest.java
@@ -20,9 +20,6 @@ package
org.apache.isis.persistence.jdo.metamodel.facets.prop.column;
import java.lang.reflect.Method;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
import org.apache.isis.core.metamodel._testing.MetaModelContext_forTesting;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
@@ -31,6 +28,9 @@ import
org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxFractionalDig
import
org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxTotalDigitsFacet;
import
org.apache.isis.persistence.jdo.metamodel.testing.AbstractFacetFactoryTest;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import lombok.val;
public class BigDecimalFromJdoColumnAnnotationFacetFactoryTest
@@ -58,7 +58,7 @@ extends AbstractFacetFactoryTest {
assertTrue(contains(featureTypes, FeatureType.PROPERTY));
assertFalse(contains(featureTypes, FeatureType.COLLECTION));
assertFalse(contains(featureTypes, FeatureType.ACTION));
- assertFalse(contains(featureTypes,
FeatureType.ACTION_PARAMETER_SCALAR));
+ assertFalse(contains(featureTypes,
FeatureType.ACTION_PARAMETER_SINGULAR));
}
public void testAnnotationPickedUpOnProperty() throws Exception {
diff --git
a/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactoryTest.java
b/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactoryTest.java
index dcddb5f90d..9757133889 100644
---
a/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactoryTest.java
+++
b/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactoryTest.java
@@ -20,14 +20,14 @@ package
org.apache.isis.persistence.jdo.metamodel.facets.prop.column;
import java.lang.reflect.Method;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import
org.apache.isis.core.metamodel.facets.objectvalue.mandatory.MandatoryFacet;
import
org.apache.isis.persistence.jdo.metamodel.testing.AbstractFacetFactoryTest;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
import lombok.val;
public class MandatoryFromJdoColumnAnnotationFacetFactoryTest
@@ -56,7 +56,7 @@ extends AbstractFacetFactoryTest {
assertTrue(contains(featureTypes, FeatureType.PROPERTY));
assertFalse(contains(featureTypes, FeatureType.COLLECTION));
assertFalse(contains(featureTypes, FeatureType.ACTION));
- assertFalse(contains(featureTypes,
FeatureType.ACTION_PARAMETER_SCALAR));
+ assertFalse(contains(featureTypes,
FeatureType.ACTION_PARAMETER_SINGULAR));
}
public void testPrimitiveWithNoAnnotation_isMandatory() throws Exception {
diff --git
a/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/notpersistent/GivenJdoNotPersistentAnnotationFacetFactoryTest.java
b/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/notpersistent/GivenJdoNotPersistentAnnotationFacetFactoryTest.java
index badb93d550..effda15c22 100644
---
a/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/notpersistent/GivenJdoNotPersistentAnnotationFacetFactoryTest.java
+++
b/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/notpersistent/GivenJdoNotPersistentAnnotationFacetFactoryTest.java
@@ -54,7 +54,7 @@ extends AbstractFacetFactoryTest {
assertTrue(contains(featureTypes, FeatureType.PROPERTY));
assertFalse(contains(featureTypes, FeatureType.COLLECTION));
assertFalse(contains(featureTypes, FeatureType.ACTION));
- assertFalse(contains(featureTypes,
FeatureType.ACTION_PARAMETER_SCALAR));
+ assertFalse(contains(featureTypes,
FeatureType.ACTION_PARAMETER_SINGULAR));
}
public void testNotPersistentAnnotationPickedUpOnProperty() throws
Exception {
diff --git
a/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/primarykey/GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java
b/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/primarykey/GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java
index 73f20dfe9a..0013174946 100644
---
a/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/primarykey/GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java
+++
b/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/primarykey/GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java
@@ -56,7 +56,7 @@ extends AbstractFacetFactoryTest {
assertTrue(contains(featureTypes, FeatureType.PROPERTY));
assertFalse(contains(featureTypes, FeatureType.COLLECTION));
assertFalse(contains(featureTypes, FeatureType.ACTION));
- assertFalse(contains(featureTypes,
FeatureType.ACTION_PARAMETER_SCALAR));
+ assertFalse(contains(featureTypes,
FeatureType.ACTION_PARAMETER_SINGULAR));
}
public void testIdAnnotationPickedUpOnProperty() throws Exception {
diff --git
a/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/testing/AbstractFacetFactoryTest.java
b/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/testing/AbstractFacetFactoryTest.java
index ec35161ab7..83ce026146 100644
---
a/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/testing/AbstractFacetFactoryTest.java
+++
b/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/testing/AbstractFacetFactoryTest.java
@@ -108,7 +108,7 @@ public abstract class AbstractFacetFactoryTest extends
TestCase {
facetedMethod =
FacetedMethod.createSetterForProperty(metaModelContext, Customer.class,
"firstName");
facetedMethodParameter = new FacetedMethodParameter(
metaModelContext,
- FeatureType.ACTION_PARAMETER_SCALAR,
facetedMethod.getOwningType(),
+ FeatureType.ACTION_PARAMETER_SINGULAR,
facetedMethod.getOwningType(),
facetedMethod.getMethod(), 0);
jdoFacetContext = jdoFacetContextForTesting();
diff --git
a/viewers/commons/model/src/main/java/org/apache/isis/viewer/commons/model/scalar/UiScalar.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/commons/model/scalar/UiScalar.java
index 07da88cae5..29738e3d5a 100644
---
a/viewers/commons/model/src/main/java/org/apache/isis/viewer/commons/model/scalar/UiScalar.java
+++
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/commons/model/scalar/UiScalar.java
@@ -53,12 +53,12 @@ public interface UiScalar extends UiModel,
HasMetaModelContext {
}
default boolean isSingular() {
- return getMetaModel().getFeatureType() ==
FeatureType.ACTION_PARAMETER_SCALAR
+ return getMetaModel().getFeatureType() ==
FeatureType.ACTION_PARAMETER_SINGULAR
|| getMetaModel().getFeatureType() == FeatureType.PROPERTY;
}
default boolean isPlural() {
- return getMetaModel().getFeatureType() ==
FeatureType.ACTION_PARAMETER_COLLECTION
+ return getMetaModel().getFeatureType() ==
FeatureType.ACTION_PARAMETER_PLURAL
|| getMetaModel().getFeatureType() == FeatureType.COLLECTION;
}
