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 2019/12/17 13:29:11 UTC
[isis] branch master updated: ISIS-2226: minor 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 42f85aa ISIS-2226: minor cleaning up
42f85aa is described below
commit 42f85aa38daec36386df9f2001f64165090bb730
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Dec 17 14:29:00 2019 +0100
ISIS-2226: minor cleaning up
---
.../org/apache/isis/commons/internal/base/_Tuples.java | 16 ++++++++++++++++
.../invocation/ActionDomainEventFacetAbstract.java | 12 +++++++-----
.../disabled/method/DisableForContextFacetViaMethod.java | 7 +++++--
.../isis/metamodel/interactions/InteractionContext.java | 5 +++--
.../org/apache/isis/metamodel/spec/ManagedObject.java | 10 +++++-----
.../specloader/specimpl/FacetedMethodsBuilder.java | 6 ------
.../specloader/specimpl/ObjectActionDefault.java | 3 ++-
7 files changed, 38 insertions(+), 21 deletions(-)
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Tuples.java b/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Tuples.java
index 753d562..6668abb 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Tuples.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Tuples.java
@@ -19,6 +19,8 @@
package org.apache.isis.commons.internal.base;
+import lombok.Value;
+
/**
* <h1>- internal use only -</h1>
* <p>
@@ -34,6 +36,8 @@ package org.apache.isis.commons.internal.base;
public final class _Tuples {
private _Tuples(){}
+
+ // -- TUPLE 2
public static class Tuple2<T1, T2>{
private final T1 _1;
@@ -57,5 +61,17 @@ public final class _Tuples {
public static <T1, T2> Tuple2<T1, T2> pair(T1 _1, T2 _2) {
return new Tuple2<T1, T2>(_1, _2);
}
+
+ // -- INDEXED
+
+ @Value(staticConstructor = "of")
+ public static class Indexed<T>{
+ int index;
+ T value;
+ }
+
+ public static <T> Indexed<T> indexed(int index, T value) {
+ return Indexed.of(index, value);
+ }
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionDomainEventFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionDomainEventFacetAbstract.java
index 448c4ec..0582cfb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionDomainEventFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionDomainEventFacetAbstract.java
@@ -27,7 +27,6 @@ import org.apache.isis.applib.services.wrapper.events.InteractionEvent;
import org.apache.isis.applib.services.wrapper.events.UsabilityEvent;
import org.apache.isis.applib.services.wrapper.events.ValidityEvent;
import org.apache.isis.applib.services.wrapper.events.VisibilityEvent;
-import org.apache.isis.commons.internal.base._Tuples.Tuple2;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.IdentifiedHolder;
import org.apache.isis.metamodel.facets.DomainEventHelper;
@@ -43,6 +42,7 @@ import org.apache.isis.metamodel.spec.feature.ObjectAction;
import lombok.Getter;
import lombok.Setter;
+import lombok.val;
public abstract class ActionDomainEventFacetAbstract
extends SingleClassValueFacetAbstract
@@ -141,12 +141,14 @@ implements ActionDomainEventFacet {
return ((ActionInteractionContext) ic).getObjectAction();
}
- private static ManagedObject[] argumentAdaptersFrom(final InteractionContext<? extends InteractionEvent> ic) {
- final Tuple2<Integer, ManagedObject> contributee = ic.getContributeeWithParamIndex();
+ private static ManagedObject[] argumentAdaptersFrom(
+ final InteractionContext<? extends InteractionEvent> ic) {
+
+ val contributee = ic.getContributeeWithParamIndex();
if(contributee!=null) {
- int paramIndex = contributee.get_1();
- ManagedObject adapter = contributee.get_2();
+ int paramIndex = contributee.getIndex();
+ ManagedObject adapter = contributee.getValue();
return new ManagedObject[]{paramIndex==0 ? adapter : null};
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethod.java
index 35a1543..b692ad6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethod.java
@@ -33,7 +33,9 @@ import org.apache.isis.metamodel.facets.ImperativeFacet;
import org.apache.isis.metamodel.interactions.UsabilityContext;
import org.apache.isis.metamodel.spec.ManagedObject;
-public class DisableForContextFacetViaMethod extends DisableForContextFacetAbstract implements ImperativeFacet {
+public class DisableForContextFacetViaMethod
+extends DisableForContextFacetAbstract
+implements ImperativeFacet {
private final Method method;
private final TranslationService translationService;
@@ -89,7 +91,8 @@ public class DisableForContextFacetViaMethod extends DisableForContextFacetAbstr
return "method=" + method;
}
- @Override public void appendAttributesTo(final Map<String, Object> attributeMap) {
+ @Override
+ public void appendAttributesTo(final Map<String, Object> attributeMap) {
super.appendAttributesTo(attributeMap);
ImperativeFacet.Util.appendAttributesTo(this, attributeMap);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/InteractionContext.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/InteractionContext.java
index efad49d..8d34fa2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/InteractionContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/InteractionContext.java
@@ -24,6 +24,7 @@ import javax.annotation.Nullable;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.services.wrapper.events.InteractionEvent;
import org.apache.isis.commons.internal.base._Tuples;
+import org.apache.isis.commons.internal.base._Tuples.Indexed;
import org.apache.isis.metamodel.consent.InteractionContextType;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.facetapi.Facet;
@@ -139,11 +140,11 @@ public abstract class InteractionContext<T extends InteractionEvent> {
this.contributee = contributee;
}
- public @Nullable _Tuples.Tuple2<Integer, ManagedObject> getContributeeWithParamIndex() {
+ public @Nullable Indexed<ManagedObject> getContributeeWithParamIndex() {
if(contributee==null) {
return null;
}
- return _Tuples.pair(contributeeParam, contributee);
+ return _Tuples.indexed(contributeeParam, contributee);
}
// //////////////////////////////////////
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ManagedObject.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ManagedObject.java
index 34f13c1..585d249 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ManagedObject.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ManagedObject.java
@@ -33,7 +33,7 @@ import javax.annotation.Nullable;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.domain.DomainObjectList;
import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.base._Tuples.Tuple2;
+import org.apache.isis.commons.internal.base._Tuples.Indexed;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.metamodel.adapter.oid.RootOid;
import org.apache.isis.metamodel.commons.ClassExtensions;
@@ -411,19 +411,19 @@ public interface ManagedObject {
public static Object invokeC(
Method method,
ManagedObject adapter,
- Stream<Tuple2<Integer, ? extends ManagedObject>> paramsAndIndexes) {
+ Stream<Indexed<? extends ManagedObject>> paramsAndIndexes) {
return invoke(method, adapter, asArray(paramsAndIndexes, method.getParameterTypes().length));
}
private static ManagedObject[] asArray(
- Stream<Tuple2<Integer, ? extends ManagedObject>> paramsAndIndexes,
+ Stream<Indexed<? extends ManagedObject>> paramsAndIndexes,
int length) {
final ManagedObject[] args = new ManagedObject[length];
paramsAndIndexes.forEach(entry->{
- final Integer paramNum = entry.get_1();
+ final int paramNum = entry.getIndex();
if(paramNum < length) {
- args[paramNum] = entry.get_2();
+ args[paramNum] = entry.getValue();
}
});
return args;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/FacetedMethodsBuilder.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
index f78a649..08c3c07 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
@@ -445,12 +445,6 @@ public class FacetedMethodsBuilder {
private boolean representsAction(final Method actionMethod) {
- //System.out.println("####" + actionMethod.toString());
-
- if(actionMethod.toString().contains("InvalidOrphanedActionSupportNoActionEnforced")) {
- System.out.println("####" + actionMethod.toString());
- }
-
// just an optimization, not strictly required
if(isExplicitActionAnnotationConfigured()) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectActionDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectActionDefault.java
index 9b3eda4..c0e43e1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectActionDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectActionDefault.java
@@ -30,6 +30,7 @@ import org.apache.isis.applib.RecoverableException;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.command.Command;
+import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.exceptions.UnknownTypeException;
import org.apache.isis.commons.internal._Constants;
import org.apache.isis.commons.internal.collections._Lists;
@@ -494,7 +495,7 @@ public class ObjectActionDefault extends ObjectMemberAbstract implements ObjectA
parameterDefaultPojos[i] = paramFacet
.getDefault(
target,
- /*parameters*/ null,
+ /*parameters*/ Can.empty(),
/*paramNumUpdated*/null);
} else {
parameterDefaultPojos[i] = null;