[java] Refactor code to use StringBuilder instead of StringBuffer

asolntsev · web-flow · commit c67d0f1dfc49 · 2022-09-07T11:18:45.000+05:30
diff --git a/java/src/com/thoughtworks/selenium/DefaultRemoteCommand.java b/java/src/com/thoughtworks/selenium/DefaultRemoteCommand.java
@@ -52,12 +52,12 @@ public DefaultRemoteCommand(String command, String[] args) {
 
   @Override
   public String getCommandURLString() {
-    StringBuffer sb = new StringBuffer("cmd=");
+    StringBuilder sb = new StringBuilder("cmd=");
     sb.append(Urls.urlEncode(command));
     if (args == null) return sb.toString();
     for (int i = 0; i < args.length; i++) {
       sb.append('&');
-      sb.append(Integer.toString(i + 1));
+      sb.append(i + 1);
       sb.append('=');
       sb.append(Urls.urlEncode(args[i]));
     }
diff --git a/java/src/com/thoughtworks/selenium/HttpCommandProcessor.java b/java/src/com/thoughtworks/selenium/HttpCommandProcessor.java
@@ -46,8 +46,8 @@
 public class HttpCommandProcessor implements CommandProcessor {
 
   private String pathToServlet;
-  private String browserStartCommand;
-  private String browserURL;
+  private final String browserStartCommand;
+  private final String browserURL;
   private String sessionId;
   private String extensionJs;
   private String rcServerLocation;
@@ -65,8 +65,7 @@ public class HttpCommandProcessor implements CommandProcessor {
    */
   public HttpCommandProcessor(String serverHost, int serverPort, String browserStartCommand,
       String browserURL) {
-    rcServerLocation = serverHost +
-        ":" + Integer.toString(serverPort);
+    rcServerLocation = serverHost + ":" + serverPort;
     this.pathToServlet = "http://" + rcServerLocation + "/selenium-server/driver/";
     this.browserStartCommand = browserStartCommand;
     this.browserURL = browserURL;
@@ -131,7 +130,7 @@ public String executeCommandOnServlet(String command) {
   }
 
   private String stringContentsOfInputStream(Reader rdr) throws IOException {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     int c;
     try {
       while ((c = rdr.read()) != -1) {
@@ -219,7 +218,7 @@ protected void closeResources(HttpURLConnection conn, Writer wr, Reader rdr) {
   }
 
   private String buildCommandBody(String command) {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     sb.append(command);
     if (sessionId != null) {
       sb.append("&sessionId=");
@@ -307,13 +306,13 @@ public String[] getStringArray(String commandName, String[] args) {
    */
   public static String[] parseCSV(String input) {
     List<String> output = new ArrayList<>();
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     for (int i = 0; i < input.length(); i++) {
       char c = input.charAt(i);
       switch (c) {
         case ',':
           output.add(sb.toString());
-          sb = new StringBuffer();
+          sb = new StringBuilder();
           continue;
         case '\\':
           i++;
@@ -324,7 +323,7 @@ public static String[] parseCSV(String input) {
       }
     }
     output.add(sb.toString());
-    return output.toArray(new String[output.size()]);
+    return output.toArray(new String[0]);
   }
 
   @Override
@@ -338,7 +337,7 @@ public Number getNumber(String commandName, String[] args) {
     }
     if (n instanceof Long && n.intValue() == n.longValue()) {
       // SRC-315 we should return Integers if possible
-      return Integer.valueOf(n.intValue());
+      return n.intValue();
     }
     return n;
   }
diff --git a/java/src/com/thoughtworks/selenium/SeleneseTestBase.java b/java/src/com/thoughtworks/selenium/SeleneseTestBase.java
@@ -49,7 +49,7 @@ public class SeleneseTestBase {
   /** Use this object to run all of your selenium tests */
   protected Selenium selenium;
 
-  protected StringBuffer verificationErrors = new StringBuffer();
+  protected StringBuilder verificationErrors = new StringBuilder();
 
   public SeleneseTestBase() {
     super();
@@ -184,7 +184,7 @@ public void verifyEquals(Object expected, Object actual) {
    */
   public void verifyEquals(boolean expected, boolean actual) {
     try {
-      assertEquals(Boolean.valueOf(expected), Boolean.valueOf(actual));
+      assertEquals(expected, actual);
     } catch (Error e) {
       verificationErrors.append(throwableToString(e));
     }
@@ -346,10 +346,7 @@ public void verifyEquals(String[] expected, String[] actual) {
   }
 
   private static String verifyEqualsAndReturnComparisonDumpIfNot(String[] expected, String[] actual) {
-    boolean misMatch = false;
-    if (expected.length != actual.length) {
-      misMatch = true;
-    }
+    boolean misMatch = expected.length != actual.length;
     for (int j = 0; j < expected.length; j++) {
       if (!seleniumEquals(expected[j], actual[j])) {
         misMatch = true;
@@ -364,9 +361,9 @@ private static String verifyEqualsAndReturnComparisonDumpIfNot(String[] expected
   }
 
   private static String stringArrayToString(String[] sa) {
-    StringBuffer sb = new StringBuffer("{");
-    for (int j = 0; j < sa.length; j++) {
-      sb.append(" ").append("\"").append(sa[j]).append("\"");
+    StringBuilder sb = new StringBuilder("{");
+    for (String s : sa) {
+      sb.append(" ").append("\"").append(s).append("\"");
     }
     sb.append(" }");
     return sb.toString();
@@ -380,7 +377,7 @@ private static String throwableToString(Throwable t) {
   }
 
   public static String join(String[] sa, char c) {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     for (int j = 0; j < sa.length; j++) {
       sb.append(sa[j]);
       if (j < sa.length - 1) {
@@ -477,7 +474,7 @@ public void checkForVerificationErrors() {
 
   /** Clears out the list of verification errors */
   public void clearVerificationErrors() {
-    verificationErrors = new StringBuffer();
+    verificationErrors = new StringBuilder();
   }
 
   /** checks for verification errors and stops the browser
diff --git a/java/test/org/openqa/selenium/support/events/EventFiringDecoratorTest.java b/java/test/org/openqa/selenium/support/events/EventFiringDecoratorTest.java
@@ -47,7 +47,7 @@ public class EventFiringDecoratorTest {
 
   static class CollectorListener implements WebDriverListener {
 
-    StringBuffer acc = new StringBuffer();
+    protected final StringBuilder acc = new StringBuilder();
 
     @Override
     public void beforeAnyCall(Object target, Method method, Object[] args) {
