eliminate code warnings, make use of java 17 syntax

stefanseifert · stefanseifert · commit d9be592ad93c · 2025-09-23T09:47:31.000+02:00
diff --git a/generator/src/main/java/io/wcm/devops/conga/generator/EnvironmentGenerator.java b/generator/src/main/java/io/wcm/devops/conga/generator/EnvironmentGenerator.java
@@ -31,7 +31,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.io.FilenameUtils;
@@ -256,7 +255,7 @@ private void generateNode(Node node) {
           // filter out result files probably deleted by other file definitions
           allFiles = allFiles.stream()
               .filter(generatedFile -> generatedFile.getFileContext().getFile().exists())
-              .collect(Collectors.toList());
+              .toList();
 
           exportNodeRoleData.files(allFiles);
         }
diff --git a/generator/src/main/java/io/wcm/devops/conga/generator/FileGenerator.java b/generator/src/main/java/io/wcm/devops/conga/generator/FileGenerator.java
@@ -510,8 +510,8 @@ private List<FileContext> applyPostProcessor(FileContext fileItem, PostProcessor
 
   private String getPostProcessorFileHeader() {
     Object fileHeader = MapExpander.getDeep(postProcessorContext.getOptions(), POSTPROCESSOR_KEY_FILE_HEADER);
-    if (fileHeader instanceof String) {
-      return (String)fileHeader;
+    if (fileHeader instanceof String fileHeaderString) {
+      return fileHeaderString;
     }
     else {
       return null;
diff --git a/generator/src/main/java/io/wcm/devops/conga/generator/handlebars/HandlebarsKey.java b/generator/src/main/java/io/wcm/devops/conga/generator/handlebars/HandlebarsKey.java
@@ -53,8 +53,8 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    if (obj instanceof HandlebarsKey) {
-      return combinedKey.equals(((HandlebarsKey)obj).combinedKey);
+    if (obj instanceof HandlebarsKey key) {
+      return combinedKey.equals(key.combinedKey);
     }
     return false;
   }
diff --git a/generator/src/main/java/io/wcm/devops/conga/generator/plugins/export/YamlNodeModelExport.java b/generator/src/main/java/io/wcm/devops/conga/generator/plugins/export/YamlNodeModelExport.java
@@ -29,7 +29,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
-import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Strings;
@@ -114,7 +113,7 @@ private void addRole(List<Map<String, Object>> modelList, ExportNodeRoleData rol
           }
           return itemMap;
         })
-        .collect(Collectors.toList()));
+        .toList());
 
     roleMap.put("config", context.getModelExportConfigProcessor().apply(roleData.getConfig()));
 
diff --git a/generator/src/main/java/io/wcm/devops/conga/generator/plugins/fileheader/AbstractFileHeader.java b/generator/src/main/java/io/wcm/devops/conga/generator/plugins/fileheader/AbstractFileHeader.java
@@ -25,7 +25,6 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
-import java.util.stream.Collectors;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -58,7 +57,7 @@ public final Void apply(FileContext file, FileHeaderContext context) {
             .map(this::sanitizeComment)
             .filter(Objects::nonNull)
             .map(line -> StringUtils.defaultString(getCommentLinePrefix()) + line + lineBreak)
-            .collect(Collectors.toList());
+            .toList();
       }
 
       int insertPosition = getInsertPosition(content);
diff --git a/generator/src/main/java/io/wcm/devops/conga/generator/plugins/handlebars/helper/AbstractEachIfHelper.java b/generator/src/main/java/io/wcm/devops/conga/generator/plugins/handlebars/helper/AbstractEachIfHelper.java
@@ -27,7 +27,6 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.function.BiPredicate;
-import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
 import org.apache.commons.lang3.StringUtils;
@@ -84,7 +83,7 @@ private Iterable<Object> filterIterable(Iterable<Object> items, String propertyN
     return StreamSupport.stream(items.spliterator(), false)
         .filter(Objects::nonNull)
         .filter(item -> checkProperty(item, propertyName, options))
-        .collect(Collectors.toList());
+        .toList();
   }
 
   private boolean checkProperty(Object item, String propertyName, Options options) {
diff --git a/generator/src/main/java/io/wcm/devops/conga/generator/plugins/handlebars/helper/ContainsHelper.java b/generator/src/main/java/io/wcm/devops/conga/generator/plugins/handlebars/helper/ContainsHelper.java
@@ -57,8 +57,8 @@ && contains(context, options.param(0))) {
   }
 
   private boolean contains(Object context, Object value) {
-    if (context instanceof Collection) {
-      return ((Collection)context).contains(value);
+    if (context instanceof Collection<?> collection) {
+      return collection.contains(value);
     }
     else if (context.getClass().isArray()) {
       return ArrayUtils.contains((Object[])context, value);
diff --git a/generator/src/main/java/io/wcm/devops/conga/generator/util/AbstractConfigurableObjectTreeProcessor.java b/generator/src/main/java/io/wcm/devops/conga/generator/util/AbstractConfigurableObjectTreeProcessor.java
@@ -55,21 +55,20 @@ protected AbstractConfigurableObjectTreeProcessor(Set<String> ignorePropertyName
    * @param parentPayload Parent payload
    */
   protected void process(Object object, ConfigurableProcessor<T> processor, T parentPayload) {
-    if (object instanceof Map) {
-      for (Object child : ((Map)object).values()) {
+    if (object instanceof Map<?, ?> map) {
+      for (Object child : map.values()) {
         process(child, processor, parentPayload);
       }
       return;
     }
-    if (object instanceof List) {
-      for (Object child : (List)object) {
+    if (object instanceof List<?> list) {
+      for (Object child : list) {
         process(child, processor, parentPayload);
       }
       return;
     }
     T payload;
-    if (object instanceof Configurable) {
-      Configurable configurable = (Configurable)object;
+    if (object instanceof Configurable configurable) {
       payload = processor.process(configurable, parentPayload);
     }
     else {
diff --git a/generator/src/main/java/io/wcm/devops/conga/generator/util/ConfigInheritanceResolver.java b/generator/src/main/java/io/wcm/devops/conga/generator/util/ConfigInheritanceResolver.java
@@ -57,8 +57,8 @@ private ConfigInheritanceResolver(Set<String> ignorePropertyNames) {
    */
   public static void resolve(Object model) {
     Set<String> ignorePropertyNames = Collections.emptySet();
-    if (model instanceof Environment) {
-      resolveEnvironment((Environment)model);
+    if (model instanceof Environment environment) {
+      resolveEnvironment(environment);
     }
     if (model instanceof Role) {
       // do not inherit config of role variants field (WDCONGA-24)
diff --git a/generator/src/main/java/io/wcm/devops/conga/generator/util/EnvironmentExpander.java b/generator/src/main/java/io/wcm/devops/conga/generator/util/EnvironmentExpander.java
@@ -21,7 +21,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.apache.commons.lang3.StringUtils;
@@ -51,7 +50,7 @@ public static Environment expandNodes(Environment environment, String environmen
 
     clonedEnvironemnt.setNodes(environment.getNodes().stream()
         .flatMap(node -> getSingleNodes(node, environmentName))
-        .collect(Collectors.toList()));
+        .toList());
 
     return clonedEnvironemnt;
   }
diff --git a/generator/src/main/java/io/wcm/devops/conga/generator/util/JexlResolver.java b/generator/src/main/java/io/wcm/devops/conga/generator/util/JexlResolver.java
@@ -78,16 +78,16 @@ private Map<String, Object> resolveMapWithoutCycles(Map<String, Object> variable
 
     // split out variables with values containing expressions that are not simple variable references
     SplitResult splitResult = MapSplitter.splitMap(variables, entry -> {
-      if (entry.getValue() instanceof List) {
-        for (Object item : (List)entry.getValue()) {
-          if ((item instanceof String)
-              && hasJexlExpresssions((String)item)) {
+      if (entry.getValue() instanceof List<?> list) {
+        for (Object item : list) {
+          if ((item instanceof String value)
+              && hasJexlExpresssions(value)) {
             return false;
           }
         }
       }
-      else if (entry.getValue() instanceof String) {
-        return !hasJexlExpresssions((String)entry.getValue());
+      else if (entry.getValue() instanceof String value) {
+        return !hasJexlExpresssions(value);
       }
       return true;
     });
diff --git a/generator/src/main/java/io/wcm/devops/conga/generator/util/ModelExportConfigProcessor.java b/generator/src/main/java/io/wcm/devops/conga/generator/util/ModelExportConfigProcessor.java
@@ -93,9 +93,9 @@ private Object encryptSensitiveValue(String parameterName, Object value) {
     if (value instanceof Map) {
       return encryptSensitiveValues((Map<String, Object>)value, parameterName + ".");
     }
-    else if (value instanceof List) {
+    else if (value instanceof List<?> valueList) {
       List<Object> list = new ArrayList<>();
-      for (Object itemValue : (List)value) {
+      for (Object itemValue : valueList) {
         list.add(encryptSensitiveValue(parameterName, itemValue));
       }
       return list;
diff --git a/generator/src/main/java/io/wcm/devops/conga/generator/util/ValueUtil.java b/generator/src/main/java/io/wcm/devops/conga/generator/util/ValueUtil.java
@@ -92,10 +92,10 @@ public static String valueToString(Object value) {
     if (value == null) {
       return "";
     }
-    else if (value instanceof List) {
+    else if (value instanceof List list) {
       StringBuilder sb = new StringBuilder();
-      for (Object item : ((List)value)) {
-        if (sb.length() > 0) {
+      for (Object item : list) {
+        if (!sb.isEmpty()) {
           sb.append(",");
         }
         sb.append(valueToString(item));
@@ -107,7 +107,7 @@ else if (value instanceof Map) {
       // use sorted map to ensure consistent order of keys
       SortedMap<Object, Object> sortedMap = new TreeMap<>((Map<Object, Object>)value);
       for (Map.Entry<Object, Object> entry : sortedMap.entrySet()) {
-        if (sb.length() > 0) {
+        if (!sb.isEmpty()) {
           sb.append(",");
         }
         sb.append(valueToString(entry.getKey()))
diff --git a/generator/src/main/java/io/wcm/devops/conga/generator/util/VariableMapResolver.java b/generator/src/main/java/io/wcm/devops/conga/generator/util/VariableMapResolver.java
@@ -122,8 +122,8 @@ private Map<String, Object> resolve(Map<String, Object> config, boolean deescape
 
   @SuppressWarnings("unchecked")
   private Object replaceAny(Object value, Map<String, Object> variables) {
-    if (value instanceof String) {
-      return replaceObject((String)value, variables);
+    if (value instanceof String stringValue) {
+      return replaceObject(stringValue, variables);
     }
     else if (value instanceof List) {
       return replaceList((List<Object>)value, variables);
@@ -191,13 +191,13 @@ private Map<String, Object> replaceMap(Map<String, Object> map, Map<String, Obje
     }
   }
 
-  @SuppressWarnings("unchecked")
+  @SuppressWarnings({ "unchecked", "java:S6201" })
   private List<Object> replaceIterate(Map<String, Object> map, Map<String, Object> variables) {
     Object listObject = map.get(LIST_VARIABLE_ITERATE);
-    if (listObject instanceof String) {
-      Matcher matcher = SINGLE_EXPRESSION_PATTERN.matcher((String)listObject);
+    if (listObject instanceof String stringValue) {
+      Matcher matcher = SINGLE_EXPRESSION_PATTERN.matcher(stringValue);
       if (matcher.matches()) {
-        listObject = variableStringResolver.resolve((String)listObject, variables);
+        listObject = variableStringResolver.resolve(stringValue, variables);
         if (listObject == null) {
           throw new IllegalArgumentException("Unable to resolve variable: " + matcher.group(0));
         }
@@ -211,17 +211,18 @@ private List<Object> replaceIterate(Map<String, Object> map, Map<String, Object>
     List<Object> result = new ArrayList<>();
     int count = 0;
     for (Object item : (List<Object>)listObject) {
+      count++;
       variablesClone.put(ITEM_VARIABLE, item);
-      variablesClone.put(ITEM_INDEX_VARIABLE, count++);
+      variablesClone.put(ITEM_INDEX_VARIABLE, count);
       result.add(replaceMap(map, variablesClone));
     }
     return result;
   }
 
   @SuppressWarnings("unchecked")
   private Object deescapeAny(Object value) {
-    if (value instanceof String) {
-      return deescapeString((String)value);
+    if (value instanceof String stringValue) {
+      return deescapeString(stringValue);
     }
     else if (value instanceof List) {
       return deescapeList((List<Object>)value);
diff --git a/generator/src/main/java/io/wcm/devops/conga/generator/util/VariableResolver.java b/generator/src/main/java/io/wcm/devops/conga/generator/util/VariableResolver.java
@@ -73,7 +73,7 @@ public Object resolve(String valueProviderName, String variable, String defaultV
         result = valueProvider.resolve(variableWithoutNesting, valueProviderContext);
 
         if (StringUtils.isNotBlank(nestingVariables) && result instanceof Map) {
-          result = MapExpander.getDeep((Map)result, nestingVariables);
+          result = MapExpander.getDeep((Map<String, Object>)result, nestingVariables);
         }
       }
 
diff --git a/generator/src/main/java/io/wcm/devops/conga/generator/util/VariableStringResolver.java b/generator/src/main/java/io/wcm/devops/conga/generator/util/VariableStringResolver.java
@@ -141,8 +141,8 @@ public Object resolve(String value, Map<String, Object> variables, boolean deesc
 
     Object result = resolve(value, variables, 0);
 
-    if (deescapeVariables && (result instanceof String)) {
-      result = deescape((String)result);
+    if (deescapeVariables && (result instanceof String stringValue)) {
+      result = deescape(stringValue);
     }
 
     return result;
@@ -195,9 +195,9 @@ private Object resolveSingle(Matcher matcher, Map<String, Object> variables, int
 
         Object valueObject = variableResolver.resolve(valueProviderName, variable, defaultValueString, variables);
         if (valueObject != null) {
-          if (valueObject instanceof String) {
+          if (valueObject instanceof String stringValue) {
             // try again until all nested references are resolved
-            return resolve((String)valueObject, variables, iterationCount + 1);
+            return resolve(stringValue, variables, iterationCount + 1);
           }
           else {
             return valueObject;
diff --git a/generator/src/test/java/io/wcm/devops/conga/generator/plugins/fileheader/UnixShellScriptFileHeaderTest.java b/generator/src/test/java/io/wcm/devops/conga/generator/plugins/fileheader/UnixShellScriptFileHeaderTest.java
@@ -27,7 +27,6 @@
 import java.util.List;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Strings;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/model/src/main/java/io/wcm/devops/conga/model/role/RoleFile.java b/model/src/main/java/io/wcm/devops/conga/model/role/RoleFile.java
@@ -27,7 +27,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Strings;
@@ -158,7 +157,7 @@ public void setVariants(List<String> variants) {
   public List<RoleFileVariantMetadata> getVariantsMetadata() {
     return this.variants.stream()
         .map(RoleFileVariantMetadata::new)
-        .collect(Collectors.toList());
+        .toList();
   }
 
   /**
diff --git a/model/src/main/java/io/wcm/devops/conga/model/util/MapExpander.java b/model/src/main/java/io/wcm/devops/conga/model/util/MapExpander.java
@@ -115,12 +115,12 @@ private MapExpander() {
     if (object instanceof List) {
       List<Object> expandedList;
       if (object instanceof MergingList) {
-        expandedList = new MergingList<>((MergingList)object);
+        expandedList = new MergingList<>((MergingList<Object>)object);
       }
       else {
         expandedList = new ArrayList<>();
       }
-      for (Object item : (List)object) {
+      for (Object item : (List<Object>)object) {
         expandedList.add(expandDeep(item));
       }
       return expandedList;
diff --git a/model/src/main/java/io/wcm/devops/conga/model/util/MapMerger.java b/model/src/main/java/io/wcm/devops/conga/model/util/MapMerger.java
@@ -108,7 +108,7 @@ else if (v1 != null) {
   }
 
   private static boolean isMergeable(List<Object> list) {
-    return (list instanceof MergingList && ((MergingList)list).hasMergePosition())
+    return (list instanceof MergingList<?> mergingList && mergingList.hasMergePosition())
         || list.contains(LIST_MERGE_ENTRY);
   }
 
@@ -120,7 +120,7 @@ private static boolean isMergeable(List<Object> list) {
   @SuppressWarnings("unchecked")
   private static Object cleanupIfList(Object value) {
     if (value instanceof List) {
-      return mergeList(((List)value), Collections.emptyList());
+      return mergeList(((List<Object>)value), Collections.emptyList());
     }
     else {
       return value;
@@ -133,11 +133,10 @@ private static Object cleanupIfList(Object value) {
    * @param l2 List 2
    * @return Merged list
    */
-  @SuppressWarnings("unchecked")
   private static List<Object> mergeList(List<Object> l1, List<Object> l2) {
     MergingList<Object> mergedList;
     if (l1 instanceof MergingList) {
-      mergedList = new MergingList<>((MergingList)l1);
+      mergedList = new MergingList<>((MergingList<Object>)l1);
     }
     else {
       mergedList = new MergingList<>();
diff --git a/tooling/conga-maven-plugin/src/main/java/io/wcm/devops/conga/tooling/maven/plugin/PackageMojo.java b/tooling/conga-maven-plugin/src/main/java/io/wcm/devops/conga/tooling/maven/plugin/PackageMojo.java
@@ -29,7 +29,6 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -98,7 +97,7 @@ private void buildGeneratedConfigurationAttachments() throws MojoExecutionExcept
     List<File> environmentDirs = Arrays.stream(configRootDir.listFiles())
         .filter(File::isDirectory)
         .filter(dir -> selectedEnvironments == null || selectedEnvironments.contains(dir.getName()))
-        .collect(Collectors.toList());
+        .toList();
 
     MavenProject project = getProject();
     if (artifactPerEnvironment) {
diff --git a/tooling/conga-maven-plugin/src/main/java/io/wcm/devops/conga/tooling/maven/plugin/ValidateMojo.java b/tooling/conga-maven-plugin/src/main/java/io/wcm/devops/conga/tooling/maven/plugin/ValidateMojo.java
diff --git a/tooling/conga-maven-plugin/src/main/java/io/wcm/devops/conga/tooling/maven/plugin/validation/NoValueProviderInRoleValidator.java b/tooling/conga-maven-plugin/src/main/java/io/wcm/devops/conga/tooling/maven/plugin/validation/NoValueProviderInRoleValidator.java

Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,8 @@ public int hashCode() {`
`53`	`53`
`54`	`54`	`@Override`
`55`	`55`	`public boolean equals(Object obj) {`
`56`		`- if (obj instanceof HandlebarsKey) {`
`57`		`- return combinedKey.equals(((HandlebarsKey)obj).combinedKey);`
	`56`	`+ if (obj instanceof HandlebarsKey key) {`
	`57`	`+ return combinedKey.equals(key.combinedKey);`
`58`	`58`	`}`
`59`	`59`	`return false;`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,8 @@ && contains(context, options.param(0))) {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`private boolean contains(Object context, Object value) {`
`60`		`- if (context instanceof Collection) {`
`61`		`- return ((Collection)context).contains(value);`
	`60`	`+ if (context instanceof Collection<?> collection) {`
	`61`	`+ return collection.contains(value);`
`62`	`62`	`}`
`63`	`63`	`else if (context.getClass().isArray()) {`
`64`	`64`	`return ArrayUtils.contains((Object[])context, value);`
Original file line number	Diff line number	Diff line change
`@@ -55,21 +55,20 @@ protected AbstractConfigurableObjectTreeProcessor(Set<String> ignorePropertyName`
`55`	`55`	`* @param parentPayload Parent payload`
`56`	`56`	`*/`
`57`	`57`	`protected void process(Object object, ConfigurableProcessor<T> processor, T parentPayload) {`
`58`		`- if (object instanceof Map) {`
`59`		`- for (Object child : ((Map)object).values()) {`
	`58`	`+ if (object instanceof Map<?, ?> map) {`
	`59`	`+ for (Object child : map.values()) {`
`60`	`60`	`process(child, processor, parentPayload);`
`61`	`61`	`}`
`62`	`62`	`return;`
`63`	`63`	`}`
`64`		`- if (object instanceof List) {`
`65`		`- for (Object child : (List)object) {`
	`64`	`+ if (object instanceof List<?> list) {`
	`65`	`+ for (Object child : list) {`
`66`	`66`	`process(child, processor, parentPayload);`
`67`	`67`	`}`
`68`	`68`	`return;`
`69`	`69`	`}`
`70`	`70`	`T payload;`
`71`		`- if (object instanceof Configurable) {`
`72`		`- Configurable configurable = (Configurable)object;`
	`71`	`+ if (object instanceof Configurable configurable) {`
`73`	`72`	`payload = processor.process(configurable, parentPayload);`
`74`	`73`	`}`
`75`	`74`	`else {`