You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2023/10/04 10:50:51 UTC

[causeway] branch master updated: CAUSEWAY-3624: allows MANDATORY Property/Parameter to be set even if backends are more relaxed

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/causeway.git


The following commit(s) were added to refs/heads/master by this push:
     new 30c3aac0b3 CAUSEWAY-3624: allows MANDATORY Property/Parameter to be set even if backends are more relaxed
30c3aac0b3 is described below

commit 30c3aac0b329f1720dc4c1db297d4531c4f617e9
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Oct 4 12:50:44 2023 +0200

    CAUSEWAY-3624: allows MANDATORY Property/Parameter to be set even if
    backends are more relaxed
---
 .../mandatory/MandatoryFacetForParameterAnnotation.java    |  8 +++++++-
 .../mandatory/MandatoryFacetForPropertyAnnotation.java     | 14 ++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/mandatory/MandatoryFacetForParameterAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/mandatory/MandatoryFacetForParameterAnnotation.java
index ab6fd796fe..95d77ae7fe 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/mandatory/MandatoryFacetForParameterAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/mandatory/MandatoryFacetForParameterAnnotation.java
@@ -20,6 +20,7 @@ package org.apache.causeway.core.metamodel.facets.param.parameter.mandatory;
 
 import org.apache.causeway.applib.annotation.Optionality;
 import org.apache.causeway.applib.annotation.Parameter;
+import org.apache.causeway.core.metamodel.facetapi.Facet;
 import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
 import org.apache.causeway.core.metamodel.facets.objectvalue.mandatory.MandatoryFacet;
 import org.apache.causeway.core.metamodel.facets.objectvalue.mandatory.MandatoryFacetAbstract;
@@ -58,6 +59,11 @@ extends MandatoryFacetAbstract {
         super(semantics, holder);
     }
 
+    protected MandatoryFacetForParameterAnnotation(
+            final Semantics semantics, final FacetHolder holder, final Facet.Precedence precedence) {
+        super(semantics, holder, precedence);
+    }
+
     @Override
     public final String summarize() {
         return MandatoryFacetForParameterAnnotation.class.getSimpleName() + "." + super.summarize();
@@ -73,7 +79,7 @@ extends MandatoryFacetAbstract {
 
     public static class Required extends MandatoryFacetForParameterAnnotation {
         public Required(final FacetHolder holder) {
-            super(Semantics.REQUIRED, holder);
+            super(Semantics.REQUIRED, holder, Precedence.HIGH); // allow UI to be more strict than data/store
         }
     }
 
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/mandatory/MandatoryFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/mandatory/MandatoryFacetForPropertyAnnotation.java
index 4a0c3808fc..572a39e5d0 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/mandatory/MandatoryFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/mandatory/MandatoryFacetForPropertyAnnotation.java
@@ -21,6 +21,7 @@ package org.apache.causeway.core.metamodel.facets.properties.property.mandatory;
 import org.apache.causeway.applib.annotation.Optionality;
 import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.commons.internal.reflection._MethodFacades.MethodFacade;
+import org.apache.causeway.core.metamodel.facetapi.Facet;
 import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
 import org.apache.causeway.core.metamodel.facets.objectvalue.mandatory.MandatoryFacet;
 import org.apache.causeway.core.metamodel.facets.objectvalue.mandatory.MandatoryFacetAbstract;
@@ -63,10 +64,15 @@ extends MandatoryFacetAbstract {
                 });
     }
 
-    public MandatoryFacetForPropertyAnnotation(final FacetHolder holder, final Semantics semantics) {
+    public MandatoryFacetForPropertyAnnotation(final Semantics semantics, final FacetHolder holder) {
         super(semantics, holder);
     }
 
+    protected MandatoryFacetForPropertyAnnotation(
+            final Semantics semantics, final FacetHolder holder, final Facet.Precedence precedence) {
+        super(semantics, holder, precedence);
+    }
+
     @Override
     public final String summarize() {
         return MandatoryFacetForPropertyAnnotation.class.getSimpleName() + "." + super.summarize();
@@ -76,19 +82,19 @@ extends MandatoryFacetAbstract {
 
     public static class Primitive extends MandatoryFacetForPropertyAnnotation {
         public Primitive(final FacetHolder holder) {
-            super(holder, Semantics.REQUIRED);
+            super(Semantics.REQUIRED, holder);
         }
     }
 
     public static class Required extends MandatoryFacetForPropertyAnnotation {
         public Required(final FacetHolder holder) {
-            super(holder, Semantics.REQUIRED);
+            super(Semantics.REQUIRED, holder, Precedence.HIGH); // allow UI to be more strict than data/store
         }
     }
 
     public static class Optional extends MandatoryFacetForPropertyAnnotation {
         public Optional(final FacetHolder holder) {
-            super(holder, Semantics.OPTIONAL);
+            super(Semantics.OPTIONAL, holder);
         }
     }