[commons-configuration] branch master updated: Comparisons with String.indexOf() calls that can be replaced with a call to the String.contains() method.

[ki...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kinow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-configuration.git


The following commit(s) were added to refs/heads/master by this push:
     new 378d7411 Comparisons with String.indexOf() calls that can be replaced with a call to the String.contains() method.
378d7411 is described below

commit 378d741102333b04e9750790d07e8bb5048b1b9d
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Fri Nov 25 22:03:24 2022 +0100

    Comparisons with String.indexOf() calls that can be replaced with a call to the String.contains() method.
---
 .../commons/configuration2/convert/LegacyListDelimiterHandler.java    | 2 +-
 .../apache/commons/configuration2/tree/DefaultConfigurationKey.java   | 2 +-
 .../apache/commons/configuration2/builder/fluent/TestParameters.java  | 2 +-
 .../configuration2/plist/TestXMLPropertyListConfiguration.java        | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.java b/src/main/java/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.java
index 174eba07..7e0fbce0 100644
--- a/src/main/java/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.java
+++ b/src/main/java/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.java
@@ -193,7 +193,7 @@ public class LegacyListDelimiterHandler extends AbstractListDelimiterHandler {
     protected String escapeBackslashs(final Object value, final boolean inList) {
         String strValue = String.valueOf(value);
 
-        if (inList && strValue.indexOf(DOUBLE_ESC) >= 0) {
+        if (inList && strValue.contains(DOUBLE_ESC)) {
             strValue = StringUtils.replace(strValue, DOUBLE_ESC, QUAD_ESC);
         }
 
diff --git a/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationKey.java b/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationKey.java
index 5918f176..52aad028 100644
--- a/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationKey.java
+++ b/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationKey.java
@@ -430,7 +430,7 @@ public class DefaultConfigurationKey {
      * @return the escaped key
      */
     private String escapeDelimiters(final String key) {
-        return getSymbols().getEscapedDelimiter() == null || key.indexOf(getSymbols().getPropertyDelimiter()) < 0 ? key
+        return getSymbols().getEscapedDelimiter() == null || !key.contains(getSymbols().getPropertyDelimiter()) ? key
             : StringUtils.replace(key, getSymbols().getPropertyDelimiter(), getSymbols().getEscapedDelimiter());
     }
 
diff --git a/src/test/java/org/apache/commons/configuration2/builder/fluent/TestParameters.java b/src/test/java/org/apache/commons/configuration2/builder/fluent/TestParameters.java
index 4f295f8b..5630f47e 100644
--- a/src/test/java/org/apache/commons/configuration2/builder/fluent/TestParameters.java
+++ b/src/test/java/org/apache/commons/configuration2/builder/fluent/TestParameters.java
@@ -289,7 +289,7 @@ public class TestParameters {
     public void testProxyObjectMethods() {
         final FileBasedBuilderParameters params = new Parameters().fileBased();
         final String s = params.toString();
-        assertTrue(s.indexOf(FileBasedBuilderParametersImpl.class.getSimpleName()) >= 0);
+        assertTrue(s.contains(FileBasedBuilderParametersImpl.class.getSimpleName()));
         assertNotEquals(0, params.hashCode());
     }
 
diff --git a/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java b/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java
index 1e87e68c..7ce75d1a 100644
--- a/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java
@@ -358,7 +358,7 @@ public class TestXMLPropertyListConfiguration {
     public void testSaveNoEncoding() throws ConfigurationException {
         final StringWriter writer = new StringWriter();
         new FileHandler(config).save(writer);
-        assertTrue(writer.toString().indexOf("<?xml version=\"1.0\"?>") >= 0);
+        assertTrue(writer.toString().contains("<?xml version=\"1.0\"?>"));
     }
 
     /**
@@ -371,7 +371,7 @@ public class TestXMLPropertyListConfiguration {
         handler.setEncoding(encoding);
         final StringWriter writer = new StringWriter();
         handler.save(writer);
-        assertTrue(writer.toString().indexOf("<?xml version=\"1.0\" encoding=\"" + encoding + "\"?>") >= 0);
+        assertTrue(writer.toString().contains("<?xml version=\"1.0\" encoding=\"" + encoding + "\"?>"));
     }
 
     /**