Author: ebourg Date: Thu May 11 07:23:21 2017 New Revision: 1794791 URL: http://svn.apache.org/viewvc?rev=1794791&view=rev Log: Use String.contains() instead of indexOf()
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java tomcat/trunk/java/org/apache/catalina/manager/util/SessionUtils.java tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java tomcat/trunk/java/org/apache/catalina/webresources/FileResource.java tomcat/trunk/java/org/apache/jasper/compiler/JavacErrorDetail.java tomcat/trunk/java/org/apache/jasper/compiler/Validator.java tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/mime/MimeUtility.java tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java tomcat/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java tomcat/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndBasicAuthenticator.java tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1794791&r1=1794790&r2=1794791&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Thu May 11 07:23:21 2017 @@ -6045,8 +6045,7 @@ public class StandardContext extends Con } else return false; } - if ( (urlPattern.startsWith("/")) && - (urlPattern.indexOf("*.") < 0)) { + if (urlPattern.startsWith("/") && !urlPattern.contains("*.")) { checkUnusualURLPattern(urlPattern); return true; } else Modified: tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java?rev=1794791&r1=1794790&r2=1794791&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java (original) +++ tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java Thu May 11 07:23:21 2017 @@ -108,7 +108,7 @@ public class AddDefaultCharsetFilter ext public void setContentType(String ct) { if (ct != null && ct.startsWith("text/")) { - if (ct.indexOf("charset=") < 0) { + if (!ct.contains("charset=")) { super.setContentType(ct + ";charset=" + encoding); } else { super.setContentType(ct); Modified: tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java?rev=1794791&r1=1794790&r2=1794791&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java (original) +++ tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java Thu May 11 07:23:21 2017 @@ -1104,7 +1104,7 @@ public class ExpiresFilter extends Filte if (str == null || searchStr == null) { return false; } - return str.indexOf(searchStr) >= 0; + return str.contains(searchStr); } /** Modified: tomcat/trunk/java/org/apache/catalina/manager/util/SessionUtils.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/util/SessionUtils.java?rev=1794791&r1=1794790&r2=1794791&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/manager/util/SessionUtils.java (original) +++ tomcat/trunk/java/org/apache/catalina/manager/util/SessionUtils.java Thu May 11 07:23:21 2017 @@ -112,7 +112,7 @@ public class SessionUtils { final List<Object> tapestryArray = new ArrayList<>(); for (Enumeration<String> enumeration = in_session.getAttributeNames(); enumeration.hasMoreElements();) { String name = enumeration.nextElement(); - if (name.indexOf("tapestry") > -1 && name.indexOf("engine") > -1 && null != in_session.getAttribute(name)) {//$NON-NLS-1$ //$NON-NLS-2$ + if (name.contains("tapestry") && name.contains("engine") && null != in_session.getAttribute(name)) {//$NON-NLS-1$ //$NON-NLS-2$ tapestryArray.add(in_session.getAttribute(name)); } } Modified: tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=1794791&r1=1794790&r2=1794791&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java (original) +++ tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java Thu May 11 07:23:21 2017 @@ -1467,9 +1467,9 @@ public final class CGIServlet extends Ht log.debug("envp: [" + env + "], command: [" + command + "]"); } - if ((command.indexOf(File.separator + "." + File.separator) >= 0) - || (command.indexOf(File.separator + "..") >= 0) - || (command.indexOf(".." + File.separator) >= 0)) { + if ((command.contains(File.separator + "." + File.separator)) + || (command.contains(File.separator + "..")) + || (command.contains(".." + File.separator))) { throw new IOException(this.getClass().getName() + "Illegal Character in CGI command " + "path ('.' or '..') detected. Not " Modified: tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java?rev=1794791&r1=1794790&r2=1794791&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java (original) +++ tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java Thu May 11 07:23:21 2017 @@ -1287,7 +1287,7 @@ public class WebdavServlet tokenList = toRenew.tokens.elements(); while (tokenList.hasMoreElements()) { String token = tokenList.nextElement(); - if (ifHeader.indexOf(token) != -1) { + if (ifHeader.contains(token)) { toRenew.expiresAt = lock.expiresAt; lock = toRenew; } @@ -1305,7 +1305,7 @@ public class WebdavServlet tokenList = toRenew.tokens.elements(); while (tokenList.hasMoreElements()) { String token = tokenList.nextElement(); - if (ifHeader.indexOf(token) != -1) { + if (ifHeader.contains(token)) { toRenew.expiresAt = lock.expiresAt; lock = toRenew; } @@ -1376,7 +1376,7 @@ public class WebdavServlet tokenList = lock.tokens.elements(); while (tokenList.hasMoreElements()) { String token = tokenList.nextElement(); - if (lockTokenHeader.indexOf(token) != -1) { + if (lockTokenHeader.contains(token)) { lock.tokens.removeElement(token); } } @@ -1399,7 +1399,7 @@ public class WebdavServlet tokenList = lock.tokens.elements(); while (tokenList.hasMoreElements()) { String token = tokenList.nextElement(); - if (lockTokenHeader.indexOf(token) != -1) { + if (lockTokenHeader.contains(token)) { lock.tokens.removeElement(token); break; } @@ -1472,7 +1472,7 @@ public class WebdavServlet boolean tokenMatch = false; while (tokenList.hasMoreElements()) { String token = tokenList.nextElement(); - if (ifHeader.indexOf(token) != -1) { + if (ifHeader.contains(token)) { tokenMatch = true; break; } @@ -1495,7 +1495,7 @@ public class WebdavServlet boolean tokenMatch = false; while (tokenList.hasMoreElements()) { String token = tokenList.nextElement(); - if (ifHeader.indexOf(token) != -1) { + if (ifHeader.contains(token)) { tokenMatch = true; break; } Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java?rev=1794791&r1=1794790&r2=1794791&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java (original) +++ tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java Thu May 11 07:23:21 2017 @@ -388,7 +388,7 @@ public class SSIServletExternalResolver throw new IOException("A non-virtual path can't be absolute: " + nonVirtualPath); } - if (nonVirtualPath.indexOf("../") >= 0) { + if (nonVirtualPath.contains("../")) { throw new IOException("A non-virtual path can't contain '../' : " + nonVirtualPath); } Modified: tomcat/trunk/java/org/apache/catalina/webresources/FileResource.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/FileResource.java?rev=1794791&r1=1794790&r2=1794791&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/webresources/FileResource.java (original) +++ tomcat/trunk/java/org/apache/catalina/webresources/FileResource.java Thu May 11 07:23:21 2017 @@ -47,7 +47,7 @@ public class FileResource extends Abstra boolean isEBCDIC = false; try { String encoding = System.getProperty("file.encoding"); - if (encoding.indexOf("EBCDIC") != -1) { + if (encoding.contains("EBCDIC")) { isEBCDIC = true; } } catch (SecurityException e) { Modified: tomcat/trunk/java/org/apache/jasper/compiler/JavacErrorDetail.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JavacErrorDetail.java?rev=1794791&r1=1794790&r2=1794791&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/compiler/JavacErrorDetail.java (original) +++ tomcat/trunk/java/org/apache/jasper/compiler/JavacErrorDetail.java Thu May 11 07:23:21 2017 @@ -118,7 +118,7 @@ public class JavacErrorDetail { String javaLine = javaLines[javaLineNum-1].trim(); for (int i=jspBeginLineNum-1; i<jspLines.length; i++) { - if (jspLines[i].indexOf(javaLine) != -1) { + if (jspLines[i].contains(javaLine)) { // Update jsp line number jspBeginLineNum = i+1; break; Modified: tomcat/trunk/java/org/apache/jasper/compiler/Validator.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Validator.java?rev=1794791&r1=1794790&r2=1794791&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/compiler/Validator.java (original) +++ tomcat/trunk/java/org/apache/jasper/compiler/Validator.java Thu May 11 07:23:21 2017 @@ -1821,7 +1821,7 @@ class Validator { PageInfo pageInfo = compiler.getPageInfo(); String contentType = pageInfo.getContentType(); - if (contentType == null || contentType.indexOf("charset=") < 0) { + if (contentType == null || !contentType.contains("charset=")) { boolean isXml = page.getRoot().isXmlSyntax(); String defaultType; if (contentType == null) { Modified: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/mime/MimeUtility.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/mime/MimeUtility.java?rev=1794791&r1=1794790&r2=1794791&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/mime/MimeUtility.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/mime/MimeUtility.java Thu May 11 07:23:21 2017 @@ -101,7 +101,7 @@ public final class MimeUtility { public static String decodeText(String text) throws UnsupportedEncodingException { // if the text contains any encoded tokens, those tokens will be marked with "=?". If the // source string doesn't contain that sequent, no decoding is required. - if (text.indexOf(ENCODED_TOKEN_MARKER) < 0) { + if (!text.contains(ENCODED_TOKEN_MARKER)) { return text; } Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java?rev=1794791&r1=1794790&r2=1794791&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java Thu May 11 07:23:21 2017 @@ -706,7 +706,7 @@ public class Registry implements Registr throws Exception { if( type==null ) type="MbeansDescriptorsDigesterSource"; - if( type.indexOf( ".") < 0 ) { + if(!type.contains(".")) { type="org.apache.tomcat.util.modeler.modules." + type; } Modified: tomcat/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java?rev=1794791&r1=1794790&r2=1794791&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java (original) +++ tomcat/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java Thu May 11 07:23:21 2017 @@ -406,7 +406,7 @@ public class TestNonLoginAndBasicAuthent boolean methodFound = false; List<String> authHeaders = respHeaders.get(SERVER_AUTH_HEADER); for (String authHeader : authHeaders) { - if (authHeader.indexOf(NICE_METHOD) > -1) { + if (authHeader.contains(NICE_METHOD)) { methodFound = true; break; } Modified: tomcat/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndBasicAuthenticator.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndBasicAuthenticator.java?rev=1794791&r1=1794790&r2=1794791&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndBasicAuthenticator.java (original) +++ tomcat/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndBasicAuthenticator.java Thu May 11 07:23:21 2017 @@ -401,7 +401,7 @@ public class TestSSOnonLoginAndBasicAuth boolean methodFound = false; List<String> authHeaders = respHeaders.get(SERVER_AUTH_HEADER); for (String authHeader : authHeaders) { - if (authHeader.indexOf(NICE_METHOD) > -1) { + if (authHeader.contains(NICE_METHOD)) { methodFound = true; break; } Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java?rev=1794791&r1=1794790&r2=1794791&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java (original) +++ tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java Thu May 11 07:23:21 2017 @@ -67,9 +67,9 @@ public class TestStandardContextAliases result = ""; } - assertTrue(result.indexOf("00-PASS") > -1); - assertTrue(result.indexOf("01-PASS") > -1); - assertTrue(result.indexOf("02-PASS") > -1); + assertTrue(result.contains("00-PASS")); + assertTrue(result.contains("01-PASS")); + assertTrue(result.contains("02-PASS")); } Modified: tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java?rev=1794791&r1=1794790&r2=1794791&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java (original) +++ tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java Thu May 11 07:23:21 2017 @@ -333,7 +333,7 @@ public class TestVirtualContext extends if (expectedStatus == 200) { String result = res.toString(); - assertTrue(result, result.indexOf(expectedBody) >= 0); + assertTrue(result, result.contains(expectedBody)); } } } Modified: tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java?rev=1794791&r1=1794790&r2=1794791&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java (original) +++ tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java Thu May 11 07:23:21 2017 @@ -199,7 +199,7 @@ public class TestContextConfig extends T if (expectedStatus == HttpServletResponse.SC_OK) { String result = res.toString(); - Assert.assertTrue(result, result.indexOf(expectedBody) > -1); + Assert.assertTrue(result, result.contains(expectedBody)); } } Modified: tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java?rev=1794791&r1=1794790&r2=1794791&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java (original) +++ tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java Thu May 11 07:23:21 2017 @@ -60,7 +60,7 @@ public class TestGroupChannelOptionFlag try { channel.start(Channel.DEFAULT); }catch ( ChannelException x ) { - if ( x.getMessage().indexOf("option flag conflict") >= 0 ) error = true; + if (x.getMessage().contains("option flag conflict")) error = true; } assertTrue(error); } @@ -81,7 +81,7 @@ public class TestGroupChannelOptionFlag try { channel.start(Channel.DEFAULT); }catch ( ChannelException x ) { - if ( x.getMessage().indexOf("option flag conflict") >= 0 ) error = true; + if (x.getMessage().contains("option flag conflict")) error = true; } assertFalse(error); } Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java?rev=1794791&r1=1794790&r2=1794791&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java (original) +++ tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java Thu May 11 07:23:21 2017 @@ -58,7 +58,7 @@ public final class TesterSupport { String keystorePass, String keyPass) { String protocol = tomcat.getConnector().getProtocolHandlerClassName(); - if (protocol.indexOf("Apr") == -1) { + if (!protocol.contains("Apr")) { Connector connector = tomcat.getConnector(); String sslImplementation = System.getProperty("tomcat.test.sslImplementation"); if (sslImplementation != null && !"${test.sslImplementation}".equals(sslImplementation)) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org