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 2021/05/12 14:28:04 UTC
[isis] branch master updated: ISIS-2665: minor: renaming of just
introduced stuff
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 8405e37 ISIS-2665: minor: renaming of just introduced stuff
8405e37 is described below
commit 8405e37dabad47f1e491b713fad9f3d9a7d8d05f
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed May 12 16:27:53 2021 +0200
ISIS-2665: minor: renaming of just introduced stuff
---
...et.java => AssociateWithFacetDerivedFromChoicesFromFacet.java} | 8 ++++----
....java => DeriveAssociateWithFromChoicesFromPostProcessor.java} | 6 +++---
.../metamodel/progmodels/dflt/ProgrammingModelFacetsJava8.java | 4 ++--
.../org/apache/isis/core/metamodel/spec/feature/ObjectAction.java | 6 +++---
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/AssociateWithFacetDerivedFromChoicesByFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/AssociateWithFacetDerivedFromChoicesFromFacet.java
similarity index 85%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/AssociateWithFacetDerivedFromChoicesByFacet.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/AssociateWithFacetDerivedFromChoicesFromFacet.java
index 66d76e4..1cfa6d1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/AssociateWithFacetDerivedFromChoicesByFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/AssociateWithFacetDerivedFromChoicesFromFacet.java
@@ -25,20 +25,20 @@ import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.actions.action.associateWith.ChoicesFromFacet;
-public class AssociateWithFacetDerivedFromChoicesByFacet extends AssociateWithFacetAbstract {
+public class AssociateWithFacetDerivedFromChoicesFromFacet extends AssociateWithFacetAbstract {
- public static AssociateWithFacetDerivedFromChoicesByFacet create(
+ public static AssociateWithFacetDerivedFromChoicesFromFacet create(
final Optional<ChoicesFromFacet> choicesFromFacetIfAny,
final FacetHolder holder) {
return choicesFromFacetIfAny
.map(ChoicesFromFacet::value)
.filter(_Strings::isNotEmpty)
- .map(associateWith -> new AssociateWithFacetDerivedFromChoicesByFacet(associateWith, holder))
+ .map(associateWith -> new AssociateWithFacetDerivedFromChoicesFromFacet(associateWith, holder))
.orElse(null);
}
- private AssociateWithFacetDerivedFromChoicesByFacet(
+ private AssociateWithFacetDerivedFromChoicesFromFacet(
final String value,
final FacetHolder holder) {
super(value, holder);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/DeriveAssociateWithFromChoicesByPostProcessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/DeriveAssociateWithFromChoicesFromPostProcessor.java
similarity index 94%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/DeriveAssociateWithFromChoicesByPostProcessor.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/DeriveAssociateWithFromChoicesFromPostProcessor.java
index 394b35b..9a95be4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/DeriveAssociateWithFromChoicesByPostProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/DeriveAssociateWithFromChoicesFromPostProcessor.java
@@ -22,7 +22,7 @@ package org.apache.isis.core.metamodel.postprocessors.all;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facets.actions.action.associateWith.ChoicesFromFacet;
import org.apache.isis.core.metamodel.facets.actions.layout.AssociateWithFacet;
-import org.apache.isis.core.metamodel.facets.actions.layout.AssociateWithFacetDerivedFromChoicesByFacet;
+import org.apache.isis.core.metamodel.facets.actions.layout.AssociateWithFacetDerivedFromChoicesFromFacet;
import org.apache.isis.core.metamodel.facets.members.describedas.annotprop.DescribedAsFacetOnMemberFactory;
import org.apache.isis.core.metamodel.facets.param.describedas.annotderived.DescribedAsFacetOnParameterAnnotationElseDerivedFromTypeFactory;
import org.apache.isis.core.metamodel.postprocessors.ObjectSpecificationPostProcessorAbstract;
@@ -36,7 +36,7 @@ import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
* Replaces some of the functionality in {@link DescribedAsFacetOnMemberFactory} and
* {@link DescribedAsFacetOnParameterAnnotationElseDerivedFromTypeFactory}.
*/
-public class DeriveAssociateWithFromChoicesByPostProcessor
+public class DeriveAssociateWithFromChoicesFromPostProcessor
extends ObjectSpecificationPostProcessorAbstract {
@Override
@@ -49,7 +49,7 @@ extends ObjectSpecificationPostProcessorAbstract {
if(objectAction.containsNonFallbackFacet(AssociateWithFacet.class)) {
return;
}
- FacetUtil.addFacet(AssociateWithFacetDerivedFromChoicesByFacet.create(
+ FacetUtil.addFacet(AssociateWithFacetDerivedFromChoicesFromFacet.create(
objectAction.lookupNonFallbackFacet(ChoicesFromFacet.class),
facetedMethodFor(objectAction)));
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodels/dflt/ProgrammingModelFacetsJava8.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodels/dflt/ProgrammingModelFacetsJava8.java
index 5d189e2..6d77ca0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodels/dflt/ProgrammingModelFacetsJava8.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodels/dflt/ProgrammingModelFacetsJava8.java
@@ -141,7 +141,7 @@ import org.apache.isis.core.metamodel.methods.MemberSupportAnnotationEnforcesSup
import org.apache.isis.core.metamodel.methods.MethodByClassMap;
import org.apache.isis.core.metamodel.methods.OrphanedSupportingMethodValidator;
import org.apache.isis.core.metamodel.postprocessors.DeriveMixinMembersPostProcessor;
-import org.apache.isis.core.metamodel.postprocessors.all.DeriveAssociateWithFromChoicesByPostProcessor;
+import org.apache.isis.core.metamodel.postprocessors.all.DeriveAssociateWithFromChoicesFromPostProcessor;
import org.apache.isis.core.metamodel.postprocessors.all.DeriveDescribedAsFromTypePostProcessor;
import org.apache.isis.core.metamodel.postprocessors.all.i18n.TranslationPostProcessor;
import org.apache.isis.core.metamodel.postprocessors.allbutparam.authorization.AuthorizationFacetPostProcessor;
@@ -372,7 +372,7 @@ public final class ProgrammingModelFacetsJava8 extends ProgrammingModelAbstract
// only after this point have any mixin members been resolved and are available on the ObjectSpecification.
- addPostProcessor(PostProcessingOrder.A1_BUILTIN, DeriveAssociateWithFromChoicesByPostProcessor.class);
+ addPostProcessor(PostProcessingOrder.A1_BUILTIN, DeriveAssociateWithFromChoicesFromPostProcessor.class);
addPostProcessor(PostProcessingOrder.A1_BUILTIN, DeriveDescribedAsFromTypePostProcessor.class);
addPostProcessor(PostProcessingOrder.A1_BUILTIN, DeriveTypicalLengthFromTypePostProcessor.class);
addPostProcessor(PostProcessingOrder.A1_BUILTIN, DeriveDefaultFromTypePostProcessor.class);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
index f1b3201..505b3df 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
@@ -416,7 +416,7 @@ public interface ObjectAction extends ObjectMember {
final ObjectSpecification collectionTypeOfSpec = collection.getSpecification();
- return new ChoicesBy(collection)
+ return new ChoicesFrom(collection)
.and(new HasParameterMatching(
new ObjectActionParameter.Predicates.CollectionParameter(collectionTypeOfSpec)
));
@@ -450,11 +450,11 @@ public interface ObjectAction extends ObjectMember {
}
- private static class ChoicesBy implements Predicate<ObjectAction> {
+ private static class ChoicesFrom implements Predicate<ObjectAction> {
private final @NonNull String memberId;
private final @NonNull String memberName;
- public ChoicesBy(final @NonNull ObjectAssociation objectAssociation) {
+ public ChoicesFrom(final @NonNull ObjectAssociation objectAssociation) {
this.memberId = _Strings.nullToEmpty(objectAssociation.getId()).toLowerCase();
this.memberName = _Strings.nullToEmpty(objectAssociation.getName()).toLowerCase();;
}