Merge branch 'feature/string-props-failsafe-parsing' into develop

stefanseifert · stefanseifert · commit 1ddb13f7db2b · 2021-01-28T13:25:15.000+01:00
diff --git a/changes.xml b/changes.xml
@@ -23,6 +23,12 @@
     xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 https://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
   <body>
 
+    <release version="1.14.2" date="not released">
+      <action type="fix" dev="dtschentscher">
+        Fix parsing content package properties with numeric values.
+      </action>
+    </release>
+
     <release version="1.14.0" date="2020-12-21">
       <action type="add" dev="sseifert">
         conga-aem-maven-plugin:cloudmanager-all-package: Add "singlePackage" flag to alternatively build single "all" content package for all environments and nodes.
diff --git a/conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/handlebars/helper/AemCryptoEncryptHelper.java b/conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/handlebars/helper/AemCryptoEncryptHelper.java
@@ -28,6 +28,7 @@
 import java.security.GeneralSecurityException;
 import java.security.Key;
 import java.util.Map;
+import java.util.Objects;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.BooleanUtils;
@@ -72,7 +73,7 @@ public Object apply(Object context, Options options, HelperContext pluginContext
     boolean cryptoSkip = false;
     Map<String, Object> aemPluginConfig = pluginContext.getGenericPluginConfig().get(PLUGIN_NAME);
     if (aemPluginConfig != null) {
-      cryptoAesKeyUrl = (String)aemPluginConfig.get(PARAMETER_CRYPTO_AES_KEY_URL);
+      cryptoAesKeyUrl = Objects.toString(aemPluginConfig.get(PARAMETER_CRYPTO_AES_KEY_URL), null);
       Object cryptoSkipObject = aemPluginConfig.get(PARAMETER_CRYPTO_SKIP);
       if (cryptoSkipObject != null) {
         if (cryptoSkipObject instanceof Boolean) {
diff --git a/conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/validator/ContentPackageValidator.java b/conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/validator/ContentPackageValidator.java
@@ -27,6 +27,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.jackrabbit.filevault.maven.packaging.ValidatePackageMojo;
@@ -83,7 +84,7 @@ public Void apply(FileContext file, ValidatorContext context) throws ValidationE
     try {
       // validate package if a package type is defined
       // supported only within Maven
-      String packageType = (String)ContentPackageProperties.get(file.getFile()).get(NAME_PACKAGE_TYPE);
+      String packageType = Objects.toString(ContentPackageProperties.get(file.getFile()).get(NAME_PACKAGE_TYPE), null);
       if (packageType != null && context.getContainerContext() instanceof MavenContext) {
         validateContentPackage(file.getFile(), context, (MavenContext)context.getContainerContext());
       }
diff --git a/tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/model/ContentPackageFile.java b/tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/model/ContentPackageFile.java
@@ -28,6 +28,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import io.wcm.devops.conga.plugins.aem.postprocessor.ContentPackagePropertiesPostProcessor;
 
@@ -66,10 +67,10 @@ public final class ContentPackageFile {
     if (contentPackageProperties == null) {
       throw new IllegalArgumentException(ContentPackagePropertiesPostProcessor.MODEL_OPTIONS_PROPERTY + " missing.");
     }
-    this.name = (String)contentPackageProperties.get(NAME_NAME);
-    this.group = (String)contentPackageProperties.get(NAME_GROUP);
-    this.version = (String)contentPackageProperties.get(NAME_VERSION);
-    this.packageType = (String)contentPackageProperties.get(NAME_PACKAGE_TYPE);
+    this.name = Objects.toString(contentPackageProperties.get(NAME_NAME), null);
+    this.group = Objects.toString(contentPackageProperties.get(NAME_GROUP), null);
+    this.version = Objects.toString(contentPackageProperties.get(NAME_VERSION), null);
+    this.packageType = Objects.toString(contentPackageProperties.get(NAME_PACKAGE_TYPE), null);
 
     this.variants = getVariants(roleData);
   }
diff --git a/tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/model/ModelParser.java b/tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/model/ModelParser.java
@@ -31,6 +31,7 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -81,7 +82,7 @@ public boolean hasRole(File nodeDir, String roleName) {
     Map<String, Object> data = getModelData(nodeDir);
     List<Map<String, Object>> roles = (List<Map<String, Object>>)data.get("roles");
     for (Map<String, Object> role : roles) {
-      if (StringUtils.equals((String)role.get("role"), roleName)) {
+      if (StringUtils.equals(Objects.toString(role.get("role"), null), roleName)) {
         return true;
       }
     }
@@ -165,7 +166,7 @@ private List<ContentPackageFile> collectPackages(Map<String, Object> data, File
 
   private ContentPackageFile toContentPackageFile(Map<String, Object> fileData,
       Map<String, Object> roleData, File nodeDir) {
-    String path = (String)fileData.get("path");
+    String path = Objects.toString(fileData.get("path"), null);
     File file = new File(nodeDir, path);
     return new ContentPackageFile(file, fileData, roleData);
   }
