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/06/29 08:20:42 UTC
[isis] branch master updated: ISIS-1720: remove legacy ParamNamed
logic
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 1576fa0 ISIS-1720: remove legacy ParamNamed logic
1576fa0 is described below
commit 1576fa0437ddac988e7a9ea5abd5287ac4c5aa05
Author: andi-huber <ah...@apache.org>
AuthorDate: Tue Jun 29 10:20:29 2021 +0200
ISIS-1720: remove legacy ParamNamed logic
---
.../specimpl/ObjectActionParameterAbstract.java | 22 ++--------------------
.../specloader/specimpl/ObjectMemberAbstract.java | 4 ++++
.../specimpl/OneToManyAssociationMixedIn.java | 4 +++-
...ionParameterAbstractTest_getId_and_getName.java | 11 ++++++-----
4 files changed, 15 insertions(+), 26 deletions(-)
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 f33eecc..e8288ef 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
@@ -153,26 +153,8 @@ implements
private String staticFriendlyName() {
return lookupFacet(ParamNamedFacet.class)
.map(ParamNamedFacet::translated)
-// TODO[ISIS-1720] it seems the orElseGet(...) clause is only used for testing, need to double check and probably remove
-// .orElseThrow(()->_Exceptions
-// .unrecoverableFormatted("action parameters must have a ParamNamedFacet %s", this));
- .orElseGet(()->{
- val singularName = getSpecification().getSingularName();
- val parameters = getAction().getParameters(this::equalsShortIdentifier);
- if (parameters.isCardinalityOne()) {
- return singularName;
- }
- final int indexOf = parameters.indexOf(this);
- return singularName + " " + (indexOf + 1);
-
- });
- }
-
- private boolean equalsShortIdentifier(final ObjectActionParameter objParam) {
- val spec1 = objParam.getSpecification();
- val spec2 = getSpecification();
- return spec1.getShortIdentifier().toLowerCase()
- .equals(spec2.getShortIdentifier().toLowerCase());
+ .orElseThrow(()->_Exceptions
+ .unrecoverableFormatted("action parameters must have a ParamNamedFacet %s", this));
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
index b4cc669..8ae318c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
@@ -74,6 +74,10 @@ implements
: null;
}
+ /**
+ * To be overridden (only) by mixed in members!
+ * @see MixedInMember
+ */
protected InteractionHead headFor(final ManagedObject ownerAdapter) {
return InteractionHead.regular(ownerAdapter);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java
index c7e3995..c0702cf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java
@@ -41,7 +41,9 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import lombok.Getter;
import lombok.val;
-public class OneToManyAssociationMixedIn extends OneToManyAssociationDefault implements MixedInMember {
+public class OneToManyAssociationMixedIn
+extends OneToManyAssociationDefault
+implements MixedInMember {
/**
* The type of the mixin (providing the action), eg annotated with {@link org.apache.isis.applib.annotation.Mixin}.
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
index db906c1..cd5bae6 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
@@ -24,12 +24,10 @@ import java.util.function.Predicate;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
@@ -45,6 +43,9 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
public class ObjectActionParameterAbstractTest_getId_and_getName {
@@ -160,7 +161,7 @@ public class ObjectActionParameterAbstractTest_getId_and_getName {
assertThat(objectActionParameter.getStaticFriendlyName().get(), is("Some parameter name"));
}
- @Test
+ @Test @Ignore("ParamNamedFacet is always present - ensured by facet post processing")
public void whenNamedFaceNotPresentAndOnlyOneParamOfType() throws Exception {
objectActionParameter = new ObjectActionParameterAbstractToTest(0, parentAction, actionParamPeer);
@@ -179,7 +180,7 @@ public class ObjectActionParameterAbstractTest_getId_and_getName {
assertThat(objectActionParameter.getStaticFriendlyName().get(), is("string"));
}
- @Test
+ @Test @Ignore("ParamNamedFacet is always present - ensured by facet post processing")
public void getName_whenNamedFaceNotPresentAndMultipleParamsOfSameType() throws Exception {
objectActionParameter = new ObjectActionParameterAbstractToTest(2, parentAction, actionParamPeer);