eliminate code warnings, make use of java 17 syntax

Author: stefanseifert

conga-ansible-plugin/src/main/java/io/wcm/devops/conga/plugins/ansible/valueprovider/AnsibleInventoryValueProviderPlugin.java

@@ -25,7 +25,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;
@@ -129,9 +128,9 @@ private InventoryContent getInventoryContent(ValueProviderContext context) {
   private InventoryContent tryReadJsonStyle(String inventoryContent, File file, ValueProviderContext context) {
     try {
       JsonElement root = JsonParser.parseString(inventoryContent);
-      if (root instanceof JsonObject) {
+      if (root instanceof JsonObject jsonObject) {
         ReadContext jsonpathReadContext = JsonPath.parse(inventoryContent);
-        return new InventoryContent(jsonToConfig((JsonObject)root), jsonpathReadContext);
+        return new InventoryContent(jsonToConfig(jsonObject), jsonpathReadContext);
       }
     }
     catch (JsonSyntaxException ex) {
@@ -147,14 +146,13 @@ private Map<String, List<String>> jsonToConfig(JsonObject root) {
     for (Map.Entry<String, JsonElement> entry : root.entrySet()) {
       if (!Strings.CS.equals(entry.getKey(), "_meta")) {
         JsonArray hostNamesArray = null;
-        if (entry.getValue() instanceof JsonArray) {
-          hostNamesArray = (JsonArray)entry.getValue();
+        if (entry.getValue() instanceof JsonArray entryArray) {
+          hostNamesArray = entryArray;
         }
-        else if (entry.getValue() instanceof JsonObject) {
-          JsonObject entryObject = (JsonObject)entry.getValue();
+        else if (entry.getValue() instanceof JsonObject entryObject) {
           JsonElement hostsElement = entryObject.get("hosts");
-          if (hostsElement instanceof JsonArray) {
-            hostNamesArray = (JsonArray)hostsElement;
+          if (hostsElement instanceof JsonArray hostsArray) {
+            hostNamesArray = hostsArray;
           }
         }
 
@@ -185,7 +183,7 @@ private Map<String, List<String>> inventoryToConfig(AnsibleInventory inventory)
     for (AnsibleGroup group : inventory.getGroups()) {
       config.put(group.getName(), group.getHosts().stream()
           .map(AnsibleHost::getName)
-          .collect(Collectors.toList()));
+          .toList());
     }
     return config;
   }

conga-ansible-plugin/src/test/java/io/wcm/devops/conga/plugins/ansible/urlfile/AnsibleVaultUrlFilePluginTest.java

@@ -66,7 +66,7 @@ void testGetFile() throws Exception {
   }
 
   @Test
-  void testInvalidFile() throws Exception {
+  void testInvalidFile() {
     assertThrows(IOException.class, () -> {
       urlFileManager.getFile("ansible-vault:classpath:/vault-sample/nonexisting-file");
     });

conga-ansible-plugin/src/test/java/io/wcm/devops/conga/plugins/ansible/util/FileScriptLoaderTest.java

@@ -29,17 +29,18 @@
 
 class FileScriptLoaderTest {
 
-  private static final String EXPECTED_CONTENT = "[test-group]\n"
-      + "host-01 conga_node=aem-author\n"
-      + "host-02 conga_node=aem-publish\n"
-      + "host-03 conga_node=aem-publish\n"
-      + "\n"
-      + "[aem-author]\n"
-      + "host-01\n"
-      + "\n"
-      + "[aem-publish]\n"
-      + "host-02\n"
-      + "host-03";
+  private static final String EXPECTED_CONTENT = """
+      [test-group]
+      host-01 conga_node=aem-author
+      host-02 conga_node=aem-publish
+      host-03 conga_node=aem-publish
+
+      [aem-author]
+      host-01
+
+      [aem-publish]
+      host-02
+      host-03""";
 
   @Test
   void testFile() throws Exception {

conga-ansible-plugin/src/test/java/it/andreascarpino/ansible/inventory/AnsibleInventoryReaderTest.java

@@ -62,15 +62,17 @@ void testReadSimple() {
 
     for (AnsibleHost h : group.getHosts()) {
       switch (h.getName()) {
-      case "host1":
+        case "host1":
           assertEquals(3, h.getVariables().size());
-        break;
-      case "host2":
+          break;
+        case "host2":
           assertEquals(0, h.getVariables().size());
-        break;
-      case "host3":
+          break;
+        case "host3":
           assertEquals(1, h.getVariables().size());
-        break;
+          break;
+        default:
+          // ignore
       }
     }
 
@@ -146,10 +148,31 @@ void testReadGroupVars() {
 
   @Test
   void testReadAnsibleExample() {
-    final String inventoryText = "[atlanta]\nhost1\nhost2\n\n[raleigh]\nhost2\nhost3\n\n[southeast:children]\n"
-        + "atlanta\nraleigh\n\n[southeast:vars]\nsome_server=foo.southeast.example.com\nhalon_system_timeout=30"
-        + "\nself_destruct_countdown=60\nescape_pods=2\n\n[usa:children]\nsoutheast\nnortheast\nsouthwest\n"
-        + "northwest\n";
+    final String inventoryText = """
+        [atlanta]
+        host1
+        host2
+
+        [raleigh]
+        host2
+        host3
+
+        [southeast:children]
+        atlanta
+        raleigh
+
+        [southeast:vars]
+        some_server=foo.southeast.example.com
+        halon_system_timeout=30
+        nself_destruct_countdown=60
+        escape_pods=2
+
+        [usa:children]
+        southeast
+        northeast
+        southwest
+        northwest
+        """;
 
     AnsibleInventory inventory = AnsibleInventoryReader.read(inventoryText);
 

conga-ansible-plugin/src/test/java/it/andreascarpino/ansible/inventory/AnsibleInventoryWriterTest.java

@@ -63,8 +63,16 @@ void testWriteHostAndGroups() {
 
     String inventoryText = AnsibleInventoryWriter.write(inventory);
 
-    assertEquals(
-        "mail.example.com\n[webservers]\nfoo.example.com\nbar.example.com\n[dbservers]\none.example.com\ntwo.example.com\nthree.example.com\n",
+    assertEquals("""
+        mail.example.com
+        [webservers]
+        foo.example.com
+        bar.example.com
+        [dbservers]
+        one.example.com
+        two.example.com
+        three.example.com
+        """,
         inventoryText);
   }
 

conga-ansible-plugin/src/test/java/net/wedjaa/ansible/vault/ProvisioningInfo.java

@@ -22,10 +22,6 @@ public class ProvisioningInfo {
   String apiClientId;
   String apiPassword;
 
-  public ProvisioningInfo() {
-
-  }
-
   public String getApiUser() {
     return apiUser;
   }

conga-ansible-plugin/src/test/java/net/wedjaa/ansible/vault/crypto/VaultHandlerTest.java

@@ -35,12 +35,14 @@ class VaultHandlerTest {
   private static final String TEST_PASSWORD = "password";
   private static final String TEST_WRONG_PASSWORD = "not_this_one";
   private static final String WRONG_PASS_EX = "HMAC Digest doesn't match - possibly it's the wrong password.";
-  private static final String DECODED_VAULT = "!net.wedjaa.ansible.vault.ProvisioningInfo\n"
-      + "apiClientId: The provisioner ClientId\n"
-      + "apiPassword: The secret password\n"
-      + "apiUser: Secret User\n";
-
-  private final static Logger logger = LoggerFactory.getLogger(VaultHandlerTest.class);
+  private static final String DECODED_VAULT = """
+      !net.wedjaa.ansible.vault.ProvisioningInfo
+      apiClientId: The provisioner ClientId
+      apiPassword: The secret password
+      apiUser: Secret User
+      """;
+
+  private static final Logger logger = LoggerFactory.getLogger(VaultHandlerTest.class);
 
   @Test
   void testByteArrayValidVault() throws Exception {