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/04/01 05:48:48 UTC

[causeway] branch master updated: CAUSEWAY-3401: be more specific and tell which annotation disables

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 894f49a4aa CAUSEWAY-3401: be more specific and tell which annotation disables
894f49a4aa is described below

commit 894f49a4aa2c0ea78364983e4d5116511ba51733
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Apr 1 07:48:44 2023 +0200

    CAUSEWAY-3401: be more specific and tell which annotation disables
---
 .../java/org/apache/causeway/core/metamodel/consent/Consent.java   | 7 +++++--
 .../editing/ImmutableFacetForDomainObjectAnnotation.java           | 2 +-
 .../property/disabled/DisabledFacetForPropertyAnnotation.java      | 2 +-
 ...r_MixinDomainWithPdfJsViewer_IntegTest.dump_facets.approved.xml | 4 ++--
 .../PdfjsViewer_MixinDomain_IntegTest.dump_facets.approved.xml     | 4 ++--
 ...er_PropDomainWithPdfjsViewer_IntegTest.dump_facets.approved.xml | 2 +-
 .../PdfjsViewer_PropDomain_IntegTest.dump_facets.approved.xml      | 2 +-
 7 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/consent/Consent.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/consent/Consent.java
index 05982f9546..5cf3385d57 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/consent/Consent.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/consent/Consent.java
@@ -55,8 +55,11 @@ public interface Consent {
             return new VetoReason(this.showInUi || other.showInUi, this.string + "; " + other.string);
         }
         // -- PREDEFINED REASONS
-        public static VetoReason editingDisabledReasonNotGiven() {
-            return VetoReason.inferred("Disabled, via annotation, reason not given.");
+        public static VetoReason editingObjectDisabledReasonNotGiven() {
+            return VetoReason.inferred("Disabled, via @DomainObject annotation, reason not given.");
+        }
+        public static VetoReason editingPropertyDisabledReasonNotGiven() {
+            return VetoReason.inferred("Disabled, via @Property annotation, reason not given.");
         }
         public static VetoReason propertyHasNoSetter() {
             return VetoReason.inferred("Disabled, property has no setter.");
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
index 6991d2cddc..7a93ad34eb 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
@@ -101,7 +101,7 @@ extends ImmutableFacetAbstract {
         return _Strings.nonEmpty(domainObject.editingDisabledReason())
                 .map(VetoReason::explicit)
                 // assuming there is no ImmutableFacet(s) with inverted semantics
-                .orElseGet(()->VetoReason.editingDisabledReasonNotGiven());
+                .orElseGet(()->VetoReason.editingObjectDisabledReasonNotGiven());
     }
 
 
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/disabled/DisabledFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/disabled/DisabledFacetForPropertyAnnotation.java
index 2c585a3b8d..7454f6bb19 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/disabled/DisabledFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/disabled/DisabledFacetForPropertyAnnotation.java
@@ -50,7 +50,7 @@ extends DisabledFacetAbstract {
 
             case DISABLED:
                  final VetoReason disabledReason = _Strings.isNullOrEmpty(property.editingDisabledReason())
-                     ? VetoReason.editingDisabledReasonNotGiven()
+                     ? VetoReason.editingPropertyDisabledReasonNotGiven()
                      : VetoReason.explicit(property.editingDisabledReason());
 
                 return new DisabledFacetForPropertyAnnotation(disabledReason, holder);
diff --git a/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_MixinDomainWithPdfJsViewer_IntegTest.dump_facets.approved.xml b/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_MixinDomainWithPdfJsViewer_IntegTest.dump_facets.approved.xml
index eedd0d1ae6..2954da568b 100644
--- a/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_MixinDomainWithPdfJsViewer_IntegTest.dump_facets.approved.xml
+++ b/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_MixinDomainWithPdfJsViewer_IntegTest.dump_facets.approved.xml
@@ -74,7 +74,7 @@
         <mml:attr name="facet" value="ImmutableFacetForDomainObjectAnnotationAsConfigured"/>
         <mml:attr name="interactionAdvisors" value="DisablingOrEnabling"/>
         <mml:attr name="precedence" value="DEFAULT"/>
-        <mml:attr name="reason" value="Disabled, via annotation, reason not given."/>
+        <mml:attr name="reason" value="Disabled, via @DomainObject annotation, reason not given."/>
       </mml:facet>
       <mml:facet id="org.apache.causeway.core.metamodel.facets.object.objectvalidprops.ObjectValidPropertiesFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.objectvalidprops.impl.ObjectValidPropertiesFacetImpl">
         <mml:attr name="facet" value="ObjectValidPropertiesFacetImpl"/>
@@ -982,7 +982,7 @@
         <mml:attr name="facet" value="ImmutableFacetForDomainObjectAnnotationAsConfigured"/>
         <mml:attr name="interactionAdvisors" value="DisablingOrEnabling"/>
         <mml:attr name="precedence" value="DEFAULT"/>
-        <mml:attr name="reason" value="Disabled, via annotation, reason not given."/>
+        <mml:attr name="reason" value="Disabled, via @DomainObject annotation, reason not given."/>
       </mml:facet>
       <mml:facet id="org.apache.causeway.core.metamodel.facets.object.mixin.MixinFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.mixin.MixinFacetForDomainObjectAnnotation">
         <mml:attr name="facet" value="MixinFacetForDomainObjectAnnotation"/>
diff --git a/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_MixinDomain_IntegTest.dump_facets.approved.xml b/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_MixinDomain_IntegTest.dump_facets.approved.xml
index 9c7ae8c95a..d6618d6aa1 100644
--- a/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_MixinDomain_IntegTest.dump_facets.approved.xml
+++ b/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_MixinDomain_IntegTest.dump_facets.approved.xml
@@ -74,7 +74,7 @@
         <mml:attr name="facet" value="ImmutableFacetForDomainObjectAnnotationAsConfigured"/>
         <mml:attr name="interactionAdvisors" value="DisablingOrEnabling"/>
         <mml:attr name="precedence" value="DEFAULT"/>
-        <mml:attr name="reason" value="Disabled, via annotation, reason not given."/>
+        <mml:attr name="reason" value="Disabled, via @DomainObject annotation, reason not given."/>
       </mml:facet>
       <mml:facet id="org.apache.causeway.core.metamodel.facets.object.objectvalidprops.ObjectValidPropertiesFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.objectvalidprops.impl.ObjectValidPropertiesFacetImpl">
         <mml:attr name="facet" value="ObjectValidPropertiesFacetImpl"/>
@@ -975,7 +975,7 @@
         <mml:attr name="facet" value="ImmutableFacetForDomainObjectAnnotationAsConfigured"/>
         <mml:attr name="interactionAdvisors" value="DisablingOrEnabling"/>
         <mml:attr name="precedence" value="DEFAULT"/>
-        <mml:attr name="reason" value="Disabled, via annotation, reason not given."/>
+        <mml:attr name="reason" value="Disabled, via @DomainObject annotation, reason not given."/>
       </mml:facet>
       <mml:facet id="org.apache.causeway.core.metamodel.facets.object.mixin.MixinFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.mixin.MixinFacetForDomainObjectAnnotation">
         <mml:attr name="facet" value="MixinFacetForDomainObjectAnnotation"/>
diff --git a/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_PropDomainWithPdfjsViewer_IntegTest.dump_facets.approved.xml b/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_PropDomainWithPdfjsViewer_IntegTest.dump_facets.approved.xml
index 95d14f1264..f6ff472c88 100644
--- a/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_PropDomainWithPdfjsViewer_IntegTest.dump_facets.approved.xml
+++ b/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_PropDomainWithPdfjsViewer_IntegTest.dump_facets.approved.xml
@@ -74,7 +74,7 @@
         <mml:attr name="facet" value="ImmutableFacetForDomainObjectAnnotationAsConfigured"/>
         <mml:attr name="interactionAdvisors" value="DisablingOrEnabling"/>
         <mml:attr name="precedence" value="DEFAULT"/>
-        <mml:attr name="reason" value="Disabled, via annotation, reason not given."/>
+        <mml:attr name="reason" value="Disabled, via @DomainObject annotation, reason not given."/>
       </mml:facet>
       <mml:facet id="org.apache.causeway.core.metamodel.facets.object.objectvalidprops.ObjectValidPropertiesFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.objectvalidprops.impl.ObjectValidPropertiesFacetImpl">
         <mml:attr name="facet" value="ObjectValidPropertiesFacetImpl"/>
diff --git a/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_PropDomain_IntegTest.dump_facets.approved.xml b/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_PropDomain_IntegTest.dump_facets.approved.xml
index 4e6d3ff195..d7a2c41fac 100644
--- a/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_PropDomain_IntegTest.dump_facets.approved.xml
+++ b/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_PropDomain_IntegTest.dump_facets.approved.xml
@@ -74,7 +74,7 @@
         <mml:attr name="facet" value="ImmutableFacetForDomainObjectAnnotationAsConfigured"/>
         <mml:attr name="interactionAdvisors" value="DisablingOrEnabling"/>
         <mml:attr name="precedence" value="DEFAULT"/>
-        <mml:attr name="reason" value="Disabled, via annotation, reason not given."/>
+        <mml:attr name="reason" value="Disabled, via @DomainObject annotation, reason not given."/>
       </mml:facet>
       <mml:facet id="org.apache.causeway.core.metamodel.facets.object.objectvalidprops.ObjectValidPropertiesFacet" fqcn="org.apache.causeway.core.metamodel.facets.object.objectvalidprops.impl.ObjectValidPropertiesFacetImpl">
         <mml:attr name="facet" value="ObjectValidPropertiesFacetImpl"/>