8287497: Use String.contains() instead of String.indexOf() in java.naming

Reviewed-by: aefimov, rriggs, jpai

Author: Andrey Turbanov

src/java.naming/share/classes/com/sun/jndi/ldap/LdapAttribute.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -157,7 +157,7 @@ private void setBaseCtxInfo() {
             // remove any security credentials - otherwise the serialized form
             // would store them in the clear
             for (String key : realEnv.keySet()){
-                if (key.indexOf("security") != -1 ) {
+                if (key.contains("security")) {
 
                     //if we need to remove props, we must do it to a clone
                     //of the environment. cloning is expensive, so we only do

src/java.naming/share/classes/com/sun/jndi/ldap/LdapClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -759,9 +759,9 @@ private boolean isBinaryValued(String attrid,
                                    Hashtable<String, Boolean> binaryAttrs) {
         String id = attrid.toLowerCase(Locale.ENGLISH);
 
-        return ((id.indexOf(";binary") != -1) ||
+        return id.contains(";binary") ||
             defaultBinaryAttrs.containsKey(id) ||
-            ((binaryAttrs != null) && (binaryAttrs.containsKey(id))));
+            ((binaryAttrs != null) && (binaryAttrs.containsKey(id)));
     }
 
     // package entry point; used by Connection

src/java.naming/share/classes/com/sun/jndi/ldap/ext/StartTlsResponseImpl.java

@@ -426,7 +426,7 @@ private boolean verify(String hostname, SSLSession session)
              * hostname verification is not done for anonymous ciphers
              */
             String cipher = session.getCipherSuite();
-            if (cipher != null && (cipher.indexOf("_anon_") != -1)) {
+            if (cipher != null && cipher.contains("_anon_")) {
                 return true;
             }
             throw e;

src/java.naming/share/classes/javax/naming/NameImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -95,7 +95,7 @@ private final int skipSeparator(String name, int i) {
         } else if (isA(name, i, syntaxSeparator2)) {
             i += syntaxSeparator2.length();
         }
-        return (i);
+        return i;
     }
 
     private final int extractComp(String name, int i, int len, Vector<String> comps)
@@ -346,7 +346,7 @@ private final String stringifyComp(String comp) {
         // determine whether there are any separators; if so escape
         // or quote them
         if (syntaxSeparator != null &&
-            comp.indexOf(syntaxSeparator) >= 0) {
+            comp.contains(syntaxSeparator)) {
             if (syntaxBeginQuote1 != null) {
                 beginQuote = syntaxBeginQuote1;
                 endQuote = syntaxEndQuote1;
@@ -357,7 +357,7 @@ private final String stringifyComp(String comp) {
                 escapeSeparator = true;
         }
         if (syntaxSeparator2 != null &&
-            comp.indexOf(syntaxSeparator2) >= 0) {
+            comp.contains(syntaxSeparator2)) {
             if (syntaxBeginQuote1 != null) {
                 if (beginQuote == null) {
                     beginQuote = syntaxBeginQuote1;
@@ -445,7 +445,7 @@ private final String stringifyComp(String comp) {
                 start = false;
             }
         }
-        return (strbuf.toString());
+        return strbuf.toString();
     }
 
     public String toString() {
@@ -469,7 +469,7 @@ public String toString() {
         }
         if (compsAllEmpty && (size >= 1) && (syntaxSeparator != null))
             answer = answer.append(syntaxSeparator);
-        return (answer.toString());
+        return answer.toString();
     }
 
     public boolean equals(Object obj) {
@@ -544,7 +544,7 @@ public int compareTo(NameImpl obj) {
     }
 
     public int size() {
-        return (components.size());
+        return components.size();
     }
 
     public Enumeration<String> getAll() {