cosmetic: eliminate code warnings

Author: stefanseifert

conga-ansible-plugin/pom.xml

@@ -57,7 +57,7 @@
     <dependency>
       <groupId>io.wcm.devops.conga</groupId>
       <artifactId>io.wcm.devops.conga.generator</artifactId>
-      <version>1.17.4</version>
+      <version>1.17.5-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
 

conga-ansible-plugin/src/it/example/pom.xml

@@ -65,7 +65,7 @@
       <plugin>
         <groupId>io.wcm.devops.conga</groupId>
         <artifactId>conga-maven-plugin</artifactId>
-        <version>1.17.4</version>
+        <version>1.17.5-SNAPSHOT</version>
         <extensions>true</extensions>
         <configuration>
           <valueProvider>

conga-ansible-plugin/src/main/java/io/wcm/devops/conga/plugins/ansible/urlfile/AnsibleVaultUrlFilePlugin.java

@@ -25,6 +25,7 @@
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 
 import io.wcm.devops.conga.generator.spi.UrlFilePlugin;
 import io.wcm.devops.conga.generator.spi.context.UrlFilePluginContext;
@@ -50,7 +51,7 @@ public String getName() {
 
   @Override
   public boolean accepts(String url, UrlFilePluginContext context) {
-    return StringUtils.startsWith(url, PREFIX);
+    return Strings.CS.startsWith(url, PREFIX);
   }
 
   @Override

conga-ansible-plugin/src/main/java/io/wcm/devops/conga/plugins/ansible/util/FileScriptLoader.java

@@ -29,7 +29,7 @@
 import org.apache.commons.exec.ExecuteException;
 import org.apache.commons.exec.PumpStreamHandler;
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 
 import io.wcm.devops.conga.generator.util.FileUtil;
 
@@ -59,7 +59,7 @@ public static String readFileToString(File file) throws IOException {
   }
 
   private static boolean isPythonScript(File file) {
-    return StringUtils.endsWith(file.getName(), ".py");
+    return Strings.CS.endsWith(file.getName(), ".py");
   }
 
   private static String executePyhtonScript(File file) throws IOException {

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

@@ -28,6 +28,7 @@
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
@@ -74,7 +75,7 @@ public Object resolve(String variableName, ValueProviderContext context) {
   }
 
   private Object resolveVariableOrJsonPath(InventoryContent content, String variableName) {
-    if (StringUtils.startsWith(variableName, "$")) {
+    if (Strings.CS.startsWith(variableName, "$")) {
       if (content.getJsonpathReadContext() != null) {
         return content.getJsonpathReadContext().read(variableName, List.class);
       }
@@ -144,7 +145,7 @@ private InventoryContent tryReadJsonStyle(String inventoryContent, File file, Va
   private Map<String, List<String>> jsonToConfig(JsonObject root) {
     Map<String, List<String>> content = new HashMap<>();
     for (Map.Entry<String, JsonElement> entry : root.entrySet()) {
-      if (!StringUtils.equals(entry.getKey(), "_meta")) {
+      if (!Strings.CS.equals(entry.getKey(), "_meta")) {
         JsonArray hostNamesArray = null;
         if (entry.getValue() instanceof JsonArray) {
           hostNamesArray = (JsonArray)entry.getValue();

conga-ansible-plugin/src/main/java/it/andreascarpino/ansible/inventory/type/AnsibleHost.java

@@ -23,7 +23,7 @@
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 
 /**
  * @author Andrea Scarpino
@@ -83,7 +83,7 @@ public void removeVariable(String variableName) {
     Iterator<AnsibleVariable> variableIterator = variables.iterator();
     while (variableIterator.hasNext()) {
       AnsibleVariable v = variableIterator.next();
-      if (StringUtils.equals(v.getName(), variableName)) {
+      if (Strings.CS.equals(v.getName(), variableName)) {
         variableIterator.remove();
       }
     }

conga-ansible-plugin/src/main/java/net/wedjaa/ansible/vault/crypto/decoders/CypherFactory.java

@@ -16,7 +16,7 @@
 //CHECKSTYLE:OFF
 package net.wedjaa.ansible.vault.crypto.decoders;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 
 import net.wedjaa.ansible.vault.crypto.decoders.implementation.CypherAES;
 import net.wedjaa.ansible.vault.crypto.decoders.implementation.CypherAES256;
@@ -29,11 +29,11 @@ private CypherFactory() {
   }
 
   public static CypherInterface getCypher(String cypherName) {
-    if (StringUtils.equals(cypherName, CypherAES.CYPHER_ID)) {
+    if (Strings.CS.equals(cypherName, CypherAES.CYPHER_ID)) {
       return new CypherAES();
     }
 
-    if (StringUtils.equals(cypherName, CypherAES256.CYPHER_ID)) {
+    if (Strings.CS.equals(cypherName, CypherAES256.CYPHER_ID)) {
       return new CypherAES256();
     }
 

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

@@ -24,6 +24,7 @@
 import java.io.File;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.junit.jupiter.api.Test;
 
 class FileScriptLoaderTest {
@@ -53,7 +54,7 @@ void testPythonScript() throws Exception {
   }
 
   private String cleanup(String content) {
-    return StringUtils.remove(StringUtils.trim(content), "\r");
+    return Strings.CS.remove(StringUtils.trim(content), "\r");
   }
 
 }

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

@@ -23,7 +23,7 @@
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -62,7 +62,7 @@ void testByteArrayValidVault_CarriageReturns() throws Exception {
 
     // replace \n with \r\n to simulate new lines on windows file systems
     String encryptedString = new String(encryptedTest, StandardCharsets.UTF_8);
-    encryptedString = StringUtils.replace(encryptedString, "\n", "\r\n");
+    encryptedString = Strings.CS.replace(encryptedString, "\n", "\r\n");
     encryptedTest = encryptedString.getBytes(StandardCharsets.UTF_8);
 
     byte[] decryptedTest = VaultHandler.decrypt(encryptedTest, TEST_PASSWORD);