Use more efficient char iso single character string to find position in string

dizzzz · dizzzz · commit 19dd7e72d9c6 · 2019-12-30T23:08:37.000+01:00
diff --git a/exist-core/src/main/java/org/exist/client/CollectionXConf.java b/exist-core/src/main/java/org/exist/client/CollectionXConf.java
@@ -373,7 +373,7 @@ private LinkedHashMap<String, String> getCustomNamespaces(Element xconf)
 				final Node a = attrs.item(i);
 				if(a.getNodeName().startsWith("xmlns:"))
 				{
-					final String namespaceLocalName = a.getNodeName().substring(a.getNodeName().indexOf(":")+1); 
+					final String namespaceLocalName = a.getNodeName().substring(a.getNodeName().indexOf(':')+1);
 					namespaces.put(namespaceLocalName, a.getNodeValue());
 				}
 			}
diff --git a/exist-core/src/main/java/org/exist/collections/triggers/CSVExtractingTrigger.java b/exist-core/src/main/java/org/exist/collections/triggers/CSVExtractingTrigger.java
@@ -118,9 +118,9 @@ public void configure(final DBBroker broker, final Txn transaction, final Collec
                 String pathExpr;
                 String attrPredicate = null;
                 if(xpath.contains("[")) {
-                    pathExpr = xpath.substring(0, xpath.indexOf("["));
+                    pathExpr = xpath.substring(0, xpath.indexOf('['));
                     if(xpath.contains("[@")) {
-                        attrPredicate = xpath.substring(xpath.indexOf("[@")+2, xpath.indexOf("]"));
+                        attrPredicate = xpath.substring(xpath.indexOf("[@")+2, xpath.indexOf(']'));
                     }
                 } else {
                     pathExpr = xpath;
diff --git a/exist-core/src/main/java/org/exist/dom/memtree/SAXAdapter.java b/exist-core/src/main/java/org/exist/dom/memtree/SAXAdapter.java
@@ -132,7 +132,7 @@ public void startElement(final String namespaceURI, final String localName, fina
         for (int i = 0; i < atts.getLength(); i++) {
             final String attQName = atts.getQName(i);
             if (attQName.startsWith(XMLConstants.XMLNS_ATTRIBUTE)) {
-                final int idxPrefixSep = attQName.indexOf(":");
+                final int idxPrefixSep = attQName.indexOf(':');
                 final String prefix = idxPrefixSep > -1 ? attQName.substring(idxPrefixSep + 1) : null;
                 final String uri = atts.getValue(i);
                 if (namespaces == null || !namespaces.containsKey(prefix)) {
diff --git a/exist-core/src/main/java/org/exist/http/servlets/XQueryServlet.java b/exist-core/src/main/java/org/exist/http/servlets/XQueryServlet.java
@@ -281,7 +281,7 @@ protected void process(HttpServletRequest request, HttpServletResponse response)
         response.addHeader( "Cache-Control", "no-cache" );
 
         String requestPath = request.getRequestURI();
-        final int p = requestPath.lastIndexOf("/");
+        final int p = requestPath.lastIndexOf('/');
         if(p != Constants.STRING_NOT_FOUND)
             {requestPath = requestPath.substring(0, p);}
         
diff --git a/exist-core/src/main/java/org/exist/security/AbstractUnixStylePermission.java b/exist-core/src/main/java/org/exist/security/AbstractUnixStylePermission.java
@@ -100,27 +100,27 @@ private void setUnixSymbolicMode(final String symbolicMode)
                 switch(c) {
                     case ALL_CHAR:
                         final int newMode = (perm << 6) | (perm << 3) | perm | (sticky ? (STICKY << 9) : 0) | (uidgid ? ((SET_UID | SET_GID) << 9) : 0);
-                        if(clause.indexOf("+") > -1) {
+                        if(clause.indexOf('+') > -1) {
                             setMode(getMode() | newMode);
-                        } else if(clause.indexOf("-") > -1) {
+                        } else if(clause.indexOf('-') > -1) {
                             setMode(getMode() & ~newMode);
-                        } else if(clause.indexOf("=") > -1) {
+                        } else if(clause.indexOf('=') > -1) {
                             setMode(newMode);
                         }
                         break;
 
                     case USER_CHAR:
-                        if(clause.indexOf("+") > -1) {
+                        if(clause.indexOf('+') > -1) {
                             setOwnerMode(getOwnerMode() | perm);
                             if(uidgid) {
                                 setSetUid(true);
                             }
-                        } else if(clause.indexOf("-") > -1) {
+                        } else if(clause.indexOf('-') > -1) {
                             setOwnerMode(getOwnerMode() & ~perm);
                             if(uidgid) {
                                 setSetUid(false);
                             }
-                        } else if(clause.indexOf("=") > -1) {
+                        } else if(clause.indexOf('=') > -1) {
                             setOwnerMode(perm);
                             if(uidgid) {
                                 setSetUid(true);
@@ -129,17 +129,17 @@ private void setUnixSymbolicMode(final String symbolicMode)
                         break;
 
                     case GROUP_CHAR:
-                        if(clause.indexOf("+") > -1) {
+                        if(clause.indexOf('+') > -1) {
                             setGroupMode(getGroupMode() | perm);
                             if(uidgid) {
                                 setSetGid(true);
                             }
-                        } else if(clause.indexOf("-") > -1) {
+                        } else if(clause.indexOf('-') > -1) {
                             setGroupMode(getGroupMode() & ~perm);
                             if(uidgid) {
                                 setSetGid(false);
                             }
-                        } else if(clause.indexOf("=") > -1) {
+                        } else if(clause.indexOf('=') > -1) {
                             setGroupMode(perm);
                             if(uidgid) {
                                 setSetGid(true);
@@ -148,17 +148,17 @@ private void setUnixSymbolicMode(final String symbolicMode)
                         break;
 
                     case OTHER_CHAR:
-                        if(clause.indexOf("+") > -1) {
+                        if(clause.indexOf('+') > -1) {
                             setOtherMode(getOtherMode() | perm);
                             if(sticky) {
                                 setSticky(true);
                             }
-                        } else if(clause.indexOf("-") > -1) {
+                        } else if(clause.indexOf('-') > -1) {
                             setOtherMode(getOtherMode() & ~perm);
                             if(sticky) {
                                 setSticky(false);
                             }
-                        } else if(clause.indexOf("=") > -1) {
+                        } else if(clause.indexOf('=') > -1) {
                             setOtherMode(perm);
                             if(sticky) {
                                 setSticky(true);
diff --git a/exist-core/src/main/java/org/exist/xmlrpc/RpcConnection.java b/exist-core/src/main/java/org/exist/xmlrpc/RpcConnection.java
@@ -3440,7 +3440,7 @@ public boolean copyCollection(final String name, final String namedest) throws P
             final Map<String, Object> hash = (Map<String, Object>) document;
             String docName = (String) hash.get("name");
             //TODO : use dedicated function in XmldbURI
-            if ((p = docName.lastIndexOf("/")) != Constants.STRING_NOT_FOUND) {
+            if ((p = docName.lastIndexOf('/')) != Constants.STRING_NOT_FOUND) {
                 docName = docName.substring(p + 1);
             }
 
diff --git a/exist-core/src/main/java/org/exist/xquery/PIConstructor.java b/exist-core/src/main/java/org/exist/xquery/PIConstructor.java
@@ -44,7 +44,7 @@ public class PIConstructor extends NodeConstructor {
 	public PIConstructor(XQueryContext context, String pi) throws XPathException {
 		super(context);
         //TODO : handle this from the parser -pb
-		int p = pi.indexOf(" ");
+		int p = pi.indexOf(' ');
 		if(p == Constants.STRING_NOT_FOUND) {
             target = pi;
         } else {
diff --git a/exist-core/src/main/java/org/exist/xquery/functions/fn/FnFormatDates.java b/exist-core/src/main/java/org/exist/xquery/functions/fn/FnFormatDates.java
@@ -201,7 +201,7 @@ private String formatDate(String pic, AbstractDateTimeValue dt, final Optional<S
                 sb.append('[');
                 i++;
             } else {
-                final int close = (i < pic.length() ? pic.indexOf("]", i) : -1);
+                final int close = (i < pic.length() ? pic.indexOf(']', i) : -1);
                 if (close == -1) {
                     throw new XPathException(this, ErrorCodes.FOFD1340, "Date format contains a '[' with no matching ']'");
                 }
diff --git a/exist-core/src/main/java/org/exist/xquery/functions/fn/FunId.java b/exist-core/src/main/java/org/exist/xquery/functions/fn/FunId.java
@@ -147,7 +147,7 @@ public Sequence eval(Sequence contextSequence, Item contextItem) throws XPathExc
     			nextId = i.nextItem().getStringValue();
                 if (nextId.length() == 0)
                     {continue;}
-    			if(nextId.indexOf(" ") != Constants.STRING_NOT_FOUND) {
+    			if(nextId.indexOf(' ') != Constants.STRING_NOT_FOUND) {
     				// parse idrefs
     				final StringTokenizer tok = new StringTokenizer(nextId, " ");
     				while(tok.hasMoreTokens()) {
diff --git a/exist-core/src/main/java/org/exist/xquery/functions/request/GetData.java b/exist-core/src/main/java/org/exist/xquery/functions/request/GetData.java
@@ -102,8 +102,8 @@ public Sequence eval(final Sequence[] args, @Nonnull final RequestWrapper reques
                 String contentType = request.getContentType();
                 if (contentType != null) {
                     //strip off any charset encoding info
-                    if (contentType.indexOf(";") > -1) {
-                        contentType = contentType.substring(0, contentType.indexOf(";"));
+                    if (contentType.indexOf(';') > -1) {
+                        contentType = contentType.substring(0, contentType.indexOf(';'));
                     }
 
                     final MimeType mimeType = MimeTable.getInstance().getContentType(contentType);
diff --git a/exist-core/src/main/java/org/exist/xquery/functions/transform/EXistURIResolver.java b/exist-core/src/main/java/org/exist/xquery/functions/transform/EXistURIResolver.java
@@ -127,7 +127,7 @@ public Source resolve(final String href, String base) throws TransformerExceptio
                     if (base.startsWith(XmldbURI.EMBEDDED_SERVER_URI_PREFIX)) {
                         base = base.substring(XmldbURI.EMBEDDED_SERVER_URI_PREFIX.length());
                     }
-                    path = base.substring(0, base.lastIndexOf("/") + 1) + href;
+                    path = base.substring(0, base.lastIndexOf('/') + 1) + href;
                 }
             }
         }
diff --git a/exist-core/src/main/java/org/exist/xquery/functions/util/Eval.java b/exist-core/src/main/java/org/exist/xquery/functions/util/Eval.java
@@ -484,7 +484,7 @@ private Source loadQueryFromURI(final Item expr) throws XPathException, NullPoin
                 // If location is relative (does not contain any / and does
                 // not start with . or .. then the path of the module need to
                 // be added.
-                if (location.indexOf("/") < 0 || location.startsWith(".")) {
+                if (location.indexOf('/') < 0 || location.startsWith(".")) {
                     final XmldbURI moduleLoadPathUri = XmldbURI.xmldbUriFor(context.getModuleLoadPath());
                     locationUri = moduleLoadPathUri.resolveCollectionPath(locationUri);
                 }
diff --git a/exist-core/src/main/java/org/exist/xslt/EXistURIResolver.java b/exist-core/src/main/java/org/exist/xslt/EXistURIResolver.java
@@ -145,7 +145,7 @@ public Source resolve(final String href, String base) throws TransformerExceptio
           if (base.startsWith(XmldbURI.EMBEDDED_SERVER_URI_PREFIX)) {
             base = base.substring(XmldbURI.EMBEDDED_SERVER_URI_PREFIX.length());
           }
-          path = base.substring(0, base.lastIndexOf("/") + 1) + href;
+          path = base.substring(0, base.lastIndexOf('/') + 1) + href;
         }
       }
     }
diff --git a/exist-core/src/main/java/org/exist/xslt/StylesheetResolverAndCompiler.java b/exist-core/src/main/java/org/exist/xslt/StylesheetResolverAndCompiler.java
@@ -68,7 +68,7 @@ public class StylesheetResolverAndCompiler implements Stylesheet {
   public StylesheetResolverAndCompiler(String uri) {
     this.uri = uri;
 
-    final int p = uri.lastIndexOf("/");
+    final int p = uri.lastIndexOf('/');
     if (p != Constants.STRING_NOT_FOUND) {
       base = uri.substring(0, p);
     } else {

Original file line number	Diff line number	Diff line change
`@@ -373,7 +373,7 @@ private LinkedHashMap<String, String> getCustomNamespaces(Element xconf)`
`373`	`373`	`final Node a = attrs.item(i);`
`374`	`374`	`if(a.getNodeName().startsWith("xmlns:"))`
`375`	`375`	`{`
`376`		`- final String namespaceLocalName = a.getNodeName().substring(a.getNodeName().indexOf(":")+1);`
	`376`	`+ final String namespaceLocalName = a.getNodeName().substring(a.getNodeName().indexOf(':')+1);`
`377`	`377`	`namespaces.put(namespaceLocalName, a.getNodeValue());`
`378`	`378`	`}`
`379`	`379`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3440,7 +3440,7 @@ public boolean copyCollection(final String name, final String namedest) throws P`
`3440`	`3440`	`final Map<String, Object> hash = (Map<String, Object>) document;`
`3441`	`3441`	`String docName = (String) hash.get("name");`
`3442`	`3442`	`//TODO : use dedicated function in XmldbURI`
`3443`		`- if ((p = docName.lastIndexOf("/")) != Constants.STRING_NOT_FOUND) {`
	`3443`	`+ if ((p = docName.lastIndexOf('/')) != Constants.STRING_NOT_FOUND) {`
`3444`	`3444`	`docName = docName.substring(p + 1);`
`3445`	`3445`	`}`
`3446`	`3446`
Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ private String formatDate(String pic, AbstractDateTimeValue dt, final Optional<S`
`201`	`201`	`sb.append('[');`
`202`	`202`	`i++;`
`203`	`203`	`} else {`
`204`		`- final int close = (i < pic.length() ? pic.indexOf("]", i) : -1);`
	`204`	`+ final int close = (i < pic.length() ? pic.indexOf(']', i) : -1);`
`205`	`205`	`if (close == -1) {`
`206`	`206`	`throw new XPathException(this, ErrorCodes.FOFD1340, "Date format contains a '[' with no matching ']'");`
`207`	`207`	`}`