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/07/02 16:15:39 UTC

[isis] branch master updated: ISIS-2386: proposed fix: handle corner cases for init defaults

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 5a53c71  ISIS-2386: proposed fix: handle corner cases for init defaults
5a53c71 is described below

commit 5a53c714087da8e7a4866919280a6761f07383ec
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Jul 2 18:15:22 2020 +0200

    ISIS-2386: proposed fix: handle corner cases for init defaults
    
    also consolidate mandatory check logic
---
 .../objectvalue/mandatory/MandatoryFacet.java      | 11 +++++++++
 .../defaults/ActionParameterDefaultsFacet.java     |  1 +
 .../ActionParameterDefaultsFacetViaMethod.java     | 21 +++++++++--------
 .../validating/PropertyValidateFacetAbstract.java  |  3 +--
 .../isis/core/metamodel/spec/ManagedObjects.java   | 26 ++++++++++++++++++++++
 .../core/metamodel/spec/feature/ObjectFeature.java |  6 +----
 .../specimpl/ObjectActionParameterAbstract.java    |  8 +++++--
 .../specimpl/ObjectAssociationAbstract.java        |  3 +--
 .../specimpl/OneToOneAssociationDefault.java       |  5 ++---
 .../wicket/model/models/ScalarParameterModel.java  | 14 +++++-------
 10 files changed, 66 insertions(+), 32 deletions(-)

diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/mandatory/MandatoryFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/mandatory/MandatoryFacet.java
index 84b2fd4..67871f4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/mandatory/MandatoryFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/mandatory/MandatoryFacet.java
@@ -24,6 +24,9 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.interactions.ValidatingInteractionAdvisor;
 import org.apache.isis.core.metamodel.spec.ManagedObject;
 
+import lombok.NonNull;
+import lombok.val;
+
 /**
  * Whether a property or a parameter is mandatory (not optional).
  *
@@ -54,4 +57,12 @@ public interface MandatoryFacet extends Facet, ValidatingInteractionAdvisor {
      * attached is <i>not</i> mandatory.
      */
     public boolean isInvertedSemantics();
+
+    static boolean isMandatory(@NonNull FacetHolder facetHolder) {
+        val mandatoryFacet = facetHolder.getFacet(MandatoryFacet.class);
+        if(mandatoryFacet == null || mandatoryFacet.isFallback() || mandatoryFacet.isInvertedSemantics()) {
+            return false;
+        }
+        return true;
+    }
 }
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 aa651a2..9d7dc38 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
@@ -36,6 +36,7 @@ import lombok.NonNull;
 public interface ActionParameterDefaultsFacet extends Facet {
 
     /** default parameter value, depending on other pending parameters
+     * @param paramSpec 
      * @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)} 
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethod.java
index 2d7e72c..67155da 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethod.java
@@ -33,12 +33,14 @@ import org.apache.isis.core.metamodel.spec.ManagedObjects;
 import org.apache.isis.core.metamodel.specloader.specimpl.PendingParameterModel;
 
 import lombok.NonNull;
+import lombok.val;
 
 public class ActionParameterDefaultsFacetViaMethod 
 extends ActionParameterDefaultsFacetAbstract 
 implements ImperativeFacet {
 
     private final Method method;
+    @SuppressWarnings("unused")
     private final int paramNum;
     private final Optional<Constructor<?>> ppmFactory;
 
@@ -80,17 +82,17 @@ implements ImperativeFacet {
             
         // call with args: defaultNAct(X x, Y y, ...) 
         
-        if(ppmFactory.isPresent()) {
+        val defaultValue = ppmFactory.isPresent()
             // PPM programming model
-            return ManagedObjects.InvokeUtil
+            ? ManagedObjects.InvokeUtil
                     .invokeWithPPM(ppmFactory.get(), method, 
-                            pendingArgs.getActionTarget(), pendingArgs.getParamValues());    
-        }
-        
-        // else support legacy programming model, call any-arg defaultNAct(...)
-        return ManagedObjects.InvokeUtil
-                .invokeAutofit(method, 
-                    pendingArgs.getActionTarget(), pendingArgs.getParamValues());
+                            pendingArgs.getActionTarget(), pendingArgs.getParamValues())
+            // else support legacy programming model, call any-arg defaultNAct(...)
+            : ManagedObjects.InvokeUtil
+                    .invokeAutofit(method, 
+                        pendingArgs.getActionTarget(), pendingArgs.getParamValues());     
+
+        return defaultValue;
     }
 
     @Override
@@ -102,5 +104,6 @@ implements ImperativeFacet {
         super.appendAttributesTo(attributeMap);
         ImperativeFacet.Util.appendAttributesTo(this, attributeMap);
     }
+   
 
 }
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/PropertyValidateFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/PropertyValidateFacetAbstract.java
index 136dacc..a00e277 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/PropertyValidateFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/PropertyValidateFacetAbstract.java
@@ -46,8 +46,7 @@ public abstract class PropertyValidateFacetAbstract extends FacetAbstract implem
         ManagedObject proposed = propertyModifyContext.getProposed();
         if(proposed == null) {
             // skip validation if null value and optional property.
-            MandatoryFacet mandatoryFacet = getFacetHolder().getFacet(MandatoryFacet.class);
-            if(mandatoryFacet == null || mandatoryFacet.isFallback() || mandatoryFacet.isInvertedSemantics()) {
+            if(MandatoryFacet.isMandatory(getFacetHolder())) {
                 return null;
             }
         }
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java
index e0efa2e..7cefd88 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java
@@ -243,6 +243,32 @@ public final class ManagedObjects {
         
     }
     
+    // -- DEFAULTS UTILITIES
+    
+    public static ManagedObject emptyToDefault(boolean mandatory, @NonNull ManagedObject input) {
+        if(!isSpecified(input)) {
+            return input;
+        }
+        if(input.getPojo()!=null) {
+            return input;
+        }
+        
+        // there are 2 cases to handle here
+        // 1) if primitive, then don't return null
+        // 2) if boxed boolean, that is MANDATORY, then don't return null
+        
+        val spec = input.getSpecification();
+        val expectedType = spec.getCorrespondingClass();
+        if(expectedType.isPrimitive()) {
+            return ManagedObject.of(spec, ClassExtensions.toDefault(expectedType));
+        }
+        if(Boolean.class.equals(expectedType) && mandatory) {
+            return ManagedObject.of(spec, Boolean.FALSE);
+        }
+        
+        return input;
+    }
+    
     // -- TITLE UTILITIES
     
     public static String abbreviatedTitleOf(ManagedObject adapter, int maxLength, String suffix) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectFeature.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectFeature.java
index 959e289..dc9ae53 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectFeature.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectFeature.java
@@ -19,8 +19,6 @@
 
 package org.apache.isis.core.metamodel.spec.feature;
 
-import java.util.Optional;
-
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.objectvalue.mandatory.MandatoryFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -84,9 +82,7 @@ public interface ObjectFeature extends Specification {
      * invoked.
      */
     default boolean isOptional() {
-        return Optional.ofNullable(getFacet(MandatoryFacet.class))
-        .map(MandatoryFacet::isInvertedSemantics)
-        .orElse(true);
+        return !MandatoryFacet.isMandatory(this);
     }
 
 }
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
index 8992764..c9d5691 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
@@ -241,9 +241,13 @@ implements ObjectActionParameter, FacetHolder.Delegating {
         val defaultsFacet = getFacet(ActionParameterDefaultsFacet.class);
         if (defaultsFacet != null && !defaultsFacet.isFallback()) {
             final Object paramValuePojo = defaultsFacet.getDefault(pendingArgs);
-            return ManagedObject.of(paramSpec, paramValuePojo);    
+            return ManagedObjects.emptyToDefault(
+                    !isOptional(),
+                    ManagedObject.of(paramSpec, paramValuePojo));    
         }   
-        return pendingArgs.getParamValue(getNumber());
+        return ManagedObjects.emptyToDefault(
+                !isOptional(),
+                pendingArgs.getParamValue(getNumber()));
     }
 
     // helpers
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstract.java
index f267e36..4f82311 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstract.java
@@ -88,8 +88,7 @@ implements ObjectAssociation {
 
     @Override
     public boolean isMandatory() {
-        final MandatoryFacet mandatoryFacet = getFacet(MandatoryFacet.class);
-        return mandatoryFacet != null && !mandatoryFacet.isInvertedSemantics();
+        return MandatoryFacet.isMandatory(this);
     }
 
     @Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationDefault.java
index 56c1b8c..0135841 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationDefault.java
@@ -227,9 +227,8 @@ implements OneToOneAssociation {
 
     @Override
     public void toDefault(final ManagedObject ownerAdapter) {
-        // don't default optional fields
-        final MandatoryFacet mandatoryFacet = getFacet(MandatoryFacet.class);
-        if (mandatoryFacet != null && mandatoryFacet.isInvertedSemantics()) {
+        // default only mandatory fields
+        if (!MandatoryFacet.isMandatory(this)) {
             return;
         }
 
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 08dbb86..004c32f 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
@@ -23,9 +23,9 @@ import javax.annotation.Nullable;
 import org.apache.isis.applib.annotation.Where;
 import org.apache.isis.core.commons.collections.Can;
 import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
-import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.interactions.managed.ManagedAction;
 import org.apache.isis.core.metamodel.spec.ManagedObject;
+import org.apache.isis.core.metamodel.spec.ManagedObjects;
 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;
@@ -118,19 +118,17 @@ implements ParameterUiModel {
     }
 
     @Override
-    public String validate(final ManagedObject proposedAdapter) {
+    public String validate(final ManagedObject proposedValue) {
         final ObjectActionParameter parameter = getMetaModel();
         
         val action = parameter.getAction();
-        
-        
         try {
             ManagedObject parentAdapter = getParentUiModel().load();
             
             val head = action.interactionHead(parentAdapter);    
             
             final String invalidReasonIfAny = parameter
-                    .isValid(head, proposedAdapter, InteractionInitiatedBy.USER);
+                    .isValid(head, proposedValue, InteractionInitiatedBy.USER);
             return invalidReasonIfAny;
         } catch (final Exception ex) {
             return ex.getLocalizedMessage();
@@ -166,11 +164,9 @@ implements ParameterUiModel {
     
     private ManagedObject toNonNull(@Nullable ManagedObject adapter) {
         if(adapter == null) {
-            if(getMetaModel().getFeatureType() == FeatureType.ACTION_PARAMETER_SCALAR) {
-                return ManagedObject.empty(getMetaModel().getSpecification());
-            }
+            adapter = ManagedObject.empty(getMetaModel().getSpecification());
         }
-        return adapter;
+        return ManagedObjects.emptyToDefault(!getMetaModel().isOptional(), adapter);
     }