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 2018/04/12 23:27:12 UTC

[isis] branch master updated: ISIS-1599 improves name of utility class

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 aa00b6e  ISIS-1599 improves name of utility class
aa00b6e is described below

commit aa00b6e3b3aa4ab63b5ef210fef5e24664e1c152
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Apr 13 01:27:08 2018 +0200

    ISIS-1599 improves name of utility class
---
 .../invocation/ActionInvocationFacetForDomainEventAbstract.java  | 9 +++++----
 ...dIncompatibilityWorkaround.java => RelaxedMethodInvoker.java} | 3 ++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
index dc2cc99..a2f609a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
@@ -332,8 +332,9 @@ public abstract class ActionInvocationFacetForDomainEventAbstract
             final PublishedActionFacet publishedActionFacet = getIdentified().getFacet(PublishedActionFacet.class);
             if (publishedActionFacet != null) {
 
-                final IdentifiedHolder identifiedHolder = getIdentified();
-                final List<ObjectAdapter> parameterAdapters = Arrays.asList(argumentAdapters);
+            	//TODO not used
+//                final IdentifiedHolder identifiedHolder = getIdentified();
+//                final List<ObjectAdapter> parameterAdapters = Arrays.asList(argumentAdapters);
 
                 getPublishingServiceInternal().publishAction(
                         priorExecution
@@ -390,11 +391,11 @@ public abstract class ActionInvocationFacetForDomainEventAbstract
             final QueryResultsCache queryResultsCache = getQueryResultsCache();
             final Object[] targetPojoPlusExecutionParameters = ArrayExtensions.appendT(executionParameters, targetPojo);
             return queryResultsCache.execute(
-            		()->MethodIncompatibilityWorkaround.invoke(method, targetPojo, executionParameters),
+            		()->RelaxedMethodInvoker.invoke(method, targetPojo, executionParameters),
             		targetPojo.getClass(), method.getName(), targetPojoPlusExecutionParameters);
 
         } else {
-            return MethodIncompatibilityWorkaround.invoke(method, targetPojo, executionParameters);
+            return RelaxedMethodInvoker.invoke(method, targetPojo, executionParameters);
         }
     }
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/MethodIncompatibilityWorkaround.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/RelaxedMethodInvoker.java
similarity index 96%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/MethodIncompatibilityWorkaround.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/RelaxedMethodInvoker.java
index 46000b4..1c0d38c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/MethodIncompatibilityWorkaround.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/RelaxedMethodInvoker.java
@@ -31,8 +31,9 @@ import org.apache.isis.applib.internal.collections._Collections;
 
 /**
  * Package private utility for method invocation pre-processing. 
+ * Adapts supported collection parameter types List, Set, SortedSet and Collection.
  */
-class MethodIncompatibilityWorkaround {
+class RelaxedMethodInvoker {
 
 	static Object invoke(Method method, Object targetPojo, Object[] executionParameters) 
 			throws IllegalAccessException, InvocationTargetException {

-- 
To stop receiving notification emails like this one, please contact
ahuber@apache.org.