[java] use the ErrorCodec to build the WebDriverException #13580

Author: joerg1985

java/src/org/openqa/selenium/remote/ErrorCodec.java

@@ -85,7 +85,7 @@ public class ErrorCodec {
           new W3CError("unable to capture screen", ScreenshotException.class, 500),
           new W3CError("unable to set cookie", UnableToSetCookieException.class, 500),
           new W3CError("unexpected alert open", UnhandledAlertException.class, 500),
-          new W3CError("unsupported operation", UnsupportedCommandException.class, 404),
+          new W3CError("unsupported operation", UnsupportedCommandException.class, 500),
           new W3CError("unknown command", UnsupportedCommandException.class, 404),
           new W3CError("unknown method", UnsupportedCommandException.class, 405),
           new W3CError("unknown error", WebDriverException.class, 500));

java/src/org/openqa/selenium/remote/codec/w3c/W3CHttpResponseCodec.java

@@ -25,7 +25,6 @@
 import static org.openqa.selenium.json.Json.OBJECT_TYPE;
 import static org.openqa.selenium.remote.http.Contents.string;
 
-import java.lang.reflect.Constructor;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
@@ -99,12 +98,15 @@ public Response decode(HttpResponse encodedResponse) {
         response.setStatus(ErrorCodes.UNHANDLED_ERROR);
         response.setValue(content);
       } else {
-        Map<String, Object> obj = json.toType(content, MAP_TYPE);
+        Map<String, Object> org = json.toType(content, MAP_TYPE);
+        Map<String, Object> obj;
 
-        Object w3cWrappedValue = obj.get("value");
+        Object w3cWrappedValue = org.get("value");
         if (w3cWrappedValue instanceof Map && ((Map<?, ?>) w3cWrappedValue).containsKey("error")) {
           //noinspection unchecked
           obj = (Map<String, Object>) w3cWrappedValue;
+        } else {
+          obj = org;
         }
 
         String message = "An unknown error has occurred";
@@ -133,7 +135,7 @@ public Response decode(HttpResponse encodedResponse) {
           }
           response.setValue(new UnhandledAlertException(message, text));
         } else {
-          response.setValue(createException(error, message));
+          response.setValue(errorCodec.decode(org));
         }
       }
       return response;
@@ -178,15 +180,4 @@ protected Response reconstructValue(Response response) {
     response.setValue(elementConverter.apply(response.getValue()));
     return response;
   }
-
-  private WebDriverException createException(String error, String message) {
-    Class<? extends WebDriverException> clazz = errorCodes.getExceptionType(error);
-
-    try {
-      Constructor<? extends WebDriverException> constructor = clazz.getConstructor(String.class);
-      return constructor.newInstance(message);
-    } catch (ReflectiveOperationException e) {
-      throw new WebDriverException(message);
-    }
-  }
 }

java/test/org/openqa/selenium/remote/codec/w3c/W3CHttpResponseCodecTest.java

@@ -115,7 +115,7 @@ void decodingAnErrorWithoutAStacktraceIsDecodedProperlyForNonCompliantImplementa
     error.put("message", "I like peas");
     error.put("stacktrace", "");
 
-    HttpResponse response = createValidResponse(HTTP_INTERNAL_ERROR, error);
+    HttpResponse response = createValidResponse(HTTP_INTERNAL_ERROR, Map.of("value", error));
 
     Response decoded = new W3CHttpResponseCodec().decode(response);