[EAK-504] Fix review suggestions

exadel-inc · Jan 29, 2024 · a321900 · a321900
1 parent 2ded0e6
commit a321900
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/core/src/main/java/com/exadel/aem/toolkit/api/annotations/policies/MaxChildren.java b/core/src/main/java/com/exadel/aem/toolkit/api/annotations/policies/MaxChildren.java
@@ -18,13 +18,17 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import com.exadel.aem.toolkit.api.annotations.meta.ValueRestriction;
+import com.exadel.aem.toolkit.api.annotations.meta.ValueRestrictions;
+
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface MaxChildren {
     /**
      * Specifies the maximum number of children allowed for container component
      * @return Long value, 0 or greater
      */
+    @ValueRestriction(ValueRestrictions.NON_NEGATIVE)
     long value();
 
     /**

diff --git a/plugin/src/main/java/com/exadel/aem/toolkit/plugin/handlers/common/MaxChildrenHandler.java b/plugin/src/main/java/com/exadel/aem/toolkit/plugin/handlers/common/MaxChildrenHandler.java
@@ -30,12 +30,12 @@ public class MaxChildrenHandler implements Handler {
     /**
      * Name of the listener to resolve max children limit for `policies` js module
      */
-    public static final String MAX_LIMIT_RESOLVER_NAME = "resolvemaxchildren";
+    public static final String MAX_CHILDREN_RESOLVER_NAME = "resolvemaxchildren";
 
     /**
      * Format of default max children limit resolver
      */
-    private static final String MAX_LIMIT_RESOLVER_FORMAT = "() => %d";
+    private static final String MAX_CHILDREN_RESOLVER_FORMAT = "() => %d";
 
 
     /**
@@ -61,7 +61,7 @@ private static void populate(MaxChildren rule, Target target) {
                 .attribute(DialogConstants.PN_PRIMARY_TYPE, DialogConstants.NT_EDIT_CONFIG)
                 .getOrCreateTarget(DialogConstants.NN_LISTENERS)
                 .attribute(DialogConstants.PN_PRIMARY_TYPE, DialogConstants.NT_LISTENERS)
-                .attribute(MAX_LIMIT_RESOLVER_NAME, String.format(MAX_LIMIT_RESOLVER_FORMAT, rule.value()));
+                .attribute(MAX_CHILDREN_RESOLVER_NAME, String.format(MAX_CHILDREN_RESOLVER_FORMAT, rule.value()));
         }
     }
 

diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/policies/js/maxChildren.js b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/policies/js/maxChildren.js
@@ -29,7 +29,7 @@
     ns.MaxChildrenLimiter.LIMIT_RESOLVER_PROPERTY = 'eak-max-children';
 
     /** The default limit active message */
-    ns.MaxChildrenLimiter.ERROR_MESSAGE = ns.I18n.get('Maximum number of allowed components reached');
+    ns.MaxChildrenLimiter.ERROR_MESSAGE = ns.I18n.get('Maximum number of allowed components is reached');
 
     /** The name of attribute to store limit message and marker */
     ns.MaxChildrenLimiter.ERROR_MESSAGE_ATTR = 'data-max-children-marker';