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 70b5164fb5 ISIS-3215: just renaming methods (misnomer)
70b5164fb5 is described below
commit 70b5164fb512ff02a4669c346ecae9037908e2ed
Author: andi-huber <[email protected]>
AuthorDate: Sat Sep 17 21:08:22 2022 +0200
ISIS-3215: just renaming methods (misnomer)
---
...ionChoicesForCollectionParameterFacetFactory.java | 2 +-
.../core/metamodel/facets/jaxb/JaxbFacetFactory.java | 6 +++---
.../ActionParameterDefaultsFacetViaMethod.java | 4 ++--
.../method/PropertyDefaultFacetViaMethod.java | 2 +-
.../isis/core/metamodel/object/ManagedObject.java | 20 ++++++++++----------
.../isis/core/metamodel/object/ManagedObjects.java | 6 +++---
.../core/metamodel/object/_InternalTitleUtil.java | 2 +-
.../core/metamodel/objectmanager/ObjectCreator.java | 2 +-
.../core/metamodel/objectmanager/ObjectManager.java | 4 ++--
.../services/metamodel/DomainMemberDefault.java | 2 +-
.../metamodel/services/metamodel/TitleAnnotator.java | 2 +-
.../core/metamodel/spec/ObjectSpecification.java | 14 +++++++-------
.../spec/feature/ObjectActionParameter.java | 4 ++--
.../specloader/specimpl/ObjectActionDefault.java | 2 +-
.../specimpl/ObjectActionParameterAbstract.java | 4 +++-
.../specloader/specimpl/_MixedInMemberFactory.java | 2 +-
.../ident/title/TitleAnnotationFacetFactoryTest.java | 6 +++---
.../core/metamodel/object/ManagedObjectTest.java | 4 ++--
.../metamodel/services/grid/GridLoadingTest.java | 4 ++--
.../SpecificationLoaderTest_nonScalar.java | 6 +++---
.../specloader/SpecificationLoaderTest_value.java | 2 +-
.../interaction/InteractionDtoFactoryDefault.java | 2 +-
.../sitemap/SitemapServiceDefault.java | 2 +-
.../xmlsnapshot/XmlSnapshotBuilder.java | 2 +-
.../xmlsnapshot/XmlSnapshotServiceDefault.java | 2 +-
.../excel/applib/service/_CellMarshaller.java | 4 ++--
.../wkt/viewer/EventProviderAbstract.java | 2 +-
.../graphql/viewer/source/ObjectTypeFactory.java | 2 +-
.../graphql/viewer/source/QueryFieldFactory.java | 2 +-
.../incubator/viewer/javafx/ui/main/MainViewFx.java | 2 +-
.../viewer/vaadin/ui/binding/BindingsVaa.java | 2 +-
.../viewer/vaadin/ui/pages/main/MainViewVaa.java | 2 +-
.../ObjectReflectorDefaultTest_object.java | 2 +-
.../jpa/integration/entity/JpaEntityFacet.java | 4 ++--
.../domainmodel/DomainModelTest_usingGoodDomain.java | 4 ++--
.../testdomain/interact/SimulatedUiComponent.java | 2 +-
.../isis/testdomain/value/ValueSemanticsTester.java | 4 ++--
.../util/interaction/DomainObjectTesterFactory.java | 2 +-
...ntentNegotiationServiceForRestfulObjectsV1_0.java | 2 +-
.../service/swagger/internal/Generation.java | 4 ++--
.../rendering/service/swagger/internal/_Util.java | 2 +-
.../ui/actionresponse/ActionResultResponseType.java | 4 ++--
.../entityactions/LinkAndLabelFactory.java | 6 +++---
.../ui/components/actions/ActionParametersForm.java | 15 +++++++--------
.../viewer/wicket/ui/components/actions/_Xray.java | 6 +++---
.../entity/EntityComponentFactoryAbstract.java | 2 +-
.../icontitle/EntityIconAndTitlePanelFactory.java | 2 +-
.../ui/components/tree/IsisToWicketTreeAdapter.java | 2 +-
.../viewer/services/DeepLinkServiceWicket.java | 2 +-
49 files changed, 95 insertions(+), 94 deletions(-)
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 439334087a..62f6e4f684 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
@@ -94,7 +94,7 @@ implements MetaModelRefiner {
final ObjectActionParameter parameter,
final int paramNum) {
- if(parameter.isScalar()) {
+ if(parameter.isSingular()) {
return;
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/jaxb/JaxbFacetFactory.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/jaxb/JaxbFacetFactory.java
index 7c04e8404c..9ce7c27810 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/jaxb/JaxbFacetFactory.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/jaxb/JaxbFacetFactory.java
@@ -255,12 +255,12 @@ implements MetaModelRefiner {
+ "The referenced entity types must be annotated with "
+
"@XmlJavaTypeAdapter(org.apache.isis.applib.jaxb.%s.class) or equivalent.",
objectSpec.getFullIdentifier(),
- elementTypeSpec.isScalar()
+ elementTypeSpec.isSingular()
? "@Property"
: "@Collection",
propertyOrCollection.getId(),
elementType.getName(),
- elementTypeSpec.isScalar()
+ elementTypeSpec.isSingular()
? "PersistentEntityAdapter"
: "PersistentEntitiesAdapter");
}
@@ -292,7 +292,7 @@ implements MetaModelRefiner {
+ "or equivalent, "
+ "or be ignored by being annotated with
@XmlTransient.",
objectSpec.getFullIdentifier(),
- elementTypeSpec.isScalar()
+ elementTypeSpec.isSingular()
? "@Property"
: "@Collection",
propertyOrCollection.getId(),
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethod.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethod.java
index fd46c0c223..608778cef8 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethod.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethod.java
@@ -29,8 +29,8 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.ImperativeFacet;
import
org.apache.isis.core.metamodel.facets.param.defaults.ActionParameterDefaultsFacetAbstract;
import
org.apache.isis.core.metamodel.interactions.managed.ParameterNegotiationModel;
-import org.apache.isis.core.metamodel.object.MmInvokeUtil;
import org.apache.isis.core.metamodel.object.ManagedObject;
+import org.apache.isis.core.metamodel.object.MmInvokeUtil;
import lombok.Getter;
import lombok.NonNull;
@@ -89,7 +89,7 @@ implements ImperativeFacet {
return _NullSafe.streamAutodetect(defaultValue)
.map(pojo->pojo!=null
? getObjectManager().adapt(pojo)
- : managedParam.getMetaModel().isNonScalar()
+ : managedParam.getMetaModel().isPlural()
? null // assuming for non-scalar parameters,
including null makes no sense
: ManagedObject.empty(managedParam.getElementType()))
.collect(Can.toCan());
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethod.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethod.java
index 9a8096ffdf..19539fe9c4 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethod.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethod.java
@@ -63,7 +63,7 @@ implements ImperativeFacet {
private ManagedObject createAdapter(final Class<?> type, final Object
object) {
val specification = getSpecificationLoader().loadSpecification(type);
- if (specification.isScalar()) {
+ if (specification.isSingular()) {
return getObjectManager().adapt(object);
} else {
throw new UnknownTypeException("not an object, is this a
collection?");
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/object/ManagedObject.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/object/ManagedObject.java
index 898dfb013d..6a963a3b4e 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/object/ManagedObject.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/object/ManagedObject.java
@@ -297,7 +297,7 @@ extends
final @Nullable ObjectSpecification spec,
final @Nullable Object pojo) {
if(spec==null) { return UNSPECIFIED; }
- if(spec.isNonScalar()) { return PACKED; }
+ if(spec.isPlural()) { return PACKED; }
if(pojo==null) { return EMPTY; }
if(spec.isValue()) { return VALUE; }
if(spec.isInjectable()) { return SERVICE; }
@@ -522,21 +522,21 @@ extends
/**
* For cases, when the pojo's specification is not available and needs to
be looked up.
* <p>
- * Fails if the pojo is non-scalar.
+ * Fails if the pojo is not a singular (eg. collection).
* @param specLoader - required
* @param pojo - required, required non-scalar
*/
- static ManagedObject adaptScalar(
+ static ManagedObject adaptSingular(
final @NonNull SpecificationLoader specLoader,
final @NonNull Object pojo) {
val spec = specLoader.specForType(pojo.getClass()).orElse(null);
- return adaptScalarInternal(spec, pojo, Optional.empty());
+ return adaptSingularInternal(spec, pojo, Optional.empty());
}
- static ManagedObject adaptScalar(
+ static ManagedObject adaptSingular(
final @NonNull ObjectSpecification guess,
final @Nullable Object pojo) {
- return adaptScalarInternal(guess, pojo, Optional.empty());
+ return adaptSingularInternal(guess, pojo, Optional.empty());
}
/**
@@ -546,7 +546,7 @@ extends
final @NonNull ObjectSpecification spec,
final @Nullable Object pojo,
final @NonNull Bookmark bookmark) {
- return adaptScalarInternal(spec, pojo, Optional.of(bookmark));
+ return adaptSingularInternal(spec, pojo, Optional.of(bookmark));
}
// -- HELPER
@@ -554,7 +554,7 @@ extends
/**
* spec and pojo don't need to be strictly in sync, we adapt if required
*/
- private static ManagedObject adaptScalarInternal(
+ private static ManagedObject adaptSingularInternal(
final @Nullable ObjectSpecification guess,
final @Nullable Object pojo,
final @NonNull Optional<Bookmark> bookmarkIfAny) {
@@ -597,8 +597,8 @@ extends
final @NonNull ObjectActionParameter param,
final @Nullable Object paramValue) {
- return param.isScalar()
- ? adaptScalar(param.getElementType(), paramValue)
+ return param.isSingular()
+ ? adaptSingular(param.getElementType(), paramValue)
// else adopt each element pojo then pack
: packed(param.getElementType(),
ManagedObjects.adaptMultipleOfType(param.getElementType(), paramValue));
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/object/ManagedObjects.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/object/ManagedObjects.java
index 30e5c534a8..cb17593872 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/object/ManagedObjects.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/object/ManagedObjects.java
@@ -320,7 +320,7 @@ public final class ManagedObjects {
final @Nullable ManagedObject adapter,
final @NonNull Supplier<Object> pojoDefaultSupplier) {
return isNullOrUnspecifiedOrEmpty(adapter)
- ? ManagedObject.adaptScalar(elementSpec,
Objects.requireNonNull(pojoDefaultSupplier.get()))
+ ? ManagedObject.adaptSingular(elementSpec,
Objects.requireNonNull(pojoDefaultSupplier.get()))
: adapter;
}
@@ -380,7 +380,7 @@ public final class ManagedObjects {
final @Nullable Object collectionOrArray) {
return _NullSafe.streamAutodetect(collectionOrArray)
- .map(pojo->ManagedObject.adaptScalar(elementSpec, pojo)) // pojo is
nullable here
+ .map(pojo->ManagedObject.adaptSingular(elementSpec, pojo)) // pojo is
nullable here
.collect(Can.toCan());
}
@@ -393,7 +393,7 @@ public final class ManagedObjects {
final @NonNull InteractionInitiatedBy interactionInitiatedBy) {
return _NullSafe.streamAutodetect(collectionOrArray)
- .map(pojo->ManagedObject.adaptScalar(elementSpec, pojo)) // pojo is
nullable here
+ .map(pojo->ManagedObject.adaptSingular(elementSpec, pojo)) // pojo is
nullable here
.filter(MmVisibilityUtil.filterOn(interactionInitiatedBy))
.collect(Can.toCan());
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/object/_InternalTitleUtil.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/object/_InternalTitleUtil.java
index 0b8a94f8de..52d3039eac 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/object/_InternalTitleUtil.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/object/_InternalTitleUtil.java
@@ -40,7 +40,7 @@ final class _InternalTitleUtil {
return managedObject.getTitle();
}
- return managedObject.getSpecification().isScalar()
+ return managedObject.getSpecification().isSingular()
? objectTitleString(titleRenderRequest)
.trim()
: collectionTitleString(
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/ObjectCreator.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/ObjectCreator.java
index c62934d863..a7b2d75871 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/ObjectCreator.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/ObjectCreator.java
@@ -72,7 +72,7 @@ interface ObjectCreator {
}
val pojo = instantiate(spec); // can only be a scalar
- val domainObject = ManagedObject.adaptScalar(spec, pojo);
+ val domainObject = ManagedObject.adaptSingular(spec, pojo);
// initialize new object
domainObject.getSpecification().streamAssociations(MixedIn.EXCLUDED)
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/ObjectManager.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/ObjectManager.java
index e5de490f5a..7a2d6103b7 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/ObjectManager.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/ObjectManager.java
@@ -177,8 +177,8 @@ public interface ObjectManager extends HasMetaModelContext {
if(spec==null) {
return ManagedObject.unspecified();
}
- return spec.isScalar()
- ? ManagedObject.adaptScalar(spec, pojo)
+ return spec.isSingular()
+ ? ManagedObject.adaptSingular(spec, pojo)
: ManagedObject.packed(
spec.getElementSpecification().orElseGet(fallbackElementType),
_NullSafe.streamAutodetect(pojo)
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/DomainMemberDefault.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/DomainMemberDefault.java
index 8b6b114903..0fe855f4e0 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/DomainMemberDefault.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/DomainMemberDefault.java
@@ -101,7 +101,7 @@ public class DomainMemberDefault implements DomainMember {
? "2 Service"
: spec.isValue()
? "3 Value"
- : spec.isNonScalar()
+ : spec.isPlural()
? "4 Collection"
: "1 Object";
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/TitleAnnotator.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/TitleAnnotator.java
index d2dfe7ef6d..07af4b4550 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/TitleAnnotator.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/TitleAnnotator.java
@@ -79,7 +79,7 @@ public class TitleAnnotator implements MetaModelAnnotator {
titleAnnotation(parameterType,
String.format("%s: %s",
parameter.getId(),
- parameter.isScalar()
+ parameter.isSingular()
?
config().abbrev(parameter.getElementType().getCorrespondingClass())
: renderTypeOf((OneToManyFeature) parameter, config()))
);
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
index c68510390e..d9946c71cc 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
@@ -333,12 +333,12 @@ extends
*
* <p>
* In effect, means that it doesn't have the {@link CollectionFacet}, and
- * therefore will return NOT {@link #isNonScalar()}
+ * therefore will return NOT {@link #isPlural()}
*
- * @see #isNonScalar()
+ * @see #isPlural()
*/
- default boolean isScalar() {
- return !isNonScalar();
+ default boolean isSingular() {
+ return !isPlural();
}
/**
@@ -346,11 +346,11 @@ extends
*
* <p>
* In effect, means has got {@link CollectionFacet}, and therefore will
- * return NOT {@link #isScalar()}.
+ * return NOT {@link #isSingular()}.
*
- * @see #isScalar()
+ * @see #isSingular()
*/
- default boolean isNonScalar() {
+ default boolean isPlural() {
return getBeanSort().isCollection();
}
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 440a59506d..5e412735df 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
@@ -58,11 +58,11 @@ extends ObjectFeature, CurrentHolder {
*/
int getParameterIndex();
- default boolean isScalar() {
+ default boolean isSingular() {
return getFeatureType()==FeatureType.ACTION_PARAMETER_SCALAR;
}
- default boolean isNonScalar() {
+ default boolean isPlural() {
return getFeatureType()==FeatureType.ACTION_PARAMETER_COLLECTION;
}
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 abc3f82b4a..b17d8d3435 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
@@ -115,7 +115,7 @@ implements ObjectAction {
elementType = Facets.elementSpec(getFacetedMethod())
.orElseGet(()->{
val returnType = getReturnType();
- if(!returnType.isScalar()) {
+ if(!returnType.isSingular()) {
log.warn("non-scalar action return type requires a
TypeOfFacet: {}", identifier);
}
return returnType;
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 4b8d06cc6a..0d67e5a06c 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,7 +240,9 @@ implements
.map(defaultsFacet->defaultsFacet.getDefault(pendingArgs))
.orElseGet(Can::empty);
- if(pendingArgs.getParamMetamodel(getParameterIndex()).isNonScalar()) {
+ val paramMeta = pendingArgs.getParamMetamodel(getParameterIndex());
+
+ if(paramMeta.isPlural()) {
final Can<ManagedObject> nonScalarDefaults = defaults
// post processing each entry
.map(obj->ManagedObjects.emptyToDefault(paramSpec, !isOptional(),
obj));
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/_MixedInMemberFactory.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/_MixedInMemberFactory.java
index 179d6344b2..cb9b530735 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/_MixedInMemberFactory.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/_MixedInMemberFactory.java
@@ -46,7 +46,7 @@ class _MixedInMemberFactory {
final String mixinMethodName) {
return mixinAction ->
- mixinAction.getReturnType().isScalar()
+ mixinAction.getReturnType().isSingular()
? new OneToOneAssociationMixedIn(
mixinAction, mixeeSpec, mixinType, mixinMethodName)
: new OneToManyAssociationMixedIn(
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/TitleAnnotationFacetFactoryTest.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/TitleAnnotationFacetFactoryTest.java
index 22077385dd..f05481b081 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/TitleAnnotationFacetFactoryTest.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/TitleAnnotationFacetFactoryTest.java
@@ -160,7 +160,7 @@ extends AbstractFacetFactoryJupiterTestCase {
}
final Customer2 customer = new Customer2();
- val objectAdapter =
ManagedObject.adaptScalar(getSpecificationLoader(), customer);
+ val objectAdapter =
ManagedObject.adaptSingular(getSpecificationLoader(), customer);
final String title = titleFacetViaTitleAnnotation.title(objectAdapter);
assertThat(title, is("titleElement1. titleElement3,titleElement2"));
@@ -231,9 +231,9 @@ extends AbstractFacetFactoryJupiterTestCase {
public void titleAnnotatedMethodsSomeOfWhichReturnNulls() throws Exception
{
{ // check prerequisites
- val wThree = ManagedObject.adaptScalar(getSpecificationLoader(),
Integer.valueOf(3));
+ val wThree = ManagedObject.adaptSingular(getSpecificationLoader(),
Integer.valueOf(3));
assertEquals("3", wThree.getTitle());
- val pThree = ManagedObject.adaptScalar(getSpecificationLoader(),
3);
+ val pThree = ManagedObject.adaptSingular(getSpecificationLoader(),
3);
assertEquals("3", pThree.getTitle());
}
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/object/ManagedObjectTest.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/object/ManagedObjectTest.java
index 02de16d75d..45c03dab65 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/object/ManagedObjectTest.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/object/ManagedObjectTest.java
@@ -84,7 +84,7 @@ class ManagedObjectTest {
val emptyObject = ManagedObject.empty(spec);
assertNotNull(emptyObject);
- val presentObject = ManagedObject.adaptScalar(specLoader, 3);
+ val presentObject = ManagedObject.adaptSingular(specLoader, 3);
assertEquals(Specialization.VALUE, presentObject.getSpecialization());
presentObject.assertCompliance(6);
@@ -113,7 +113,7 @@ class ManagedObjectTest {
val constructor = cls.getConstructor(_Constants.emptyClasses);
val pojo = constructor.newInstance(_Constants.emptyObjects);
- val presentObject = ManagedObject.adaptScalar(specLoader, pojo);
+ val presentObject = ManagedObject.adaptSingular(specLoader, pojo);
assertEquals(Specialization.VIEWMODEL,
presentObject.getSpecialization());
presentObject.assertCompliance(pojo);
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/GridLoadingTest.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/GridLoadingTest.java
index f865c57627..d648c321d1 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/GridLoadingTest.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/GridLoadingTest.java
@@ -70,7 +70,7 @@ extends MetaModelTestAbstract {
assertNotNull(gridFacet);
// triggers grid to be loaded (if initial or reloading supported)
- val grid = gridFacet.getGrid(ManagedObject.adaptScalar(barSpec, new
Bar()));
+ val grid = gridFacet.getGrid(ManagedObject.adaptSingular(barSpec, new
Bar()));
assertNotNull(grid);
// verify object-action's member named facet was installed when
loading Grid from XML
@@ -82,7 +82,7 @@ extends MetaModelTestAbstract {
// verify however, that the number of facets stays constant
// triggers grid to be re-loaded
- val grid2 = gridFacet.getGrid(ManagedObject.adaptScalar(barSpec, new
Bar()));
+ val grid2 = gridFacet.getGrid(ManagedObject.adaptSingular(barSpec, new
Bar()));
assertNotSame(grid, grid2); // verify that we actually got a new grid,
indicative of a reload having taken place
assertEquals(customNamed,
objectAction.getStaticFriendlyName().orElse(null));
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_nonScalar.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_nonScalar.java
index cbbf3bd4d5..f07adfbff9 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_nonScalar.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_nonScalar.java
@@ -43,7 +43,7 @@ class SpecificationLoaderTest_nonScalar {
}
@Test void testType() throws Exception {
- assertTrue(specification.isNonScalar());
+ assertTrue(specification.isPlural());
}
@Test void testName() throws Exception {
@@ -73,7 +73,7 @@ class SpecificationLoaderTest_nonScalar {
}
@Test void testType() throws Exception {
- assertTrue(specification.isNonScalar());
+ assertTrue(specification.isPlural());
}
@Test void testName() throws Exception {
@@ -102,7 +102,7 @@ class SpecificationLoaderTest_nonScalar {
}
@Test void testType() throws Exception {
- assertTrue(specification.isNonScalar());
+ assertTrue(specification.isPlural());
}
@Test void testName() throws Exception {
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_value.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_value.java
index 1095de4dfc..04972ce1df 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_value.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_value.java
@@ -34,7 +34,7 @@ class SpecificationLoaderTest_value extends
SpecificationLoaderTestAbstract {
@Test
public void testType() throws Exception {
- assertTrue(specification.isScalar());
+ assertTrue(specification.isSingular());
}
@Test
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/interaction/InteractionDtoFactoryDefault.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/interaction/InteractionDtoFactoryDefault.java
index 0614f7277f..abed66745f 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/interaction/InteractionDtoFactoryDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/interaction/InteractionDtoFactoryDefault.java
@@ -109,7 +109,7 @@ public class InteractionDtoFactoryDefault implements
InteractionDtoFactory {
val elementSpec = objectAction.getElementType();
- if(objectAction.getReturnType().isScalar()) {
+ if(objectAction.getReturnType().isSingular()) {
//scalar
valueMarshaller.recordActionResultScalar(actionInvocationDto,
objectAction, resultObject);
} else {
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sitemap/SitemapServiceDefault.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sitemap/SitemapServiceDefault.java
index 7d84b2f8ef..56aad07257 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sitemap/SitemapServiceDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sitemap/SitemapServiceDefault.java
@@ -101,7 +101,7 @@ public class SitemapServiceDefault implements
SitemapService {
if(actionElementType.getCorrespondingClass()==void.class) {
adoc.append("WARNING: ");
}
- if(actionReturnType.isNonScalar()) {
+ if(actionReturnType.isPlural()) {
adoc.append(String.format("Returns collection of:
`%s`\n\n", actionElementType.getLogicalTypeName()));
} else {
adoc.append(String.format("Returns scalar of:
`%s`\n\n", actionElementType.getLogicalTypeName()));
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xmlsnapshot/XmlSnapshotBuilder.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xmlsnapshot/XmlSnapshotBuilder.java
index 75e698543a..87db5beb05 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xmlsnapshot/XmlSnapshotBuilder.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xmlsnapshot/XmlSnapshotBuilder.java
@@ -79,7 +79,7 @@ public class XmlSnapshotBuilder {
}
public XmlSnapshot build() {
- final ManagedObject adapter =
ManagedObject.adaptScalar(specificationLoader, domainObject);
+ final ManagedObject adapter =
ManagedObject.adaptSingular(specificationLoader, domainObject);
final XmlSnapshot snapshot = (schema != null)
? new XmlSnapshot(adapter, schema)
: new XmlSnapshot(adapter);
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java
index f8ec1e95f6..558ccb6808 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java
@@ -86,7 +86,7 @@ public class XmlSnapshotServiceDefault implements
XmlSnapshotService {
*/
@Override
public XmlSnapshotService.Snapshot snapshotFor(final Object domainObject) {
- final ManagedObject adapter =
ManagedObject.adaptScalar(specificationLoader, domainObject);
+ final ManagedObject adapter =
ManagedObject.adaptSingular(specificationLoader, domainObject);
return new XmlSnapshot(adapter);
}
diff --git
a/extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_CellMarshaller.java
b/extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_CellMarshaller.java
index b368c440a4..0d29324163 100644
---
a/extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_CellMarshaller.java
+++
b/extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_CellMarshaller.java
@@ -87,7 +87,7 @@ final class _CellMarshaller {
}
// reference types
- if(!propertySpec.isNonScalar()) {
+ if(!propertySpec.isPlural()) {
setCellValueForBookmark(cell, propertyAsObj, propertyAsTitle,
defaultCellStyle);
return;
}
@@ -318,7 +318,7 @@ final class _CellMarshaller {
}
// reference types
- if(!propertySpec.isNonScalar()) {
+ if(!propertySpec.isPlural()) {
return getCellComment(cell, requiredType);
}
diff --git
a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/viewer/EventProviderAbstract.java
b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/viewer/EventProviderAbstract.java
index 210ba2e3b8..c5f92f5f8d 100644
---
a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/viewer/EventProviderAbstract.java
+++
b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/viewer/EventProviderAbstract.java
@@ -121,7 +121,7 @@ public abstract class EventProviderAbstract implements
EventProvider {
final Object dereferencedObject = dereference(commonContext,
domainObjectPojo);
val dereferencedManagedObject =
-
ManagedObject.adaptScalar(commonContext.getSpecificationLoader(),
dereferencedObject);
+
ManagedObject.adaptSingular(commonContext.getSpecificationLoader(),
dereferencedObject);
val oid =
ManagedObjects.bookmark(dereferencedManagedObject).orElse(null);
if(oid!=null) {
diff --git
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/isis/viewer/graphql/viewer/source/ObjectTypeFactory.java
b/incubator/viewers/graphql/viewer/src/main/java/org/apache/isis/viewer/graphql/viewer/source/ObjectTypeFactory.java
index 4f15234a8c..729047702b 100644
---
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/isis/viewer/graphql/viewer/source/ObjectTypeFactory.java
+++
b/incubator/viewers/graphql/viewer/src/main/java/org/apache/isis/viewer/graphql/viewer/source/ObjectTypeFactory.java
@@ -414,7 +414,7 @@ public class ObjectTypeFactory {
Class<?> domainObjectInstanceClass =
domainObjectInstance.getClass();
ObjectSpecification specification =
specificationLoader.loadSpecification(domainObjectInstanceClass);
- ManagedObject owner =
ManagedObject.adaptScalar(specification, domainObjectInstance);
+ ManagedObject owner =
ManagedObject.adaptSingular(specification, domainObjectInstance);
ManagedObject managedObject = otom.get(owner);
diff --git
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/isis/viewer/graphql/viewer/source/QueryFieldFactory.java
b/incubator/viewers/graphql/viewer/src/main/java/org/apache/isis/viewer/graphql/viewer/source/QueryFieldFactory.java
index 80eb133f9e..dcfa38ec8f 100644
---
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/isis/viewer/graphql/viewer/source/QueryFieldFactory.java
+++
b/incubator/viewers/graphql/viewer/src/main/java/org/apache/isis/viewer/graphql/viewer/source/QueryFieldFactory.java
@@ -123,7 +123,7 @@ public class QueryFieldFactory {
ObjectSpecification specification =
specificationLoader
.loadSpecification(domainObjectInstanceClass);
- ManagedObject owner =
ManagedObject.adaptScalar(specification, domainObjectInstance);
+ ManagedObject owner =
ManagedObject.adaptSingular(specification, domainObjectInstance);
ActionInteractionHead actionInteractionHead =
objectAction.interactionHead(owner);
diff --git
a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/MainViewFx.java
b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/MainViewFx.java
index f59bdb7e65..15dd057a64 100644
---
a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/MainViewFx.java
+++
b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/MainViewFx.java
@@ -122,7 +122,7 @@ public class MainViewFx {
private Node uiComponentForActionResult(final ManagedObject actionResult) {
if (ManagedObjects.isSpecified(actionResult)
- && actionResult.getSpecification().isNonScalar()) {
+ && actionResult.getSpecification().isPlural()) {
return TableViewFx.fromCollection(uiContext, actionResult,
Where.STANDALONE_TABLES);
} else {
return ObjectViewFx.fromObject(
diff --git
a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/binding/BindingsVaa.java
b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/binding/BindingsVaa.java
index 3866e7f688..bd146f53ac 100644
---
a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/binding/BindingsVaa.java
+++
b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/binding/BindingsVaa.java
@@ -362,7 +362,7 @@ public final class BindingsVaa {
@Override
public void accept(@NonNull final Bindable<ManagedObject> target,
final V fieldValue) {
//TODO should we support the packed case as well?
- target.setValue(ManagedObject.adaptScalar(valueSpec, fieldValue));
+ target.setValue(ManagedObject.adaptSingular(valueSpec,
fieldValue));
}
diff --git
a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/MainViewVaa.java
b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/MainViewVaa.java
index dc56686683..a99b316605 100644
---
a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/MainViewVaa.java
+++
b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/MainViewVaa.java
@@ -120,7 +120,7 @@ implements BeforeEnterObserver {
}
private Component uiComponentForActionResult(final ManagedObject
actionResult) {
- if (actionResult.getSpecification().isNonScalar()) {
+ if (actionResult.getSpecification().isPlural()) {
return TableViewVaa.fromCollection(uiContext, actionResult,
Where.STANDALONE_TABLES);
} else {
return ObjectViewVaa.fromObject(
diff --git
a/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/specloader/ObjectReflectorDefaultTest_object.java
b/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/specloader/ObjectReflectorDefaultTest_object.java
index 16d6a202a9..ecb41e7458 100644
---
a/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/specloader/ObjectReflectorDefaultTest_object.java
+++
b/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/specloader/ObjectReflectorDefaultTest_object.java
@@ -47,7 +47,7 @@ class ObjectReflectorDefaultTest_object extends
SpecificationLoaderTestAbstract
@Test
void testType() throws Exception {
- assertTrue(specification.isScalar());
+ assertTrue(specification.isSingular());
}
@Test
diff --git
a/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/entity/JpaEntityFacet.java
b/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/entity/JpaEntityFacet.java
index 2d9f3232c5..6c23f797f9 100644
---
a/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/entity/JpaEntityFacet.java
+++
b/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/entity/JpaEntityFacet.java
@@ -155,7 +155,7 @@ public class JpaEntityFacet
val entitySpec = getEntitySpecification();
return Can.ofStream(
typedQuery.getResultStream()
- .map(entity ->
ManagedObject.adaptScalar(entitySpec, entity)));
+ .map(entity ->
ManagedObject.adaptSingular(entitySpec, entity)));
} else if (query instanceof NamedQuery) {
@@ -182,7 +182,7 @@ public class JpaEntityFacet
val entitySpec = getEntitySpecification();
return Can.ofStream(
namedQuery.getResultStream()
- .map(entity ->
ManagedObject.adaptScalar(entitySpec, entity)));
+ .map(entity ->
ManagedObject.adaptSingular(entitySpec, entity)));
}
diff --git
a/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
b/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
index d91a6237c6..5258cf4442 100644
---
a/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
+++
b/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
@@ -256,7 +256,7 @@ class DomainModelTest_usingGoodDomain {
assertEquals("inherited title", titleService.titleOf(instance));
assertEquals("inherited icon", titleService.iconNameOf(instance));
- val domainObject = ManagedObject.adaptScalar(spec, instance);
+ val domainObject = ManagedObject.adaptSingular(spec, instance);
assertEquals("inherited title", domainObject.getTitle());
assertEquals("inherited icon", iconFacet.iconName(domainObject));
}
@@ -576,7 +576,7 @@ class DomainModelTest_usingGoodDomain {
val objectSpec =
specificationLoader.specForTypeElseFail(ProperMemberSupport.class);
val member = objectSpec.getMemberElseFail(memberId);
- val sampleObject = ManagedObject.adaptScalar(objectSpec, new
ProperMemberSupport());
+ val sampleObject = ManagedObject.adaptSingular(objectSpec, new
ProperMemberSupport());
assertEquals(named, member.getFriendlyName(()->sampleObject));
assertEquals(described,
member.getDescription(()->sampleObject).orElse(null));
diff --git
a/regressiontests/stable-interact/src/test/java/org/apache/isis/testdomain/interact/SimulatedUiComponent.java
b/regressiontests/stable-interact/src/test/java/org/apache/isis/testdomain/interact/SimulatedUiComponent.java
index 4525ca2023..6d9af828c7 100644
---
a/regressiontests/stable-interact/src/test/java/org/apache/isis/testdomain/interact/SimulatedUiComponent.java
+++
b/regressiontests/stable-interact/src/test/java/org/apache/isis/testdomain/interact/SimulatedUiComponent.java
@@ -44,7 +44,7 @@ public class SimulatedUiComponent extends HasValueValidation {
}
public void simulateValueChange(final Object newValue) {
- value.setValue(ManagedObject.adaptScalar(valueSpec, newValue));
+ value.setValue(ManagedObject.adaptSingular(valueSpec, newValue));
}
public ManagedObject getValue() {
diff --git
a/regressiontests/stable-value/src/test/java/org/apache/isis/testdomain/value/ValueSemanticsTester.java
b/regressiontests/stable-value/src/test/java/org/apache/isis/testdomain/value/ValueSemanticsTester.java
index da62128771..111282c668 100644
---
a/regressiontests/stable-value/src/test/java/org/apache/isis/testdomain/value/ValueSemanticsTester.java
+++
b/regressiontests/stable-value/src/test/java/org/apache/isis/testdomain/value/ValueSemanticsTester.java
@@ -115,10 +115,10 @@ public class ValueSemanticsTester<T> {
val command =
interactionService.currentInteractionElseFail().getCommand();
val propInteraction = PropertyInteraction
-
.wrap(ManagedProperty.of(ManagedObject.adaptScalar(objSpec, domainObject),
prop, Where.OBJECT_FORMS));
+
.wrap(ManagedProperty.of(ManagedObject.adaptSingular(objSpec, domainObject),
prop, Where.OBJECT_FORMS));
propInteraction.modifyProperty(managedProp->
- ManagedObject.adaptScalar(managedProp.getElementType(),
newProperyValueProvider.apply(managedProp)));
+ ManagedObject.adaptSingular(managedProp.getElementType(),
newProperyValueProvider.apply(managedProp)));
probe.testCommand(context, command);
});
diff --git
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/util/interaction/DomainObjectTesterFactory.java
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/util/interaction/DomainObjectTesterFactory.java
index f47b5fb5cd..5dd84b3843 100644
---
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/util/interaction/DomainObjectTesterFactory.java
+++
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/util/interaction/DomainObjectTesterFactory.java
@@ -625,7 +625,7 @@ public class DomainObjectTesterFactory {
@SuppressWarnings("unchecked")
static void updatePojo(final ManagedValue managedValue, final
UnaryOperator replacer) {
- managedValue.update(v->ManagedObject.adaptScalar(
+ managedValue.update(v->ManagedObject.adaptSingular(
v.getSpecification(),
replacer.apply(v.getPojo())));
}
diff --git
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
index c1aa08b060..08205c1e87 100644
---
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
+++
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
@@ -200,7 +200,7 @@ implements ContentNegotiationService {
val returnTypeCompileTimeSpecification =
objectAndActionInvocation.getReturnTypeSpecification();
val isDomainObjectOrCollection =
returnTypeCompileTimeSpecification.isEntityOrViewModelOrAbstract()
- || returnTypeCompileTimeSpecification.isNonScalar();
+ || returnTypeCompileTimeSpecification.isPlural();
final List<MediaType> acceptableMediaTypes =
resourceContext.getAcceptableMediaTypes();
if(isDomainObjectOrCollection
diff --git
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Generation.java
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Generation.java
index 912900cc08..f5cf420462 100644
---
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Generation.java
+++
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Generation.java
@@ -634,7 +634,7 @@ class Generation {
}
Property actionReturnTypeFor(final ObjectAction objectAction) {
- return objectAction.getReturnType().isNonScalar()
+ return objectAction.getReturnType().isPlural()
? arrayPropertyOf(objectAction.getElementType())
: modelFor(objectAction.getReturnType());
}
@@ -673,7 +673,7 @@ class Generation {
return new ObjectProperty();
}
- if(specification.isNonScalar()) {
+ if(specification.isPlural()) {
val elementSpec = Facets.elementSpec(specification).orElse(null);
if(elementSpec != null) {
return arrayPropertyOf(elementSpec);
diff --git
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/_Util.java
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/_Util.java
index da5b97976f..c1e4fc2a7a 100644
---
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/_Util.java
+++
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/_Util.java
@@ -86,7 +86,7 @@ final class _Util {
if(specification.isValue()) {
return true;
}
- if(specification.isNonScalar()) {
+ if(specification.isPlural()) {
val elementSpec = Facets.elementSpec(specification).orElse(null);
if(elementSpec != null) {
return isVisibleForPublic(elementSpec);
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
index 389f0ab043..e03ee8ee97 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
@@ -243,7 +243,7 @@ public enum ActionResultResponseType {
final MetaModelContext commonContext,
final ManagedObject resultAdapter) {
- if (resultAdapter.getSpecification().isScalar()) {
+ if (resultAdapter.getSpecification().isSingular()) {
return resultAdapter;
} else {
// will only be a single element
@@ -276,7 +276,7 @@ public enum ActionResultResponseType {
// scalar ...
- _Assert.assertTrue(resultSpec.isScalar());
+ _Assert.assertTrue(resultSpec.isSingular());
if(LoginRedirect.LOGICAL_TYPE_NAME.equals(resultSpec.getLogicalTypeName())) {
return TypeAndAdapter.of(ActionResultResponseType.SIGN_IN,
resultAdapter);
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/LinkAndLabelFactory.java
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/LinkAndLabelFactory.java
index 994fb74a27..2c651bb98f 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/LinkAndLabelFactory.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/LinkAndLabelFactory.java
@@ -29,10 +29,10 @@ import
org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.models.ActionModel;
import org.apache.isis.viewer.wicket.model.models.ActionModelImpl;
import
org.apache.isis.viewer.wicket.model.models.EntityCollectionModelParented;
-import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.model.models.ScalarParameterModel;
import org.apache.isis.viewer.wicket.model.models.ScalarPropertyModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import
org.apache.isis.viewer.wicket.ui.components.widgets.linkandlabel.ActionLink;
import org.apache.isis.viewer.wicket.ui.pages.PageAbstract;
@@ -98,9 +98,9 @@ extends Function<ObjectAction, LinkAndLabel> {
public static LinkAndLabelFactory forParameter(
final ScalarParameterModel parameterModel) {
- //XXX[ISIS-3080] only supported, when parameter type is a scalar
composite value-type
+ //XXX[ISIS-3080] only supported, when parameter type is a singular
composite value-type
val param = parameterModel.getMetaModel();
- if(param.isScalar()
+ if(param.isSingular()
&& param.getElementType().isCompositeValue()) {
return action -> LinkAndLabel.of(
ActionModelImpl.forEntity(
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersForm.java
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersForm.java
index 371f01e31a..e75fb3625d 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersForm.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersForm.java
@@ -138,7 +138,7 @@ extends PromptFormAbstract<ActionModel> {
_Xray.beforeParamFormUpdate(paramNumberUpdated, paramNegotiationModel);
// only updates subsequent parameter panels starting from
(paramNumberUpdated + 1)
- final int skipCount = paramNumberUpdated + 1;
+ final int skipCount = paramNumberUpdated + 1; // eg. if
paramNumberUpdated=0 then skipCount=1
val paramCount =
updatedParamModel.getMetaModel().getAction().getParameterCount();
val maxCapacity = paramCount - skipCount; // just an optimization, not
strictly required
@@ -148,17 +148,16 @@ extends PromptFormAbstract<ActionModel> {
.skip(skipCount)
.map(paramModel->{
- val paramIndex = paramModel.getParameterIndex();
- val pendingArgs = paramModel.getParameterNegotiationModel();
-
+ val paramIndexForReassessment = paramModel.getParameterIndex();
val actionParameter = paramModel.getMetaModel();
- actionParameter.reassessDefault(pendingArgs);
- _Xray.reassessedDefault(paramIndex, paramNegotiationModel);
- val paramPanel = paramPanels.get(paramIndex);
+ actionParameter.reassessDefault(paramNegotiationModel);
+ _Xray.reassessedDefault(paramIndexForReassessment,
paramNegotiationModel);
+
+ val paramPanel = paramPanels.get(paramIndexForReassessment);
val paramRepaint = paramPanel.updateIfNecessary(paramModel,
Optional.of(target));
if(paramRepaint.isParamOnly()) {
- paramOnlyUpdateRequestsHavingParamIndex.add(paramIndex);
+
paramOnlyUpdateRequestsHavingParamIndex.add(paramIndexForReassessment);
}
return paramRepaint;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/_Xray.java
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/_Xray.java
index b55e82adc4..879616f5f9 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/_Xray.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/_Xray.java
@@ -37,7 +37,7 @@ final class _Xray {
val data = MmDebugUtil
.paramUpdateDataFor(paramIndex, paramNegotiationModel);
- _XrayEvent.event("Param Form about to update: %s", data.formatted());
+ _XrayEvent.event("Param Form - about to update: %s", data.formatted());
}
void reassessedDefault(
@@ -47,7 +47,7 @@ final class _Xray {
val data = MmDebugUtil
.paramUpdateDataFor(paramIndex, paramNegotiationModel);
- _XrayEvent.event("Param Form param default reassessed: %s",
data.formatted());
+ _XrayEvent.event("Param Form - param default[%d] reassessed: %s",
paramIndex, data.formatted());
}
void afterParamFormUpdate(
@@ -57,7 +57,7 @@ final class _Xray {
val data = MmDebugUtil
.paramUpdateDataFor(paramIndex, paramNegotiationModel);
- _XrayEvent.event("Param Form updated: %s", data.formatted());
+ _XrayEvent.event("Param Form - updated: %s", data.formatted());
}
}
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/EntityComponentFactoryAbstract.java
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/EntityComponentFactoryAbstract.java
index 38222c315c..c9802193e8 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/EntityComponentFactoryAbstract.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/EntityComponentFactoryAbstract.java
@@ -67,7 +67,7 @@ public abstract class EntityComponentFactoryAbstract extends
ComponentFactoryAbs
// is ok;
}
val spec = entityModel.getTypeOfSpecification();
- if (spec.isScalar()
+ if (spec.isSingular()
&& !spec.isValue()) {
return doAppliesTo(entityModel);
}
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanelFactory.java
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanelFactory.java
index f293798625..e7187f3abc 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanelFactory.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanelFactory.java
@@ -77,7 +77,7 @@ public class EntityIconAndTitlePanelFactory extends
ComponentFactoryAbstract {
return ApplicationAdvice.DOES_NOT_APPLY;
}
- return spec.isScalar()
+ return spec.isSingular()
&& !spec.isValue()
? ApplicationAdvice.APPLIES
: ApplicationAdvice.DOES_NOT_APPLY;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java
index 88972f0302..dec6b12a44 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java
@@ -259,7 +259,7 @@ class IsisToWicketTreeAdapter {
this.commonContext = commonContext;
this.factoryService =
commonContext.lookupServiceElseFail(FactoryService.class);
this.pojoToAdapter = pojo ->
-
ManagedObject.adaptScalar(commonContext.getSpecificationLoader(), pojo);
+
ManagedObject.adaptSingular(commonContext.getSpecificationLoader(), pojo);
}
private TreeAdapter wrappedTreeAdapter() {
diff --git
a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
index db3751d98c..563fbe6ba4 100644
---
a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
+++
b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
@@ -58,7 +58,7 @@ public class DeepLinkServiceWicket implements DeepLinkService
{
@Override
public URI deepLinkFor(final Object domainObject) {
- final ManagedObject objectAdapter =
ManagedObject.adaptScalar(specificationLoader, domainObject);
+ final ManagedObject objectAdapter =
ManagedObject.adaptSingular(specificationLoader, domainObject);
final PageParameters pageParameters =
PageParameterUtils.createPageParametersForObject(objectAdapter);
