Skip to content

Commit 6c0568f

Browse files
committed
eliminate blank cloud manager target values
1 parent 080fdff commit 6c0568f

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

  • tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/model

tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/model/ModelParser.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import java.util.List;
3333
import java.util.Map;
3434
import java.util.Set;
35+
import java.util.stream.Collectors;
3536

3637
import org.apache.commons.lang3.CharEncoding;
3738
import org.apache.commons.lang3.StringUtils;
@@ -103,10 +104,15 @@ public Set<String> getCloudManagerTarget(File nodeDir) {
103104
Object targetValue = MapExpander.getDeep(config, "cloudManager.target");
104105
if (targetValue != null) {
105106
if (targetValue instanceof String) {
106-
targets.add((String)targetValue);
107+
String target = (String)targetValue;
108+
if (!StringUtils.isBlank(target)) {
109+
targets.add(target);
110+
}
107111
}
108112
else if (targetValue instanceof List) {
109-
targets.addAll((List<String>)targetValue);
113+
targets.addAll(((List<String>)targetValue).stream()
114+
.filter(target -> !StringUtils.isBlank(target))
115+
.collect(Collectors.toList()));
110116
}
111117
else {
112118
throw new RuntimeException("Invalid cloudManager.target value: " + targetValue);

0 commit comments

Comments
 (0)