Allow json property setters to switch mid-read

SeleniumHQ · Apr 2, 2019 · 0a59fc1 · 0a59fc1
1 parent 49fb9d0
commit 0a59fc1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/java/client/src/org/openqa/selenium/json/JsonInput.java b/java/client/src/org/openqa/selenium/json/JsonInput.java
@@ -46,12 +46,15 @@ public class JsonInput implements Closeable {
     this.setter = Objects.requireNonNull(setter);
   }
 
-  public JsonInput propertySetting(PropertySetting setter) {
-    if (readPerformed) {
-      throw new JsonException("JsonInput has already been used and may not be modified");
-    }
+  /**
+   * Change how property setting is done. It's polite to set the value back once done processing.
+   * @param setter The new {@link PropertySetting} to use.
+   * @return The previous {@link PropertySetting} that has just been replaced.
+   */
+  public PropertySetting propertySetting(PropertySetting setter) {
+    PropertySetting previous = this.setter;
     this.setter = Objects.requireNonNull(setter);
-    return this;
+    return previous;
   }
 
   public JsonInput addCoercers(TypeCoercer<?>... coercers) {

diff --git a/java/server/src/org/openqa/grid/common/GridConfiguredJson.java b/java/server/src/org/openqa/grid/common/GridConfiguredJson.java
@@ -50,10 +50,12 @@ public static <T> T toType(String json, Type typeOfT) {
   }
 
   public static <T> T toType(JsonInput jsonInput, Type typeOfT) {
-    return jsonInput
-        .propertySetting(PropertySetting.BY_FIELD)
+    PropertySetting previous = jsonInput.propertySetting(PropertySetting.BY_FIELD);
+    T value = jsonInput
         .addCoercers(new CapabilityMatcherCoercer(), new PrioritizerCoercer())
         .read(typeOfT);
+    jsonInput.propertySetting(previous);
+    return value;
   }
 
   private static class SimpleClassNameCoercer<T> extends TypeCoercer<T> {