This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/main by this push:
new d97c43f3f70 CAUSEWAY-2297: better name for explicit optional
ObjSpec#elementSpec
d97c43f3f70 is described below
commit d97c43f3f70a841e4ce5b7b3774890825c93d8a7
Author: andi-huber <[email protected]>
AuthorDate: Sun Feb 8 09:54:10 2026 +0100
CAUSEWAY-2297: better name for explicit optional ObjSpec#elementSpec
---
.../org/apache/causeway/core/metamodel/object/_InternalTitleUtil.java | 2 +-
.../apache/causeway/core/metamodel/objectmanager/ObjectManager.java | 2 +-
.../apache/causeway/core/metamodel/spec/HasObjectSpecification.java | 4 ++--
.../org/apache/causeway/core/metamodel/spec/ObjectSpecification.java | 4 ++--
.../causeway/core/metamodel/spec/impl/ObjectSpecificationDefault.java | 2 +-
.../rendering/domainobjects/ActionResultReprRenderer.java | 2 +-
.../rendering/domainobjects/ObjectAndActionInvocation.java | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_InternalTitleUtil.java
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_InternalTitleUtil.java
index f5bd03d591b..c9821fc6d76 100644
---
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_InternalTitleUtil.java
+++
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/_InternalTitleUtil.java
@@ -72,7 +72,7 @@ private String getDefaultTitle(final ManagedObject
managedObject) {
private String formatAnyCardinalityAsTitle(final @NonNull
ObjectSpecification objSpec, final @NonNull ManagedObject managedObject) {
final int size =
objSpec.getFacet(CollectionFacet.class).size(managedObject);
- var elementSpec = objSpec.getElementSpecification().orElse(null);
+ var elementSpec = objSpec.explicitElementSpec().orElse(null);
objSpec.getTranslationService().translate(TranslationContext.forClassName(objSpec.getCorrespondingClass()),
null);
final String noun = (elementSpec == null
diff --git
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/objectmanager/ObjectManager.java
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/objectmanager/ObjectManager.java
index bc2bd26ef3d..5fd4cadb48a 100644
---
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/objectmanager/ObjectManager.java
+++
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/objectmanager/ObjectManager.java
@@ -222,7 +222,7 @@ public ManagedObject adapt(
return spec.isSingular()
? ManagedObject.adaptSingular(spec, pojo)
: ManagedObject.packed(
-
spec.getElementSpecification().orElseGet(fallbackElementType),
+
spec.explicitElementSpec().orElseGet(fallbackElementType),
_NullSafe.streamAutodetect(pojo)
.map(element->adapt(element))
.collect(Can.toCan()));
diff --git
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/HasObjectSpecification.java
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/HasObjectSpecification.java
index 0e64e4d5f5f..a65499783a7 100644
---
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/HasObjectSpecification.java
+++
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/HasObjectSpecification.java
@@ -49,8 +49,8 @@ default String logicalTypeName() {
/**
* As used for the element type of collections.
*/
- default Optional<ObjectSpecification> getElementSpecification() {
- return objSpec().getElementSpecification();
+ default Optional<ObjectSpecification> explicitElementSpec() {
+ return objSpec().explicitElementSpec();
}
default Bookmark createBookmark(final @NonNull String urlSafeIdentifier) {
diff --git
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/ObjectSpecification.java
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/ObjectSpecification.java
index d2ecdd8ca1a..22e37e99899 100644
---
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/ObjectSpecification.java
+++
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/ObjectSpecification.java
@@ -273,7 +273,7 @@ default Optional<MixedInAction> lookupMixedInAction(final
ObjectSpecification mi
* @return optionally the element type spec based on presence of the
TypeOfFacet
* @since 2.0
*/
- Optional<ObjectSpecification> getElementSpecification();
+ Optional<ObjectSpecification> explicitElementSpec();
/**
* @since 2.0
@@ -607,7 +607,7 @@ default public boolean isPojoCompatible(final Object pojo) {
return true;
}
- var elementSpec = getElementSpecification()
+ var elementSpec = explicitElementSpec()
.orElse(this);
return _NullSafe.streamAutodetect(pojo)
.filter(element->!Objects.equals(element, pojo)) // to prevent
infinite recursion depth
diff --git
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/ObjectSpecificationDefault.java
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/ObjectSpecificationDefault.java
index 381916f1a51..6cd28f22706 100644
---
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/ObjectSpecificationDefault.java
+++
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/ObjectSpecificationDefault.java
@@ -378,7 +378,7 @@ private void catalogueActions(final
BiConsumer<ResolvedMethod, ObjectMember> onM
.map(typeOfFacet -> typeOfFacet.elementSpec()));
@Override
- public Optional<ObjectSpecification> getElementSpecification() {
+ public Optional<ObjectSpecification> explicitElementSpec() {
return elementSpecification.get();
}
diff --git
a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/ActionResultReprRenderer.java
b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/ActionResultReprRenderer.java
index 3b7dffffd66..7663d73d442 100644
---
a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/ActionResultReprRenderer.java
+++
b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/ActionResultReprRenderer.java
@@ -148,7 +148,7 @@ private ReprRendererAbstract<?> buildResultRenderer(
new ListReprRenderer(resourceContext, null,
representation).withElementRel(Rel.ELEMENT);
listReprRenderer.with(collectionAdapters)
.withReturnType(action.getReturnType())
-
.withElementType(returnedAdapter.getElementSpecification().orElse(null));
+
.withElementType(returnedAdapter.explicitElementSpec().orElse(null));
return listReprRenderer;
diff --git
a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/ObjectAndActionInvocation.java
b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/ObjectAndActionInvocation.java
index c8d0dac12a2..51c5173cd67 100644
---
a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/ObjectAndActionInvocation.java
+++
b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/ObjectAndActionInvocation.java
@@ -83,7 +83,7 @@ public ActionResultRepresentation.ResultType
determineResultType() {
// though not strictly required, try to be consistent: empty list
vs populated list
if(elementAdapters.get().isEmpty()) {
- var isElementTypeAScalarValue =
returnTypeSpec.getElementSpecification()
+ var isElementTypeAScalarValue =
returnTypeSpec.explicitElementSpec()
.map(elementSpec->isScalarValue(elementSpec))
.orElse(false);
return isElementTypeAScalarValue
