Convert static methods on ErrorCodes to member methods.

Author: shs96c

java/client/src/org/openqa/selenium/remote/ErrorCodes.java

@@ -45,14 +45,9 @@
 
 /**
  * Defines common error codes for the wire protocol.
- *
- * @author [email protected] (Jason Leyba)
  */
 public class ErrorCodes {
 
-  // These codes were all pulled from ChromeCommandExecutor and seem all over the place.
-  // TODO(jmleyba): Clean up error codes?
-
   @Beta
   public static final String SUCCESS_STRING = "success";
   public static final int SUCCESS = 0;
@@ -250,11 +245,11 @@ public boolean isMappableError(Throwable thrown) {
     return statusCode != SUCCESS && statusCode != UNHANDLED_ERROR;
   }
 
-  public static String toState(Integer status) {
+  public String toState(Integer status) {
     return statusToState.get(status);
   }
 
-  public static int toStatus(String state) {
+  public int toStatus(String state) {
     Integer status = stateToStatus.get(state);
     return status != null ? status : UNHANDLED_ERROR;
   }

java/client/src/org/openqa/selenium/remote/JsonToBeanConverter.java

@@ -38,6 +38,8 @@
 
 public class JsonToBeanConverter {
 
+  private ErrorCodes errorCodes = new ErrorCodes();
+
   public <T> T convert(Class<T> clazz, Object source) throws JsonException {
     try {
       return convert(clazz, source, 0);
@@ -116,23 +118,23 @@ private <T> T convert(Class<T> clazz, Object source, int depth) {
       if (json.has("error") && ! json.get("error").isJsonNull()) {
         String state = json.get("error").getAsString();
         response.setState(state);
-        response.setStatus(ErrorCodes.toStatus(state));
+        response.setStatus(errorCodes.toStatus(state));
         response.setValue(convert(Object.class, json.get("message")));
       }
       if (json.has("state") && ! json.get("state").isJsonNull()) {
         String state = json.get("state").getAsString();
         response.setState(state);
-        response.setStatus(ErrorCodes.toStatus(state));
+        response.setStatus(errorCodes.toStatus(state));
       }
       if (json.has("status") && ! json.get("status").isJsonNull()) {
         JsonElement status = json.get("status");
         if (status.getAsJsonPrimitive().isString()) {
           String state = status.getAsString();
           response.setState(state);
-          response.setStatus(ErrorCodes.toStatus(state));
+          response.setStatus(errorCodes.toStatus(state));
         } else {
           int intStatus = status.getAsInt();
-          response.setState(ErrorCodes.toState(intStatus));
+          response.setState(errorCodes.toState(intStatus));
           response.setStatus(intStatus);
         }
       }

java/client/test/org/openqa/selenium/remote/JsonToBeanConverterTest.java

@@ -17,23 +17,6 @@
 
 package org.openqa.selenium.remote;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.Cookie;
-import org.openqa.selenium.Platform;
-import org.openqa.selenium.logging.LogType;
-import org.openqa.selenium.logging.LoggingPreferences;
-
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
-
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasEntry;
 import static org.hamcrest.Matchers.instanceOf;
@@ -51,6 +34,23 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+import org.openqa.selenium.Capabilities;
+import org.openqa.selenium.Cookie;
+import org.openqa.selenium.Platform;
+import org.openqa.selenium.logging.LogType;
+import org.openqa.selenium.logging.LoggingPreferences;
+
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+
 @RunWith(JUnit4.class)
 public class JsonToBeanConverterTest {
 
@@ -386,7 +386,7 @@ public void testShouldRecognizeNumericStatus() {
       .convert(Response.class, "{\"status\":0,\"value\":\"cheese\"}");
 
     assertEquals(0, response.getStatus().intValue());
-    assertEquals(ErrorCodes.toState(0), response.getState());
+    assertEquals(new ErrorCodes().toState(0), response.getState());
     @SuppressWarnings("unchecked")
     String value = (String) response.getValue();
     assertEquals("cheese", value);
@@ -398,7 +398,7 @@ public void testShouldRecognizeStringStatus() {
       .convert(Response.class, "{\"status\":\"success\",\"value\":\"cheese\"}");
 
     assertEquals(0, response.getStatus().intValue());
-    assertEquals(ErrorCodes.toState(0), response.getState());
+    assertEquals(new ErrorCodes().toState(0), response.getState());
     @SuppressWarnings("unchecked")
     String value = (String) response.getValue();
     assertEquals("cheese", value);

java/client/test/org/openqa/selenium/remote/http/JsonHttpResponseCodecTest.java

@@ -40,9 +40,6 @@
 import org.openqa.selenium.remote.JsonToBeanConverter;
 import org.openqa.selenium.remote.Response;
 
-/**
- * Tests for {@link JsonHttpResponseCodec}.
- */
 @RunWith(JUnit4.class)
 public class JsonHttpResponseCodecTest {
 
@@ -62,7 +59,7 @@ public void convertsResponses_success() {
         Response.class, new String(converted.getContent(), UTF_8));
 
     assertEquals(response.getStatus(), rebuilt.getStatus());
-    assertEquals(ErrorCodes.toState(response.getStatus()), rebuilt.getState());
+    assertEquals(new ErrorCodes().toState(response.getStatus()), rebuilt.getState());
     assertEquals(response.getSessionId(), rebuilt.getSessionId());
     assertEquals(response.getValue(), rebuilt.getValue());
   }
@@ -81,7 +78,7 @@ public void convertsResponses_failure() {
         Response.class, new String(converted.getContent(), UTF_8));
 
     assertEquals(response.getStatus(), rebuilt.getStatus());
-    assertEquals(ErrorCodes.toState(response.getStatus()), rebuilt.getState());
+    assertEquals(new ErrorCodes().toState(response.getStatus()), rebuilt.getState());
     assertEquals(response.getSessionId(), rebuilt.getSessionId());
     assertEquals(response.getValue(), rebuilt.getValue());
   }