Author: mpetria
Date: Tue Jun 16 08:38:35 2015
New Revision: 1685733
URL: http://svn.apache.org/r1685733
Log:
SLING-4808: treat empty config values as null
Modified:
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/SettingsUtils.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VaultDistributionPackageBuilderFactory.java
sling/trunk/contrib/extensions/distribution/it/pom.xml
Modified:
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/SettingsUtils.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/SettingsUtils.java?rev=1685733&r1=1685732&r2=1685733&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/SettingsUtils.java
(original)
+++
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/component/impl/SettingsUtils.java
Tue Jun 16 08:38:35 2015
@@ -187,12 +187,34 @@ public class SettingsUtils {
}
List<String> result = new ArrayList<String>();
- for (String string : array) {
- if (string != null && string.trim().length() > 0) {
- result.add(string);
+ for (String entry : array) {
+ entry = removeEmptyEntry(entry);
+
+ if (entry != null) {
+ result.add(entry);
}
}
+ if (result.size() == 0) {
+ return null;
+ }
+
return result.toArray(new String[0]);
}
+
+
+ public static String removeEmptyEntry(String entry) {
+ if (entry == null) {
+ return null;
+ }
+
+ entry = entry.trim();
+
+
+ if (entry.length() == 0) {
+ return null;
+ }
+
+ return entry;
+ }
}
Modified:
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VaultDistributionPackageBuilderFactory.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VaultDistributionPackageBuilderFactory.java?rev=1685733&r1=1685732&r2=1685733&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VaultDistributionPackageBuilderFactory.java
(original)
+++
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VaultDistributionPackageBuilderFactory.java
Tue Jun 16 08:38:35 2015
@@ -118,24 +118,23 @@ public class VaultDistributionPackageBui
String name = PropertiesUtil.toString(config.get(NAME), null);
String type = PropertiesUtil.toString(config.get(TYPE), null);
- String importModeString =
PropertiesUtil.toString(config.get(IMPORT_MODE), null);
- String aclHandlingString =
PropertiesUtil.toString(config.get(ACL_HANDLING), null);
- String[] packageRoots =
PropertiesUtil.toStringArray(config.get(PACKAGE_ROOTS), null);
- String tempFsFolder =
PropertiesUtil.toString(config.get(TEMP_FS_FOLDER), null);
- String tempJcrFolder =
PropertiesUtil.toString(config.get(TEMP_JCR_FOLDER), null);
+ String importModeString =
SettingsUtils.removeEmptyEntry(PropertiesUtil.toString(config.get(IMPORT_MODE),
null));
+ String aclHandlingString =
SettingsUtils.removeEmptyEntry(PropertiesUtil.toString(config.get(ACL_HANDLING),
null));
-
- packageRoots = SettingsUtils.removeEmptyEntries(packageRoots);
+ String[] packageRoots =
SettingsUtils.removeEmptyEntries(PropertiesUtil.toStringArray(config.get(PACKAGE_ROOTS),
null));
+ String tempFsFolder =
SettingsUtils.removeEmptyEntry(PropertiesUtil.toString(config.get(TEMP_FS_FOLDER),
null));
+ String tempJcrFolder =
SettingsUtils.removeEmptyEntry(PropertiesUtil.toString(config.get(TEMP_JCR_FOLDER),
null));
ImportMode importMode = null;
- if (importModeString != null && importModeString.trim().length() > 0) {
+ if (importModeString != null) {
importMode = ImportMode.valueOf(importModeString.trim());
}
AccessControlHandling aclHandling = null;
- if (aclHandlingString != null && aclHandlingString.trim().length() >
0) {
+ if (aclHandlingString != null) {
aclHandling=
AccessControlHandling.valueOf(aclHandlingString.trim());
}
+
if ("filevlt".equals(type)) {
packageBuilder = new ResourceSharedDistributionPackageBuilder(new
FileVaultDistributionPackageBuilder(name, packaging, importMode, aclHandling,
packageRoots, tempFsFolder));
} else {
Modified: sling/trunk/contrib/extensions/distribution/it/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/it/pom.xml?rev=1685733&r1=1685732&r2=1685733&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/it/pom.xml (original)
+++ sling/trunk/contrib/extensions/distribution/it/pom.xml Tue Jun 16 08:38:35
2015
@@ -407,7 +407,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.distribution.core</artifactId>
- <version>0.1.3-SNAPSHOT</version>
+ <version>0.1.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
