Change indexOf() in favour of contains()

Author: dizzzz

exist-core/src/main/java/org/exist/client/ClientFrame.java

@@ -652,7 +652,7 @@ private synchronized void type(final KeyEvent e) {
                         shell.setCaretPosition(doc.getLength());
                     }
                 }
-                if (e.paramString().indexOf(Messages.getString("ClientFrame.93")) > Constants.STRING_NOT_FOUND) { //$NON-NLS-1$
+                if (e.paramString().contains(Messages.getString("ClientFrame.93"))) { //$NON-NLS-1$
                     if (shell.getCaretPosition() <= commandStart) {
                         e.consume();
                     }

exist-core/src/main/java/org/exist/http/Descriptor.java

@@ -293,7 +293,7 @@ public boolean allowSource(String path) {
                 path = path.replace('\\', '/');
 
                 //does the path match the <allow-source><xquery path=""/></allow-source> path
-                if ((s.equals(path)) || (path.indexOf(s) > -1)) {
+                if ((s.equals(path)) || (path.contains(s))) {
                     //yes, return true
                     return (true);
                 }

exist-core/src/main/java/org/exist/http/filter/GuestFilter.java

@@ -90,7 +90,7 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo
         LOG.info("username [" + username + "]");
         LOG.info("requestURI [" + requestURI + "]");
 
-        if (requestURI.indexOf("/webdav/") >= 0) {
+        if (requestURI.contains("/webdav/")) {
             if (username != null && username.equalsIgnoreCase("guest")) {
                 LOG.info("Permission denied to : " + requestURI);
                 httpServletResponse.sendError(HttpServletResponse.SC_FORBIDDEN);

exist-core/src/main/java/org/exist/http/filter/PathFilter.java

@@ -99,10 +99,10 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo
         LOG.info("queryString = [" + queryString + "]");
         LOG.info("method = [" + httpServletRequest.getMethod() + "]");
 
-        if ((queryString != null && queryString.indexOf("_query=") >= 0) && filterNames.contains(TEST_GET_QUERY)) {
+        if ((queryString != null && queryString.contains("_query=")) && filterNames.contains(TEST_GET_QUERY)) {
             LOG.info(TEST_GET_QUERY + " met");
             conditionMet = true;
-        } else if (requestURI != null && requestURI.indexOf("/rest/") >= 0 && filterNames.contains(TEST_REST)) {
+        } else if (requestURI != null && requestURI.contains("/rest/") && filterNames.contains(TEST_REST)) {
             conditionMet = true;
             LOG.info(TEST_REST + " met");
         } else if (httpServletRequest.getMethod().equalsIgnoreCase("PUT") && filterNames.contains(TEST_PUT)) {

exist-core/src/main/java/org/exist/util/Configuration.java

@@ -1475,10 +1475,10 @@ private void configureValidation( final Optional<Path> dbHome, Document doc, Ele
                 if( uri != null ) { // when uri attribute is filled in
 
                     // Substitute string, creating an uri from a local file
-                    if( uri.indexOf( "${WEBAPP_HOME}" ) != -1 ) {
+                    if(uri.contains("${WEBAPP_HOME}")) {
                         uri = uri.replaceAll( "\\$\\{WEBAPP_HOME\\}", webappHome.toUri().toString() );
                     }
-                    if( uri.indexOf( "${EXIST_HOME}" ) != -1 ) {
+                    if(uri.contains("${EXIST_HOME}")) {
                         uri = uri.replaceAll( "\\$\\{EXIST_HOME\\}", dbHome.toString() );
                     }
 

exist-core/src/main/java/org/exist/xquery/DynamicPIConstructor.java

@@ -119,7 +119,7 @@ public Sequence eval(Sequence contextSequence, Item contextItem) throws XPathExc
                     buf.deleteCharAt(0);
                 contentString = buf.toString();
             }
-            if (contentString.indexOf("?>") != Constants.STRING_NOT_FOUND)
+            if (contentString.contains("?>"))
                 {throw new XPathException(this, ErrorCodes.XQDY0026, contentString + "' is not a valid processing intruction content", contentSeq);}
             final int nodeNo = builder.processingInstruction(nameSeq.getStringValue(), contentString);
             final Sequence result = ((DocumentImpl)builder.getDocument()).getNode(nodeNo);