// Licensed to the Software Freedom Conservancy (SFC) under one
// or more contributor license agreements.  See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership.  The SFC licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License.  You may obtain a copy of the License at
//
//   http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied.  See the License for the
// specific language governing permissions and limitations
// under the License.

package org.openqa.selenium.json;

import com.google.common.reflect.TypeToken;

import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
import java.io.StringWriter;
import java.io.UncheckedIOException;
import java.io.Writer;
import java.lang.reflect.Type;
import java.util.List;
import java.util.Map;

public class Json {
  public static final Type LIST_OF_MAPS_TYPE = new TypeToken<List<Map<String, Object>>>() {}.getType();
  public static final Type MAP_TYPE = new TypeToken<Map<String, Object>>() {}.getType();
  public static final Type OBJECT_TYPE = new TypeToken<Object>() {}.getType();

  private final JsonTypeCoercer fromJson = new JsonTypeCoercer();

  public String toJson(Object toConvert) {
    try (Writer writer = new StringWriter();
        JsonOutput jsonOutput = newOutput(writer)) {
      jsonOutput.write(toConvert);
      return writer.toString();
    } catch (IOException e) {
      throw new JsonException(e);
    }
  }

  public <T> T toType(String source, Type typeOfT) {
    return toType(source, typeOfT, PropertySetting.BY_NAME);
  }

  public <T> T toType(String source, Type typeOfT, PropertySetting setter) {
    if (setter == null) {
      throw new JsonException("Mechanism for setting properties must be set");
    }

    try (StringReader reader = new StringReader(source);
         JsonInput json = newInput(reader)) {
      return fromJson.coerce(json, typeOfT, setter);
    } catch (JsonException e) {
      throw new JsonException("Unable to parse: " + source, e);
    }
  }

  public JsonInput newInput(Reader from) throws UncheckedIOException {
    return new JsonInput(from, fromJson, PropertySetting.BY_NAME);
  }

  public JsonOutput newOutput(Appendable to) throws UncheckedIOException {
    return new JsonOutput(to);
  }
}

@@ -1958,24 +1958,336 @@
 g setter) %7B%0A
+    try (StringReader reader = new StringReader(source)) %7B%0A      return toType(reader, typeOfT, setter);%0A    %7D%0A  %7D%0A%0A  public %3CT%3E T toType(Reader source, Type typeOfT) %7B%0A    return toType(source, typeOfT, PropertySetting.BY_NAME);%0A  %7D%0A%0A  public %3CT%3E T toType(Reader source, Type typeOfT, PropertySetting setter) %7B%0A
     if (sett
@@ -2399,65 +2399,8 @@
 ry (
-StringReader reader = new StringReader(source);%0A         
 Json
@@ -2421,22 +2421,22 @@
 ewInput(
-reader
+source
 )) %7B%0A   
@@ -2489,104 +2489,8 @@
 r);%0A
-    %7D catch (JsonException e) %7B%0A      throw new JsonException(%22Unable to parse: %22 + source, e);%0A
     

Allow a Reader to be used for parsing JSON