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 2020/05/02 12:48:47 UTC
[isis] branch master updated: ISIS-2340: further cleaning up
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 eee9aed ISIS-2340: further cleaning up
eee9aed is described below
commit eee9aed67799f5e6ee9efe458f4cf5a5e8d8d717
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat May 2 14:48:35 2020 +0200
ISIS-2340: further cleaning up
---
.../defaults/ActionParameterDefaultsFacet.java | 7 +++++-
.../spec/feature/ObjectActionParameter.java | 4 +++-
.../specimpl/PendingParameterModelHead.java | 3 ++-
.../AbstractObjectMemberReprRenderer.java | 3 ---
.../domainobjects/ObjectActionReprRenderer.java | 27 +---------------------
.../ObjectCollectionReprRenderer.java | 5 ----
.../domainobjects/ObjectPropertyReprRenderer.java | 5 ----
7 files changed, 12 insertions(+), 42 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/ActionParameterDefaultsFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/ActionParameterDefaultsFacet.java
index 7222e24..aa651a2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/ActionParameterDefaultsFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/ActionParameterDefaultsFacet.java
@@ -20,6 +20,7 @@
package org.apache.isis.core.metamodel.facets.param.defaults;
import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
import org.apache.isis.core.metamodel.specloader.specimpl.PendingParameterModel;
import lombok.NonNull;
@@ -34,6 +35,10 @@ import lombok.NonNull;
*/
public interface ActionParameterDefaultsFacet extends Facet {
- /** default parameter value, depending on other pending parameters */
+ /** default parameter value, depending on other pending parameters
+ * @implNote this is pretty low level, meant to be called only by
+ * instances of {@link ObjectActionParameter}, other callers should
+ * rather use {@link ObjectActionParameter#getDefault(PendingParameterModel)}
+ */
Object getDefault(@NonNull PendingParameterModel pendingArgs);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java
index 921b72d..d71c4df 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java
@@ -33,6 +33,8 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.specimpl.PendingParameterModel;
+import lombok.NonNull;
+
/**
* Analogous to {@link ObjectAssociation}.
*/
@@ -113,7 +115,7 @@ public interface ObjectActionParameter extends ObjectFeature, CurrentHolder {
PendingParameterModel pendingArgs,
InteractionInitiatedBy interactionInitiatedBy);
- ManagedObject getDefault(PendingParameterModel pendingArgs);
+ @NonNull ManagedObject getDefault(PendingParameterModel pendingArgs);
/** default value as result of a initial param value fixed point search */
default ManagedObject getDefault(ManagedObject actionOnwer) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/PendingParameterModelHead.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/PendingParameterModelHead.java
index 42052cb..1b6fbad 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/PendingParameterModelHead.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/PendingParameterModelHead.java
@@ -31,7 +31,8 @@ import lombok.RequiredArgsConstructor;
import lombok.val;
/**
- * The 'head' of the a {@link PendingParameterModel}, that is it holds no parameter values.
+ * The 'head' of a {@link PendingParameterModel}, which in contrast to the (owning)
+ * {@link PendingParameterModel} holds no parameter values.
*
* @since 2.0.0
*/
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/AbstractObjectMemberReprRenderer.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/AbstractObjectMemberReprRenderer.java
index 38f317a..0f85c27 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/AbstractObjectMemberReprRenderer.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/AbstractObjectMemberReprRenderer.java
@@ -196,7 +196,6 @@ extends ReprRendererAbstract<R, ManagedMember> {
putExtensionsIsisProprietary();
}
addLinksToFormalDomainModel();
- addLinksIsisProprietary();
}
}
@@ -291,8 +290,6 @@ extends ReprRendererAbstract<R, ManagedMember> {
protected abstract void addLinksToFormalDomainModel();
- protected abstract void addLinksIsisProprietary();
-
/**
* Convenience method.
*/
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java
index 407d83a..9758fba 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java
@@ -20,7 +20,6 @@ package org.apache.isis.viewer.restfulobjects.rendering.domainobjects;
import java.util.List;
import java.util.Map;
-import java.util.stream.Stream;
import com.fasterxml.jackson.databind.node.NullNode;
@@ -30,7 +29,6 @@ import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-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.interaction.ManagedAction;
@@ -105,20 +103,7 @@ public class ObjectActionReprRenderer extends AbstractObjectMemberReprRenderer<O
@Override
protected ObjectAdapterLinkTo linkToForMutatorInvoke() {
- if (true /*!objectMember.isContributed()*/) {
- return super.linkToForMutatorInvoke();
- }
- final DomainServiceLinkTo linkTo = new DomainServiceLinkTo();
- return linkTo.usingUrlBase(getResourceContext()).with(contributingServiceAdapter());
- }
-
- private ManagedObject contributingServiceAdapter() {
- final ObjectSpecification serviceType = objectMember.getOnType();
- final Stream<ManagedObject> serviceAdapters = streamServiceAdapters();
- return serviceAdapters
- .filter(serviceAdapter->serviceAdapter.getSpecification() == serviceType)
- .findFirst()
- .orElseThrow(()->new IllegalStateException("Unable to locate contributing service")); // fail fast
+ return super.linkToForMutatorInvoke();
}
@Override
@@ -214,16 +199,6 @@ public class ObjectActionReprRenderer extends AbstractObjectMemberReprRenderer<O
}
@Override
- protected void addLinksIsisProprietary() {
- // umm...
- if (false /*objectMember.isContributed() */) {
- final ManagedObject serviceAdapter = contributingServiceAdapter();
- final JsonRepresentation contributedByLink = DomainObjectReprRenderer.newLinkToBuilder(resourceContext, Rel.CONTRIBUTED_BY, serviceAdapter).build();
- getLinks().arrayAdd(contributedByLink);
- }
- }
-
- @Override
protected void putExtensionsIsisProprietary() {
getExtensions().mapPut("actionType", objectMember.getType().name().toLowerCase());
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java
index 37b0a30..c2f8ab8 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java
@@ -181,11 +181,6 @@ public class ObjectCollectionReprRenderer extends AbstractObjectMemberReprRender
}
@Override
- protected void addLinksIsisProprietary() {
- // none
- }
-
- @Override
protected void putExtensionsIsisProprietary() {
final CollectionSemantics semantics = CollectionSemantics.determine(objectMember);
getExtensions().mapPut("collectionSemantics", semantics.name().toLowerCase());
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
index fadee0c..f981823 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
@@ -244,11 +244,6 @@ extends AbstractObjectMemberReprRenderer<ObjectPropertyReprRenderer, OneToOneAss
}
@Override
- protected void addLinksIsisProprietary() {
- // none
- }
-
- @Override
protected void putExtensionsIsisProprietary() {
// none
}