Merge pull request #500 from exadel-inc/release-2.4.1

[Tech] Merged release-2.4.1 branch to master

Author: smiakchilo

.github/workflows/cla.yml

@@ -10,7 +10,7 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             -   name: "CLA Assistant"
-                if: (github.event.comment.body == 'recheckcla' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
+                if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'recheckcla' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
                 # Alpha Release
                 uses: cla-assistant/github-action@v2.1.3-beta
                 env:

all/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.exadel.etoolbox</groupId>
         <artifactId>etoolbox-authoring-kit</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1</version>
     </parent>
 
     <artifactId>etoolbox-authoring-kit-all</artifactId>

core/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.exadel.etoolbox</groupId>
         <artifactId>etoolbox-authoring-kit</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1</version>
     </parent>
 
     <artifactId>etoolbox-authoring-kit-core</artifactId>
@@ -118,6 +118,10 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.wcm</groupId>
+            <artifactId>io.wcm.testing.aem-mock.core</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.wcm</groupId>
             <artifactId>io.wcm.testing.aem-mock.junit4</artifactId>
@@ -142,6 +146,14 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.api</artifactId>

core/src/main/java/com/exadel/aem/toolkit/api/annotations/injectors/I18N.java

@@ -32,7 +32,7 @@
  * particular internationalized string. Internationalization depends on the detection of the locale.
  * <p>By default, the locale is detected through the property of the current resource page. To override this, one can
  * either provide a particular locale value, a locale detector (a routine that guesses on the locale by, e.g., the
- * request path), or fall back to the standard mechanism which guesses on a locale by the preferences of the current
+ * request path) or fall back to the standard mechanism which guesses on a locale by the preferences of the current
  * user.
  * <p>The preferred adaptable object for this injector in an AEM environment is {@code SlingHttpServletRequest}. If
  * adaptation is done from a {@code Resource}, the result depends on whether a proper Sling resource bundle exists for

core/src/main/java/com/exadel/aem/toolkit/api/annotations/main/DesignDialog.java

@@ -45,20 +45,20 @@
     String title() default "";
 
     /**
-     * Renders as the `height` attribute of component's {@code cq:design_dialog} node. If no value provided,
-     * default {@code 480} is used
+     * Renders as the `height` attribute of component's {@code cq:design_dialog} node
      * @return Double-typed number
      */
+    @PropertyRendering(ignoreValues = "0.0")
     @ValueRestriction(ValueRestrictions.POSITIVE)
-    double height() default 480;
+    double height() default 0;
 
     /**
-     * Renders as the `width` attribute of component's {@code cq:design_dialog} node. If no value provided,
-     * default {@code 560} is used
+     * Renders as the `width` attribute of component's {@code cq:design_dialog} node
      * @return Double-typed number
      */
+    @PropertyRendering(ignoreValues = "0.0")
     @ValueRestriction(ValueRestrictions.POSITIVE)
-    double width() default 560;
+    double width() default 0;
 
     /**
      * When set to true, forces the entire dialog to ignore freshness of the Granite UI form beside the dialog. This will

core/src/main/java/com/exadel/aem/toolkit/api/annotations/main/Dialog.java

@@ -140,22 +140,26 @@
     String helpPath() default "";
 
     /**
-     * Renders as the {@code height} attribute of component's {@code cq:dialog} node. If no value provided,
-     * default {@code 480} is used
+     * Renders as the {@code height} attribute of component's {@code cq:dialog} node
      * @return Double-typed number
      */
-    @PropertyRendering(scope = Scopes.CQ_DIALOG)
+    @PropertyRendering(
+        scope = Scopes.CQ_DIALOG,
+        ignoreValues = "0.0"
+    )
     @ValueRestriction(ValueRestrictions.POSITIVE)
-    double height() default 480;
+    double height() default 0;
 
     /**
-     * Renders as the {@code width} attribute of component's {@code cq:dialog} node. If no value provided,
-     * default {@code 560} is used
+     * Renders as the {@code width} attribute of component's {@code cq:dialog} node
      * @return Double-typed number
      */
-    @PropertyRendering(scope = Scopes.CQ_DIALOG)
+    @PropertyRendering(
+        scope = Scopes.CQ_DIALOG,
+        ignoreValues = "0.0"
+    )
     @ValueRestriction(ValueRestrictions.POSITIVE)
-    double width() default 560;
+    double width() default 0;
 
     /**
      * When set to true, renders as the {@code disableTargeting} attribute of the component root node with its value

core/src/main/java/com/exadel/aem/toolkit/api/annotations/meta/StringTransformation.java

@@ -15,8 +15,8 @@
 
 import java.util.function.UnaryOperator;
 
-import org.apache.commons.lang.WordUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.text.WordUtils;
 import com.google.common.base.CaseFormat;
 
 /**
@@ -28,7 +28,7 @@ public enum StringTransformation {
     UPPERCASE(String::toUpperCase),
     LOWERCASE(String::toLowerCase),
     CAMELCASE(string -> CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, string.toLowerCase())),
-    CAPITALIZE(string -> WordUtils.capitalizeFully(string, new char[] {' ', '-'}));
+    CAPITALIZE(string -> WordUtils.capitalizeFully(string, ' ', '-'));
 
     private final UnaryOperator<String> transformation;
 

core/src/main/java/com/exadel/aem/toolkit/api/annotations/widgets/NumberField.java

@@ -38,7 +38,7 @@
     /**
      * When set to a non-blank string, maps to the {@code value} attribute of this Granite UI component's node.
      * Used to define a default value for a NumberField
-     * @return String value, castable to a number
+     * @return String value that can be cast to a number
      */
     @ValueRestriction(ValueRestrictions.NUMBER)
     String value() default "0";

core/src/main/java/com/exadel/aem/toolkit/api/handlers/EmbeddedMemberSource.java

@@ -18,12 +18,14 @@
 public interface EmbeddedMemberSource extends MemberSource {
     /**
      * Retrieves an optional {@code Member} reference pointing to a member of a foreign Java class that triggered
-     * rendering of the class that contains the current member. This is useful for rendering containers such as {@code
-     * FieldSet}s.
+     * rendering of the class that contains the current member. This is useful for rendering containers such as
+     * {@code FieldSet}s.
      * <p><i>Ex.: Class named "{@code Foo}" contains the field {@code private FooFieldset fooFieldset;}. Class named
-     * "{@code FooFieldset}" contains the field {@code private String bar}. As the plugin renders markup for {@code
-     * Foo}, it needs to render members of {@code FooFieldset} inside. As it reaches the field map {@code bar}, it will
-     * use the value {@code reportingClass = Foo.class} and grab values from {@code Foo} if needs to</i></p>
+     * "{@code FooFieldset}" contains the field {@code private String bar}. As the plugin renders markup for
+     * {@code Foo}, it needs to render members of {@code FooFieldset} inside. As it reaches the field map {@code bar},
+     * it will use the values {@code reportingClass = Foo.class} and {@code upstreamMember = Foo#fooFieldset}. These
+     * values can be then used to form up a rendering context for the current field {@code bar}: in particular, to get
+     * embeddable settings</i></p>
      * @return A nullable {@code Member} reference
      */
     Member getUpstreamMember();

core/src/main/java/com/exadel/aem/toolkit/core/CoreConstants.java

@@ -29,6 +29,7 @@ public class CoreConstants {
 
     public static final String PN_APPEND = "append";
     public static final String PN_CHECKED = "checked";
+    public static final String PN_DEFAULT_VALUE = "defaultValue";
     public static final String PN_ITEM_RESOURCE_TYPE = "itemResourceType";
     public static final String PN_LIMIT = "limit";
     public static final String PN_LIST_ITEM = "listItem";