You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/07/06 10:37:48 UTC
[isis] branch master updated: ISIS-3060: align names for all MemberNamedFacet(s) and MemberDescribedFacet(s)
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 fb7f2600e3 ISIS-3060: align names for all MemberNamedFacet(s) and MemberDescribedFacet(s)
fb7f2600e3 is described below
commit fb7f2600e38eb8edd612360faaf885af1c00b34a
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Jul 6 12:37:41 2022 +0200
ISIS-3060: align names for all MemberNamedFacet(s) and
MemberDescribedFacet(s)
---
.../metamodel/facetapi/FacetHolderLayered.java | 2 +-
.../core/metamodel/facetapi/FacetHolderSimple.java | 2 +-
.../DescribedAsFacetOnMemberFromProperties.java | 37 ---------------------
...Type.java => MemberDescribedFacetFromType.java} | 6 ++--
.../DescribedAsFacetForMemberViaMethodFactory.java | 2 +-
...hod.java => MemberDescribedFacetViaMethod.java} | 4 +--
...aMethod.java => MemberNamedFacetViaMethod.java} | 4 +--
.../NamedFacetForMemberViaMethodFactory.java | 2 +-
...DescribedFacetForPropertyLayoutAnnotation.java} | 6 ++--
.../propertylayout/PropertyLayoutFacetFactory.java | 2 +-
.../ObjectSpecificationPostProcessorAbstract.java | 4 +--
.../all/DescribedAsFromTypePostProcessor.java | 6 ++--
.../specimpl/dflt/ObjectSpecificationDefault.java | 1 -
.../src/test/resources/metamodel.xml.zip | Bin 89795 -> 89738 bytes
14 files changed, 19 insertions(+), 59 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolderLayered.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolderLayered.java
index 64ef9bee99..05313166b5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolderLayered.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolderLayered.java
@@ -46,7 +46,7 @@ import lombok.val;
*
* @see Facet#isAllowedToBeSharedWhenMixedIn()
*/
-class FacetHolderLayered
+final class FacetHolderLayered
implements FacetHolder {
@Getter(onMethod_ = {@Override})
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolderSimple.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolderSimple.java
index 397c4d663c..4b6091eb14 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolderSimple.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolderSimple.java
@@ -26,7 +26,7 @@ import lombok.NonNull;
/**
* Provides a (simple) list of {@link Facet}s.
*/
-class FacetHolderSimple
+final class FacetHolderSimple
extends FacetHolderAbstract {
public FacetHolderSimple(
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/described/annotprop/DescribedAsFacetOnMemberFromProperties.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/described/annotprop/DescribedAsFacetOnMemberFromProperties.java
deleted file mode 100644
index fef5fc4553..0000000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/described/annotprop/DescribedAsFacetOnMemberFromProperties.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.core.metamodel.facets.members.described.annotprop;
-
-import java.util.Properties;
-
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.all.described.MemberDescribedFacetWithStaticTextAbstract;
-
-public class DescribedAsFacetOnMemberFromProperties
-extends MemberDescribedFacetWithStaticTextAbstract {
-
- public DescribedAsFacetOnMemberFromProperties(final Properties properties, final FacetHolder holder) {
- super(valueFrom(properties), holder);
- }
-
- private static String valueFrom(final Properties properties) {
- return properties.getProperty("value");
- }
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/described/annotprop/DescribedAsFacetOnMemberFromType.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/described/annotprop/MemberDescribedFacetFromType.java
similarity index 91%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/described/annotprop/DescribedAsFacetOnMemberFromType.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/described/annotprop/MemberDescribedFacetFromType.java
index 7d96bd5e04..bb63724fee 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/described/annotprop/DescribedAsFacetOnMemberFromType.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/described/annotprop/MemberDescribedFacetFromType.java
@@ -28,7 +28,7 @@ import org.apache.isis.core.metamodel.facets.all.described.ObjectDescribedFacet;
import lombok.val;
-public class DescribedAsFacetOnMemberFromType
+public class MemberDescribedFacetFromType
extends MemberDescribedFacetWithStaticTextAbstract {
public static Optional<MemberDescribedFacet> create(
@@ -39,11 +39,11 @@ extends MemberDescribedFacetWithStaticTextAbstract {
return Optional.ofNullable(describedIfAny)
.map(described->
- new DescribedAsFacetOnMemberFromType(described, holder));
+ new MemberDescribedFacetFromType(described, holder));
}
- private DescribedAsFacetOnMemberFromType(
+ private MemberDescribedFacetFromType(
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/members/described/method/DescribedAsFacetForMemberViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/described/method/DescribedAsFacetForMemberViaMethodFactory.java
index 392605e18a..9ff4a9afed 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/described/method/DescribedAsFacetForMemberViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/described/method/DescribedAsFacetForMemberViaMethodFactory.java
@@ -44,7 +44,7 @@ extends MemberSupportFacetFactoryAbstract {
.peek(processMethodContext::removeMethod)
.forEach(describedMethod->{
addFacet(
- new DescribedAsFacetForMemberViaMethod(
+ new MemberDescribedFacetViaMethod(
describedMethod, processMethodContext.getFacetHolder()));
});
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/described/method/DescribedAsFacetForMemberViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/described/method/MemberDescribedFacetViaMethod.java
similarity index 93%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/described/method/DescribedAsFacetForMemberViaMethod.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/described/method/MemberDescribedFacetViaMethod.java
index 99895646b7..8a54947f28 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/described/method/DescribedAsFacetForMemberViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/described/method/MemberDescribedFacetViaMethod.java
@@ -23,10 +23,10 @@ import java.lang.reflect.Method;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.all.described.MemberDescribedFacetWithImperativeTextAbstract;
-public class DescribedAsFacetForMemberViaMethod
+public class MemberDescribedFacetViaMethod
extends MemberDescribedFacetWithImperativeTextAbstract {
- public DescribedAsFacetForMemberViaMethod(
+ public MemberDescribedFacetViaMethod(
final Method describedMethod,
final FacetHolder holder) {
super(
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/named/method/NamedFacetForMemberViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/named/method/MemberNamedFacetViaMethod.java
similarity index 93%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/named/method/NamedFacetForMemberViaMethod.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/named/method/MemberNamedFacetViaMethod.java
index 049b5273fe..67ee1ae8f2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/named/method/NamedFacetForMemberViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/named/method/MemberNamedFacetViaMethod.java
@@ -23,10 +23,10 @@ import java.lang.reflect.Method;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.all.named.MemberNamedFacetWithImperativeTextAbstract;
-public class NamedFacetForMemberViaMethod
+public class MemberNamedFacetViaMethod
extends MemberNamedFacetWithImperativeTextAbstract {
- public NamedFacetForMemberViaMethod(
+ public MemberNamedFacetViaMethod(
final Method namedMethod,
final FacetHolder holder) {
super(
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/named/method/NamedFacetForMemberViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/named/method/NamedFacetForMemberViaMethodFactory.java
index 952042d885..4efc961d5a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/named/method/NamedFacetForMemberViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/named/method/NamedFacetForMemberViaMethodFactory.java
@@ -44,7 +44,7 @@ extends MemberSupportFacetFactoryAbstract {
.peek(processMethodContext::removeMethod)
.forEach(namedMethod->{
addFacet(
- new NamedFacetForMemberViaMethod(
+ new MemberNamedFacetViaMethod(
namedMethod, processMethodContext.getFacetHolder()));
});
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/DescribedAsFacetForPropertyLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/MemberDescribedFacetForPropertyLayoutAnnotation.java
similarity index 88%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/DescribedAsFacetForPropertyLayoutAnnotation.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/MemberDescribedFacetForPropertyLayoutAnnotation.java
index b3d29520e2..0efe3b57e1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/DescribedAsFacetForPropertyLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/MemberDescribedFacetForPropertyLayoutAnnotation.java
@@ -26,7 +26,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.all.described.MemberDescribedFacet;
import org.apache.isis.core.metamodel.facets.all.described.MemberDescribedFacetWithStaticTextAbstract;
-public class DescribedAsFacetForPropertyLayoutAnnotation
+public class MemberDescribedFacetForPropertyLayoutAnnotation
extends MemberDescribedFacetWithStaticTextAbstract {
public static Optional<MemberDescribedFacet> create(
@@ -36,10 +36,10 @@ extends MemberDescribedFacetWithStaticTextAbstract {
return propertyLayoutIfAny
.map(PropertyLayout::describedAs)
.filter(_Strings::isNotEmpty)
- .map(describedAs -> new DescribedAsFacetForPropertyLayoutAnnotation(describedAs, holder));
+ .map(describedAs -> new MemberDescribedFacetForPropertyLayoutAnnotation(describedAs, holder));
}
- private DescribedAsFacetForPropertyLayoutAnnotation(
+ private MemberDescribedFacetForPropertyLayoutAnnotation(
final String described,
final FacetHolder holder) {
super(described, holder);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PropertyLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PropertyLayoutFacetFactory.java
index 59cd4a7427..616d33ae2e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PropertyLayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PropertyLayoutFacetFactory.java
@@ -53,7 +53,7 @@ extends FacetFactoryAbstract {
.create(propertyLayoutIfAny, facetHolder));
addFacetIfPresent(
- DescribedAsFacetForPropertyLayoutAnnotation
+ MemberDescribedFacetForPropertyLayoutAnnotation
.create(propertyLayoutIfAny, facetHolder));
addFacetIfPresent(
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/ObjectSpecificationPostProcessorAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/ObjectSpecificationPostProcessorAbstract.java
index 5c3a50e2bd..8d4c9c0797 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/ObjectSpecificationPostProcessorAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/ObjectSpecificationPostProcessorAbstract.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.postprocessors;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facetapi.HasFacetHolder;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.MixedIn;
@@ -88,8 +87,7 @@ implements ObjectSpecificationPostProcessor {
protected static FacetHolder peerFor(final ObjectActionParameter param) {
// TODO: hacky, need to copy facet onto underlying peer, not to the param itself.
- var paramImpl = (HasFacetHolder) param;
- return paramImpl.getFacetHolder();
+ return param.getFacetHolder();
}
}
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 f28267d6f7..a27e3764d2 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
@@ -25,7 +25,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetUtil;
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.DescribedAsFacetOnMemberFromType;
+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.postprocessors.ObjectSpecificationPostProcessorAbstract;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -51,7 +51,7 @@ extends ObjectSpecificationPostProcessorAbstract {
objectAction.getReturnType()
.lookupNonFallbackFacet(ObjectDescribedFacet.class)
.ifPresent(specFacet -> FacetUtil.addFacetIfPresent(
- DescribedAsFacetOnMemberFromType
+ MemberDescribedFacetFromType
.create(
specFacet,
facetedMethodFor(objectAction))));
@@ -90,7 +90,7 @@ extends ObjectSpecificationPostProcessorAbstract {
objectAssociation.getElementType()
.lookupNonFallbackFacet(ObjectDescribedFacet.class)
.ifPresent(specFacet -> FacetUtil.addFacetIfPresent(
- DescribedAsFacetOnMemberFromType
+ MemberDescribedFacetFromType
.create(specFacet, facetedMethodFor(objectAssociation))));
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
index 656a32e4f3..459f55c1ce 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
@@ -94,7 +94,6 @@ implements FacetHolder {
final IsisBeanMetaData typeMeta,
final MetaModelContext mmc,
final FacetProcessor facetProcessor,
-
final PostProcessor postProcessor,
final ClassSubstitutorRegistry classSubstitutorRegistry) {
diff --git a/regressiontests/stable-domainmodel/src/test/resources/metamodel.xml.zip b/regressiontests/stable-domainmodel/src/test/resources/metamodel.xml.zip
index bd3d252b12..3bf41c1008 100644
Binary files a/regressiontests/stable-domainmodel/src/test/resources/metamodel.xml.zip and b/regressiontests/stable-domainmodel/src/test/resources/metamodel.xml.zip differ