eliminate code warnings, make use of java 17 syntax

Author: stefanseifert

conga-sling-plugin/src/main/java/io/wcm/devops/conga/plugins/sling/util/JsonOsgiConfigUtil.java

@@ -87,8 +87,7 @@ private static Map<String, Object> convertListsToArrays(Map<String, Object> map)
     for (Map.Entry<String, Object> entry : map.entrySet()) {
       String key = entry.getKey();
       Object value = entry.getValue();
-      if (value instanceof Collection) {
-        Collection<?> collection = ((Collection)value);
+      if (value instanceof Collection<?> collection) {
         value = collection.toArray((Object[])Array.newInstance(detectArrayType(collection), collection.size()));
       }
       else if (value instanceof Map) {

conga-sling-plugin/src/test/java/io/wcm/devops/conga/plugins/sling/postprocessor/ProvisioningOsgiConfigPostProcessorTest.java

@@ -85,8 +85,10 @@ void testProvisioningExample() throws Exception {
 
     // validate repoinit statements
     config = readConfig("org.apache.sling.jcr.repoinit.RepositoryInitializer-test.cfg.json");
-    assertArrayEquals(new String[] {"create path /repoinit/test1\n" +
-        "create path /repoinit/test2\n" }, (String[])config.get("scripts"));
+    assertArrayEquals(new String[] { """
+        create path /repoinit/test1
+        create path /repoinit/test2
+        """ }, (String[])config.get("scripts"));
 
     config = readConfig("mode1/org.apache.sling.jcr.repoinit.RepositoryInitializer-test-mode1.cfg.json");
     assertArrayEquals(new String[] { "create service user mode1\n" }, (String[])config.get("scripts"));
@@ -97,11 +99,13 @@ void testProvisioningExample() throws Exception {
 
   @Test
   void testSimpleConfig() throws Exception {
-    final String PROVISIONING_FILE = "[feature name=test]\n" +
-        "[configurations]\n" +
-        "com.example.ServiceConfiguration\n"
-        + "  bar=\"bar\""
-        + "  foo=\"foo\"";
+    final String PROVISIONING_FILE = """
+        [feature name=test]
+        [configurations]
+        com.example.ServiceConfiguration
+          bar="bar"
+          foo="foo"
+        """;
 
     // post process provisioning example
     File provisioningFile = new File(targetDir, "simpleConfig.txt");
@@ -116,11 +120,12 @@ void testSimpleConfig() throws Exception {
 
   @Test
   void testSimpleConfigWithNewline() throws Exception {
-    final String PROVISIONING_FILE = "[feature name=test]\n" +
-        "[configurations]\n" +
-        "com.example.ServiceConfiguration\n"
-        + ""
-        + "  foo=\"foo\"";
+    final String PROVISIONING_FILE = """
+        [feature name=test]
+        [configurations]
+        com.example.ServiceConfiguration
+          foo="foo"
+        """;
 
     // post process provisioning example
     File provisioningFile = new File(targetDir, "simpleConfigWithNewline.txt");

conga-sling-plugin/src/test/java/io/wcm/devops/conga/plugins/sling/util/RunModeComparatorTest.java

@@ -25,7 +25,6 @@
 import java.util.List;
 import java.util.SortedSet;
 import java.util.TreeSet;
-import java.util.stream.Collectors;
 
 import org.junit.jupiter.api.Test;
 
@@ -41,7 +40,7 @@ void testCompare() {
   private static List<String> comparedList(String... runmodes) {
     SortedSet<String> set = new TreeSet<>(new RunModeComparator());
     set.addAll(Arrays.asList(runmodes));
-    return set.stream().collect(Collectors.toList());
+    return set.stream().toList();
   }
 
 }