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 e389d11 ISIS-2340: remove intermediate glue code e389d11 is described below commit e389d113bff10e2bb477e0ef171cf3b2d13aa0e3 Author: Andi Huber <ahu...@apache.org> AuthorDate: Mon May 11 08:01:39 2020 +0200 ISIS-2340: remove intermediate glue code --- .../core/metamodel/interactions/managed/ActionInteractionHead.java | 4 ---- .../isis/core/metamodel/interactions/managed/ManagedParameter.java | 2 +- .../wrapper/handlers/DomainObjectInvocationHandler.java | 2 +- .../viewer/restfulobjects/viewer/resources/ObjectActionArgHelper.java | 2 +- .../java/org/apache/isis/viewer/wicket/model/models/ActionModel.java | 2 +- .../apache/isis/viewer/wicket/model/models/ScalarParameterModel.java | 4 ++-- 6 files changed, 6 insertions(+), 10 deletions(-) diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ActionInteractionHead.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ActionInteractionHead.java index 5b2587f..4d7ea19 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ActionInteractionHead.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ActionInteractionHead.java @@ -118,10 +118,6 @@ implements HasMetaModel<ObjectAction> { } - public InteractionHead toInteractionHead() { - return this; - } - // -- HELPER private boolean equals(Can<ManagedObject> left, Can<ManagedObject> right) { diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedParameter.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedParameter.java index fc16bb5..3299ba8 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedParameter.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedParameter.java @@ -41,7 +41,7 @@ public class ManagedParameter { public Optional<InteractionVeto> validate() { - val head = owningAction.getAction().interactionHead(getOwningObject()).toInteractionHead(); + val head = owningAction.getAction().interactionHead(getOwningObject()); return Optional.ofNullable( getParameter() diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java index 6e7861e..8785eef 100644 --- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java +++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java @@ -645,7 +645,7 @@ public class DomainObjectInvocationHandler<T> extends DelegatingInvocationHandle return runExecutionTask(()->{ val interactionInitiatedBy = getInteractionInitiatedBy(); - val head = objectAction.interactionHead(targetAdapter).toInteractionHead(); + val head = objectAction.interactionHead(targetAdapter); val returnedAdapter = objectAction.execute( head, argAdapters, diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectActionArgHelper.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectActionArgHelper.java index 5076bea..fe58d67 100644 --- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectActionArgHelper.java +++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectActionArgHelper.java @@ -53,7 +53,7 @@ public class ObjectActionArgHelper { val action = managedAction.getAction(); val owner = managedAction.getOwner(); - val head = action.interactionHead(owner).toInteractionHead(); + val head = action.interactionHead(owner); final List<JsonRepresentation> argList = argListFor(action, arguments); diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java index b5b6ca0..63e996e 100644 --- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java +++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java @@ -191,7 +191,7 @@ implements FormUiModel, FormExecutorContext { final Can<ManagedObject> arguments = argCache().snapshot(); final ObjectAction action = getMetaModel(); - val head = action.interactionHead(targetAdapter).toInteractionHead(); + val head = action.interactionHead(targetAdapter); val resultAdapter = action.executeWithRuleChecking( diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarParameterModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarParameterModel.java index bd26655..91de760 100644 --- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarParameterModel.java +++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarParameterModel.java @@ -115,7 +115,7 @@ implements ParameterUiModel { try { ManagedObject parentAdapter = getParentUiModel().load(); - val head = action.interactionHead(parentAdapter).toInteractionHead(); + val head = action.interactionHead(parentAdapter); final String invalidReasonIfAny = parameter.isValid(head, proposedPojoAsStr, InteractionInitiatedBy.USER); @@ -135,7 +135,7 @@ implements ParameterUiModel { try { ManagedObject parentAdapter = getParentUiModel().load(); - val head = action.interactionHead(parentAdapter).toInteractionHead(); + val head = action.interactionHead(parentAdapter); final String invalidReasonIfAny = parameter.isValid(head, proposedAdapter.getPojo(), InteractionInitiatedBy.USER);