You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/07/24 12:52:02 UTC

[isis] 02/02: ISIS-2222: fixes @Property#regex annotations

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

danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git

commit ec4ef3d4a3b8c27d00f1bd0eb8f291016d3a660e
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jul 24 13:22:26 2020 +0100

    ISIS-2222: fixes @Property#regex annotations
    
    Also fixes up objectType and title for some of the other @Property annotation VMs
---
 .../dom/annotDomain/Property/editing/PropertyEditingVm.java       | 4 ++--
 .../dom/annotDomain/Property/fileAccept/PropertyFileAcceptVm.java | 4 ++--
 .../annotDomain/Property/hidden/child/PropertyHiddenChildVm.java  | 2 +-
 .../dom/annotDomain/Property/maxLength/PropertyMaxLengthVm.java   | 4 ++--
 .../annotDomain/Property/mustSatisfy/PropertyMustSatisfyVm.java   | 4 ++--
 .../annotDomain/Property/optionality/PropertyOptionalityVm.java   | 4 ++--
 .../annotDomain/Property/regexPattern/PropertyRegexPatternVm.java | 4 ++--
 .../PropertyRegexPatternVm_updateWithMetaAnnotation.java          | 2 +-
 ...PropertyRegexPatternVm_updateWithMetaAnnotationOverridden.java | 4 ++--
 .../PropertyRegexPatternVm_updateWithParameterLayout.java         | 8 ++++++--
 10 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/editing/PropertyEditingVm.java b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/editing/PropertyEditingVm.java
index 3bddbcb..8f9139d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/editing/PropertyEditingVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/editing/PropertyEditingVm.java
@@ -43,7 +43,7 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 @XmlAccessorType(XmlAccessType.FIELD)
 @DomainObject(
         nature=Nature.VIEW_MODEL,
-        objectType = "demo.PropertyLayoutEditingVm",
+        objectType = "demo.PropertyEditingVm",
         editing = Editing.DISABLED              // <.>
 )
 public class PropertyEditingVm implements HasAsciiDocDescription {
@@ -51,7 +51,7 @@ public class PropertyEditingVm implements HasAsciiDocDescription {
 //end::class[]
 
     public String title() {
-        return "PropertyLayout#editing";
+        return "Property#editing";
     }
 
 //tag::annotation[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/fileAccept/PropertyFileAcceptVm.java b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/fileAccept/PropertyFileAcceptVm.java
index 2d69ba9..3c3c2ae 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/fileAccept/PropertyFileAcceptVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/fileAccept/PropertyFileAcceptVm.java
@@ -46,13 +46,13 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 @XmlAccessorType(XmlAccessType.FIELD)
 @DomainObject(
         nature=Nature.VIEW_MODEL,
-        objectType = "demo.PropertyLayoutFileAcceptVm",
+        objectType = "demo.PropertyFileAcceptVm",
         editing = Editing.ENABLED
 )
 public class PropertyFileAcceptVm implements HasAsciiDocDescription {
 
     public String title() {
-        return "PropertyLayout#fileAccept";
+        return "Property#fileAccept";
     }
 
 //tag::annotation[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/hidden/child/PropertyHiddenChildVm.java b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/hidden/child/PropertyHiddenChildVm.java
index 80e6238..d59d92a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/hidden/child/PropertyHiddenChildVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/hidden/child/PropertyHiddenChildVm.java
@@ -67,7 +67,7 @@ public class PropertyHiddenChildVm implements HasAsciiDocDescription {
     }
 
     public String title() {
-        return "PropertyLayout#hidden (child object)";
+        return "Property#hidden (child object)";
     }
 
 //tag::variants-nowhere[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/maxLength/PropertyMaxLengthVm.java b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/maxLength/PropertyMaxLengthVm.java
index 970aeb6..207af78 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/maxLength/PropertyMaxLengthVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/maxLength/PropertyMaxLengthVm.java
@@ -43,13 +43,13 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 @XmlAccessorType(XmlAccessType.FIELD)
 @DomainObject(
         nature=Nature.VIEW_MODEL,
-        objectType = "demo.PropertyLayoutMaxLengthVm",
+        objectType = "demo.PropertyMaxLengthVm",
         editing = Editing.ENABLED
 )
 public class PropertyMaxLengthVm implements HasAsciiDocDescription {
 
     public String title() {
-        return "PropertyLayout#maxLength";
+        return "Property#maxLength";
     }
 
 //tag::annotation[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/mustSatisfy/PropertyMustSatisfyVm.java b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/mustSatisfy/PropertyMustSatisfyVm.java
index 47d04c1..12d8e46 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/mustSatisfy/PropertyMustSatisfyVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/mustSatisfy/PropertyMustSatisfyVm.java
@@ -44,13 +44,13 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 @XmlAccessorType(XmlAccessType.FIELD)
 @DomainObject(
         nature=Nature.VIEW_MODEL,
-        objectType = "demo.PropertyLayoutMustSatisfyVm",
+        objectType = "demo.PropertyMustSatisfyVm",
         editing = Editing.ENABLED
 )
 public class PropertyMustSatisfyVm implements HasAsciiDocDescription {
 
     public String title() {
-        return "PropertyLayout#mustSatisfy";
+        return "Property#mustSatisfy";
     }
 
 //tag::annotation[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/optionality/PropertyOptionalityVm.java b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/optionality/PropertyOptionalityVm.java
index 1480ad9..2709527 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/optionality/PropertyOptionalityVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/optionality/PropertyOptionalityVm.java
@@ -43,7 +43,7 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 @XmlAccessorType(XmlAccessType.FIELD)
 @DomainObject(
         nature=Nature.VIEW_MODEL,
-        objectType = "demo.PropertyLayoutOptionalityVm",
+        objectType = "demo.PropertyOptionalityVm",
         editing = Editing.ENABLED
 )
 public class PropertyOptionalityVm implements HasAsciiDocDescription {
@@ -51,7 +51,7 @@ public class PropertyOptionalityVm implements HasAsciiDocDescription {
 //end::class[]
 
     public String title() {
-        return "PropertyLayout#optionality";
+        return "Property#optionality";
     }
 
 //tag::annotation[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/regexPattern/PropertyRegexPatternVm.java b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/regexPattern/PropertyRegexPatternVm.java
index 33b8e2f..3b2a8a8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/regexPattern/PropertyRegexPatternVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/regexPattern/PropertyRegexPatternVm.java
@@ -45,13 +45,13 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 @XmlAccessorType(XmlAccessType.FIELD)
 @DomainObject(
         nature=Nature.VIEW_MODEL,
-        objectType = "demo.PropertyLayoutRegexPatternVm",
+        objectType = "demo.PropertyRegexPatternVm",
         editing = Editing.ENABLED
 )
 public class PropertyRegexPatternVm implements HasAsciiDocDescription {
 
     public String title() {
-        return "PropertyLayout#regexPattern";
+        return "Property#regexPattern";
     }
 
 //tag::annotation[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/regexPattern/PropertyRegexPatternVm_updateWithMetaAnnotation.java b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/regexPattern/PropertyRegexPatternVm_updateWithMetaAnnotation.java
index eb25e0d..d605d90 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/regexPattern/PropertyRegexPatternVm_updateWithMetaAnnotation.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/regexPattern/PropertyRegexPatternVm_updateWithMetaAnnotation.java
@@ -28,7 +28,7 @@ import lombok.RequiredArgsConstructor;
 
 @Action(
     semantics = SemanticsOf.IDEMPOTENT,
-    associateWith = "propertyUsingMetaAnnotation", associateWithSequence = "1"
+    associateWith = "emailAddressPropertyUsingMetaAnnotation", associateWithSequence = "1"
 )
 @RequiredArgsConstructor
 public class PropertyRegexPatternVm_updateWithMetaAnnotation {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/regexPattern/PropertyRegexPatternVm_updateWithMetaAnnotationOverridden.java b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/regexPattern/PropertyRegexPatternVm_updateWithMetaAnnotationOverridden.java
index 853931d..2b5be5f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/regexPattern/PropertyRegexPatternVm_updateWithMetaAnnotationOverridden.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/regexPattern/PropertyRegexPatternVm_updateWithMetaAnnotationOverridden.java
@@ -12,7 +12,7 @@ import lombok.RequiredArgsConstructor;
 
 @Action(
     semantics = SemanticsOf.IDEMPOTENT,
-    associateWith = "propertyUsingMetaAnnotationButOverridden", associateWithSequence = "1"
+    associateWith = "emailAddressPropertyUsingMetaAnnotationButOverridden", associateWithSequence = "1"
 )
 @RequiredArgsConstructor
 public class PropertyRegexPatternVm_updateWithMetaAnnotationOverridden {
@@ -23,7 +23,7 @@ public class PropertyRegexPatternVm_updateWithMetaAnnotationOverridden {
     public PropertyRegexPatternVm act(
             @RegexPatternEmailComMetaAnnotation                             // <.>
             @Parameter(
-                regexPattern = "^[^@+]@[^\\.+]\\.org$"                      // <.>
+                regexPattern = "^\\w+@\\w+[.]org$"                      // <.>
                 , regexPatternReplacement = "Must be .org email address"
                 , regexPatternFlags = Pattern.COMMENTS
             )
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/regexPattern/PropertyRegexPatternVm_updateWithParameterLayout.java b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/regexPattern/PropertyRegexPatternVm_updateWithParameterLayout.java
index d2077fe..50e8727 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/regexPattern/PropertyRegexPatternVm_updateWithParameterLayout.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/regexPattern/PropertyRegexPatternVm_updateWithParameterLayout.java
@@ -1,5 +1,7 @@
 package demoapp.dom.annotDomain.Property.regexPattern;
 
+import java.util.regex.Pattern;
+
 import org.apache.isis.applib.annotation.Action;
 import org.apache.isis.applib.annotation.Optionality;
 import org.apache.isis.applib.annotation.Parameter;
@@ -10,7 +12,7 @@ import lombok.RequiredArgsConstructor;
 
 @Action(
     semantics = SemanticsOf.IDEMPOTENT,
-    associateWith = "propertyUsingAnnotation", associateWithSequence = "1"
+    associateWith = "emailAddressPropertyUsingAnnotation", associateWithSequence = "1"
 )
 @RequiredArgsConstructor
 public class PropertyRegexPatternVm_updateWithParameterLayout {
@@ -20,7 +22,9 @@ public class PropertyRegexPatternVm_updateWithParameterLayout {
 //tag::annotation[]
     public PropertyRegexPatternVm act(
             @Parameter(
-                regexPattern = "^[^@+]@[^\\.+]\\.com$"                  // <.>
+                regexPattern = "^\\w+@\\w+[.]com$"                  // <.>
+                , regexPatternReplacement = "Must be .com email address"
+                , regexPatternFlags = Pattern.CASE_INSENSITIVE
             )
             @ParameterLayout(
                 describedAs =