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/10/07 10:39:11 UTC

[isis] 02/02: ISIS-2441: improve _Either semantics

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch 2441-auditing
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 4054e768302d0d379662e71bca2979c7d929a337
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Oct 7 12:38:54 2020 +0200

    ISIS-2441: improve _Either semantics
---
 .../apache/isis/commons/internal/base/_Either.java | 42 ++++++++++++++++------
 .../interactions/managed/ActionInteraction.java    | 14 ++++----
 .../interactions/managed/MemberInteraction.java    |  4 +--
 .../interactions/managed/PropertyInteraction.java  |  2 +-
 4 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/commons/src/main/java/org/apache/isis/commons/internal/base/_Either.java b/commons/src/main/java/org/apache/isis/commons/internal/base/_Either.java
index d8008c4..d85b7a7 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/base/_Either.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/base/_Either.java
@@ -30,6 +30,7 @@ import static org.apache.isis.commons.internal.base._With.requires;
 
 import lombok.AccessLevel;
 import lombok.EqualsAndHashCode;
+import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
 
@@ -109,39 +110,58 @@ public final class _Either<L, R> {
         return right!=null;
     }
 
-    // -- COMPOSITION
-
-    public <X, Y> _Either<X, Y> map(Function<L, X> leftMapper, Function<R, Y> rightMapper){
+    // -- MAPPING
+    
+    public <T> _Either<T, R> mapLeft(final @NonNull Function<L, T> leftMapper){
+        return isLeft()
+                ? _Either.left(leftMapper.apply(left))
+                : _Either.right(right);
+    }
+    
+    public <T> _Either<L, T> mapRight(final @NonNull Function<R, T> rightMapper){
+        return isLeft()
+                ? _Either.left(left)
+                : _Either.right(rightMapper.apply(right));
+    }
+    
+    public <X, Y> _Either<X, Y> bimap(
+            final @NonNull Function<L, X> leftMapper, 
+            final @NonNull Function<R, Y> rightMapper){
         return isLeft()
                 ? left(leftMapper.apply(left))
                 : right(rightMapper.apply(right));
     }
 
-    public <X, Y> _Either<X, Y> mapNullable(Function<L, X> leftMapper, Function<R, Y> rightMapper){
+    public <X, Y> _Either<X, Y> bimapNullable(
+            final @NonNull Function<L, X> leftMapper, 
+            final @NonNull Function<R, Y> rightMapper){
         return isLeft()
                 ? leftNullable(leftMapper.apply(left))
                 : rightNullable(rightMapper.apply(right));
     }
     
-    public _Either<L, R> leftRemap(Function<L, _Either<L, R>> leftRemapper){
+    public _Either<L, R> mapIfLeft(Function<L, _Either<L, R>> leftRemapper){
         return isLeft()
                 ? leftRemapper.apply(left)
                 : this;
     }
 
-    public _Either<L, R> rightReMap(Function<R, _Either<L, R>> rightRemapper){
+    public _Either<L, R> mapIfRight(Function<R, _Either<L, R>> rightRemapper){
         return isLeft()
                 ? this
                 : rightRemapper.apply(right);
     }
 
-    // -- REDUCTION
+    
+    // -- FOLDING
 
-    public <X> X get(BiFunction<L, R, X> reduction){
-        return reduction.apply(left, right);
+    public <T> T fold(BiFunction<L, R, T> biMapper){
+        return biMapper.apply(left, right);
     }
-
-    public <X> X get(Function<L, X> leftMapper, Function<R, X> rightMapper){
+    
+    public <T> T fold(
+            final @NonNull Function<L, T> leftMapper,
+            final @NonNull Function<R, T> rightMapper){
         return isLeft()
                 ? leftMapper.apply(left)
                 : rightMapper.apply(right);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ActionInteraction.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ActionInteraction.java
index 0c800ca..8d9d15a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ActionInteraction.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ActionInteraction.java
@@ -80,7 +80,7 @@ public final class ActionInteraction extends MemberInteraction<ManagedAction, Ac
     
     public ActionInteraction checkSemanticConstraint(@NonNull SemanticConstraint semanticConstraint) {
 
-        chain = chain.leftRemap(action->{
+        chain = chain.mapIfLeft(action->{
 
             val actionSemantics = action.getAction().getSemantics();
 
@@ -89,13 +89,13 @@ public final class ActionInteraction extends MemberInteraction<ManagedAction, Ac
                 return _Either.left(action);
 
             case IDEMPOTENT:
-                return (! actionSemantics.isIdempotentInNature()) 
-                        ? _Either.right(InteractionVeto.actionNotIdempotent(action)) 
-                        : _Either.left(action);
+                return actionSemantics.isIdempotentInNature() 
+                        ? _Either.left(action)
+                        : _Either.right(InteractionVeto.actionNotIdempotent(action)) ;
             case SAFE:
-                return (! actionSemantics.isSafeInNature()) 
-                        ? _Either.right(InteractionVeto.actionNotSafe(action)) 
-                        : _Either.left(action);
+                return actionSemantics.isSafeInNature() 
+                        ? _Either.left(action)
+                        : _Either.right(InteractionVeto.actionNotSafe(action));
             default:
                 throw _Exceptions.unmatchedCase(semanticConstraint); // unexpected code reach
             }
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/MemberInteraction.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/MemberInteraction.java
index 477e6f4..4d4318d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/MemberInteraction.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/MemberInteraction.java
@@ -44,7 +44,7 @@ public abstract class MemberInteraction<T extends ManagedMember, H extends Membe
     }
     
     public H checkVisibility() {
-        chain = chain.leftRemap(property->{
+        chain = chain.mapIfLeft(property->{
             val visibilityVeto = property.checkVisibility();
             return visibilityVeto.isPresent()
                 ? _Either.right(visibilityVeto.get()) 
@@ -54,7 +54,7 @@ public abstract class MemberInteraction<T extends ManagedMember, H extends Membe
     }
     
     public H checkUsability() {
-        chain = chain.leftRemap(property->{
+        chain = chain.mapIfLeft(property->{
             val usablitiyVeto = property.checkUsability();
             return usablitiyVeto.isPresent()
                 ? _Either.right(usablitiyVeto.get()) 
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/PropertyInteraction.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/PropertyInteraction.java
index 35601b1..000405f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/PropertyInteraction.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/PropertyInteraction.java
@@ -52,7 +52,7 @@ public final class PropertyInteraction extends MemberInteraction<ManagedProperty
     public PropertyInteraction modifyProperty(
             @NonNull final Function<ManagedProperty, ManagedObject> newProperyValueProvider) {
 
-        chain = chain.leftRemap(property->{
+        chain = chain.mapIfLeft(property->{
             val validityVeto = property.modifyProperty(newProperyValueProvider.apply(property));
             return validityVeto.isPresent()
                 ? _Either.right(validityVeto.get())