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 932fef619e ISIS-3060: aligns names for all ParamDescribedFacet(s)
932fef619e is described below
commit 932fef619ee8209c2034b58e0a5800f8ff3612ef
Author: Andi Huber <[email protected]>
AuthorDate: Wed Jul 6 14:41:50 2022 +0200
ISIS-3060: aligns names for all ParamDescribedFacet(s)
---
...mType.java => ParamDescribedFacetFromType.java} | 6 +--
...escribedFacetForParameterLayoutAnnotation.java} | 6 +--
.../param/layout/ParameterLayoutFacetFactory.java | 2 +-
.../all/DescribedAsFromTypePostProcessor.java | 59 ++++++++++------------
4 files changed, 34 insertions(+), 39 deletions(-)
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/described/annotderived/DescribedAsFacetOnParameterFromType.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/described/annotderived/ParamDescribedFacetFromType.java
similarity index 91%
rename from
core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/described/annotderived/DescribedAsFacetOnParameterFromType.java
rename to
core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/described/annotderived/ParamDescribedFacetFromType.java
index a4a2c355d1..35ecea56e2 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/described/annotderived/DescribedAsFacetOnParameterFromType.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/described/annotderived/ParamDescribedFacetFromType.java
@@ -28,7 +28,7 @@ import
org.apache.isis.core.metamodel.facets.all.described.ParamDescribedFacetAb
import lombok.val;
-public class DescribedAsFacetOnParameterFromType
+public class ParamDescribedFacetFromType
extends ParamDescribedFacetAbstract {
public static Optional<ParamDescribedFacet> create(
@@ -39,10 +39,10 @@ extends ParamDescribedFacetAbstract {
return Optional.ofNullable(describedIfAny)
.map(described->
- new DescribedAsFacetOnParameterFromType(described, holder));
+ new ParamDescribedFacetFromType(described, holder));
}
- private DescribedAsFacetOnParameterFromType(
+ private ParamDescribedFacetFromType(
final String described,
final FacetHolder holder) {
super(described, holder, Precedence.INFERRED);
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/DescribedAsFacetForParameterLayoutAnnotation.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/ParamDescribedFacetForParameterLayoutAnnotation.java
similarity index 88%
rename from
core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/DescribedAsFacetForParameterLayoutAnnotation.java
rename to
core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/ParamDescribedFacetForParameterLayoutAnnotation.java
index bcdbd630b0..073f09c8a4 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/DescribedAsFacetForParameterLayoutAnnotation.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/ParamDescribedFacetForParameterLayoutAnnotation.java
@@ -26,7 +26,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.all.described.ParamDescribedFacet;
import
org.apache.isis.core.metamodel.facets.all.described.ParamDescribedFacetAbstract;
-public class DescribedAsFacetForParameterLayoutAnnotation
+public class ParamDescribedFacetForParameterLayoutAnnotation
extends ParamDescribedFacetAbstract {
public static Optional<ParamDescribedFacet> create(
@@ -36,10 +36,10 @@ extends ParamDescribedFacetAbstract {
return parameterLayoutIfAny
.map(ParameterLayout::describedAs)
.filter(_Strings::isNotEmpty)
- .map(describedAs -> new
DescribedAsFacetForParameterLayoutAnnotation(describedAs, holder));
+ .map(describedAs -> new
ParamDescribedFacetForParameterLayoutAnnotation(describedAs, holder));
}
- private DescribedAsFacetForParameterLayoutAnnotation(
+ private ParamDescribedFacetForParameterLayoutAnnotation(
final String described,
final FacetHolder holder) {
super(described, holder);
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/ParameterLayoutFacetFactory.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/ParameterLayoutFacetFactory.java
index 291694b80b..a2046d227f 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/ParameterLayoutFacetFactory.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/layout/ParameterLayoutFacetFactory.java
@@ -54,7 +54,7 @@ extends FacetFactoryAbstract {
.create(parameterLayoutIfAny, facetHolder));
addFacetIfPresent(
- DescribedAsFacetForParameterLayoutAnnotation
+ ParamDescribedFacetForParameterLayoutAnnotation
.create(parameterLayoutIfAny, facetHolder));
addFacetIfPresent(
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/DescribedAsFromTypePostProcessor.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/DescribedAsFromTypePostProcessor.java
index bc620fce4b..a6a9711fc8 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/DescribedAsFromTypePostProcessor.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/DescribedAsFromTypePostProcessor.java
@@ -26,12 +26,12 @@ import
org.apache.isis.core.metamodel.facets.all.described.MemberDescribedFacet;
import
org.apache.isis.core.metamodel.facets.all.described.ObjectDescribedFacet;
import org.apache.isis.core.metamodel.facets.all.described.ParamDescribedFacet;
import
org.apache.isis.core.metamodel.facets.members.described.annotprop.MemberDescribedFacetFromType;
-import
org.apache.isis.core.metamodel.facets.param.described.annotderived.DescribedAsFacetOnParameterFromType;
+import
org.apache.isis.core.metamodel.facets.param.described.annotderived.ParamDescribedFacetFromType;
import
org.apache.isis.core.metamodel.postprocessors.ObjectSpecificationPostProcessorAbstract;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
@@ -44,54 +44,49 @@ extends ObjectSpecificationPostProcessorAbstract {
}
@Override
- public void postProcessAction(final ObjectSpecification
objectSpecification, final ObjectAction objectAction) {
- if(objectAction.containsNonFallbackFacet(MemberDescribedFacet.class)) {
- return;
- }
- objectAction.getReturnType()
- .lookupNonFallbackFacet(ObjectDescribedFacet.class)
- .ifPresent(specFacet -> FacetUtil.addFacetIfPresent(
- MemberDescribedFacetFromType
- .create(
- specFacet,
- facetedMethodFor(objectAction))));
+ public void postProcessParameter(final ObjectSpecification
objectSpecification, final ObjectAction objectAction, final
ObjectActionParameter parameter) {
+ handleParam(parameter);
}
@Override
- public void postProcessParameter(final ObjectSpecification
objectSpecification, final ObjectAction objectAction, final
ObjectActionParameter parameter) {
- if(parameter.containsNonFallbackFacet(ParamDescribedFacet.class)) {
- return;
- }
- final ObjectSpecification paramSpec = parameter.getElementType();
- paramSpec.lookupNonFallbackFacet(ObjectDescribedFacet.class)
- .ifPresent(describedAsFacet->{
- FacetUtil.addFacetIfPresent(
- DescribedAsFacetOnParameterFromType
- .create(describedAsFacet, peerFor(parameter)));
- });
+ public void postProcessAction(final ObjectSpecification
objectSpecification, final ObjectAction objectAction) {
+ handleMember(objectAction);
}
@Override
public void postProcessProperty(final ObjectSpecification
objectSpecification, final OneToOneAssociation prop) {
- handle(prop);
+ handleMember(prop);
}
@Override
public void postProcessCollection(final ObjectSpecification
objectSpecification, final OneToManyAssociation coll) {
- handle(coll);
+ handleMember(coll);
}
// -- HELPER
- private void handle(final ObjectAssociation objectAssociation) {
-
if(objectAssociation.containsNonFallbackFacet(MemberDescribedFacet.class)) {
+ private void handleMember(final ObjectMember member) {
+ if(member.containsNonFallbackFacet(MemberDescribedFacet.class)) {
return;
}
- objectAssociation.getElementType()
+ member.getElementType()
.lookupNonFallbackFacet(ObjectDescribedFacet.class)
- .ifPresent(specFacet -> FacetUtil.addFacetIfPresent(
- MemberDescribedFacetFromType
- .create(specFacet, facetedMethodFor(objectAssociation))));
+ .ifPresent(objectDescribedFacet ->
+ FacetUtil.addFacetIfPresent(
+ MemberDescribedFacetFromType
+ .create(objectDescribedFacet, facetedMethodFor(member))));
+ }
+
+ private void handleParam(final ObjectActionParameter parameter) {
+ if(parameter.containsNonFallbackFacet(ParamDescribedFacet.class)) {
+ return;
+ }
+ parameter.getElementType()
+ .lookupNonFallbackFacet(ObjectDescribedFacet.class)
+ .ifPresent(objectDescribedFacet->
+ FacetUtil.addFacetIfPresent(
+ ParamDescribedFacetFromType
+ .create(objectDescribedFacet, peerFor(parameter))));
}
}
