[java] minimize overhead of regex compilation

joerg1985 · joerg1985 · commit 4162f478ba31 · 2023-07-23T20:40:38.000+02:00
diff --git a/java/src/org/openqa/selenium/By.java b/java/src/org/openqa/selenium/By.java
@@ -22,6 +22,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.regex.Pattern;
+
 import org.openqa.selenium.internal.Require;
 
 /**
@@ -414,6 +416,7 @@ protected final Map<String, Object> toJson() {
   }
 
   private abstract static class PreW3CLocator extends By implements Remotable {
+    private static final Pattern CSS_ESCAPE = Pattern.compile("([\\s'\"\\\\#.:;,!?+<>=~*^$|%&@`{}\\-\\/\\[\\]\\(\\)])");
     private final Parameters remoteParams;
     private final ByCssSelector fallback;
 
@@ -442,7 +445,7 @@ protected final Map<String, Object> toJson() {
     }
 
     private String cssEscape(String using) {
-      using = using.replaceAll("([\\s'\"\\\\#.:;,!?+<>=~*^$|%&@`{}\\-\\/\\[\\]\\(\\)])", "\\\\$1");
+      using = CSS_ESCAPE.matcher(using).replaceAll("\\\\$1");
       if (using.length() > 0 && Character.isDigit(using.charAt(0))) {
         using = "\\" + (30 + Integer.parseInt(using.substring(0, 1))) + " " + using.substring(1);
       }
diff --git a/java/src/org/openqa/selenium/remote/codec/w3c/W3CHttpCommandCodec.java b/java/src/org/openqa/selenium/remote/codec/w3c/W3CHttpCommandCodec.java
@@ -84,6 +84,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.openqa.selenium.InvalidSelectorException;
@@ -99,6 +100,7 @@
 public class W3CHttpCommandCodec extends AbstractHttpCommandCodec {
 
   private static final ConcurrentHashMap<String, String> ATOM_SCRIPTS = new ConcurrentHashMap<>();
+  private static final Pattern CSS_ESCAPE = Pattern.compile("([\\s'\"\\\\#.:;,!?+<>=~*^$|%&@`{}\\-\\/\\[\\]\\(\\)])");
 
   public W3CHttpCommandCodec() {
     String sessionId = "/session/:sessionId";
@@ -376,7 +378,7 @@ private Map<String, String> asElement(Object id) {
   }
 
   private String cssEscape(String using) {
-    using = using.replaceAll("([\\s'\"\\\\#.:;,!?+<>=~*^$|%&@`{}\\-\\/\\[\\]\\(\\)])", "\\\\$1");
+    using = CSS_ESCAPE.matcher(using).replaceAll("\\\\$1");
     if (using.length() > 0 && Character.isDigit(using.charAt(0))) {
       using = "\\" + (30 + Integer.parseInt(using.substring(0, 1))) + " " + using.substring(1);
     }
diff --git a/java/src/org/openqa/selenium/remote/http/jdk/JdkHttpMessages.java b/java/src/org/openqa/selenium/remote/http/jdk/JdkHttpMessages.java
@@ -148,7 +148,12 @@ public URI getRawUri(HttpRequest req) {
         || uri.startsWith("https://")) {
       rawUrl = uri;
     } else {
-      rawUrl = baseUrl.toString().replaceAll("/$", "") + uri;
+      String base = baseUrl.toString();
+      if (base.endsWith("/")) {
+        rawUrl = base.substring(0, base.length() - 1) + uri;
+      } else {
+        rawUrl = base + uri;
+      }
     }
 
     return URI.create(rawUrl);
diff --git a/java/src/org/openqa/selenium/remote/http/netty/NettyMessages.java b/java/src/org/openqa/selenium/remote/http/netty/NettyMessages.java
@@ -138,7 +138,12 @@ private static String getRawUrl(URI baseUrl, String uri) {
     } else if (uri.startsWith("http://") || uri.startsWith("https://")) {
       rawUrl = uri;
     } else {
-      rawUrl = baseUrl.toString().replaceAll("/$", "") + uri;
+      String base = baseUrl.toString();
+      if (base.endsWith("/")) {
+        rawUrl = base.substring(0, base.length() - 1) + uri;
+      } else {
+        rawUrl = base + uri;
+      }
     }
     return rawUrl;
   }

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,12 @@ private static String getRawUrl(URI baseUrl, String uri) {`
`138`	`138`	`} else if (uri.startsWith("http://") \|\| uri.startsWith("https://")) {`
`139`	`139`	`rawUrl = uri;`
`140`	`140`	`} else {`
`141`		`- rawUrl = baseUrl.toString().replaceAll("/$", "") + uri;`
	`141`	`+ String base = baseUrl.toString();`
	`142`	`+ if (base.endsWith("/")) {`
	`143`	`+ rawUrl = base.substring(0, base.length() - 1) + uri;`
	`144`	`+ } else {`
	`145`	`+ rawUrl = base + uri;`
	`146`	`+ }`
`142`	`147`	`}`
`143`	`148`	`return rawUrl;`
`144`	`149`	`}`