Support jsonValue in JsonTreeWriter

gson/src/main/java/com/google/gson/JsonElement.java

@@ -75,6 +75,16 @@ public boolean isJsonNull() {
     return this instanceof JsonNull;
   }
 
+  /**
+   * provides check for verifying if this element represents a raw json value or not.
+   *
+   * @return true if this element is of type {@link JsonValue}, false otherwise.
+   * @since 2.8.7
+   */
+  public boolean isJsonValue() {
+    return this instanceof JsonValue;
+  }
+
   /**
    * convenience method to get this element as a {@link JsonObject}. If the element is of some
    * other type, a {@link IllegalStateException} will result. Hence it is best to use this method
@@ -140,6 +150,23 @@ public JsonNull getAsJsonNull() {
     throw new IllegalStateException("Not a JSON Null: " + this);
   }
 
+  /**
+   * convenience method to get this element as a {@link JsonValue}. If the element is of some
+   * other type, a {@link IllegalStateException} will result. Hence it is best to use this method
+   * after ensuring that this element is of the desired type by calling {@link #isJsonValue()}
+   * first.
+   *
+   * @return get this element as a {@link JsonValue}.
+   * @throws IllegalStateException if the element is of another type.
+   * @since 2.8.7
+   */
+  public JsonValue getAsJsonValue() {
+    if (isJsonValue()) {
+      return (JsonValue) this;
+    }
+    throw new IllegalStateException("Not a JSON Null: " + this);
+  }
+
   /**
    * convenience method to get this element as a boolean value.
    *

gson/src/main/java/com/google/gson/JsonValue.java

@@ -0,0 +1,51 @@
+package com.google.gson;
+
+import com.google.gson.stream.JsonWriter;
+
+/**
+ * A class representing a raw JSON value. This should be used with
+ * {@link JsonWriter#jsonValue(String)} and should not be encoded or escaped further.
+ *
+ * @author Zac Sweers
+ * @since 2.8.7
+ */
+public final class JsonValue extends JsonElement {
+
+  private final String jsonValue;
+
+  public JsonValue(String jsonValue) {
+    this.jsonValue = jsonValue;
+  }
+
+  /**
+   * @return the underlying raw JSON value.
+   */
+  public String getJsonValue() {
+    return jsonValue;
+  }
+
+  /**
+   * Returns the same value as this is immutable.
+   * @since 2.8.7
+   */
+  @Override public JsonElement deepCopy() {
+    return this;
+  }
+
+  @Override public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+
+    JsonValue jsonValue1 = (JsonValue) o;
+
+    return jsonValue.equals(jsonValue1.jsonValue);
+  }
+
+  @Override public int hashCode() {
+    return jsonValue.hashCode();
+  }
+
+  @Override public String toString() {
+    return "JsonValue{" + "jsonValue='" + jsonValue + '\'' + '}';
+  }
+}

gson/src/main/java/com/google/gson/internal/bind/JsonTreeWriter.java

@@ -21,6 +21,7 @@
 import com.google.gson.JsonNull;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonValue;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import java.io.Writer;
@@ -199,6 +200,16 @@ private void put(JsonElement value) {
     return this;
   }
 
+  /**
+   * {@inheritDoc}
+   *
+   * @since 2.8.7
+   */
+  @Override public JsonWriter jsonValue(String value) throws IOException {
+    put(new JsonValue(value));
+    return this;
+  }
+
   @Override public void flush() throws IOException {
   }
 

gson/src/main/java/com/google/gson/internal/bind/TypeAdapters.java

@@ -761,6 +761,8 @@ public void write(JsonWriter out, Locale value) throws IOException {
         }
         out.endObject();
 
+      } else if (value.isJsonValue()) {
+        out.jsonValue(value.getAsJsonValue().getJsonValue());
       } else {
         throw new IllegalArgumentException("Couldn't write " + value.getClass());
       }

gson/src/test/java/com/google/gson/internal/bind/JsonTreeWriterTest.java

@@ -54,6 +54,14 @@ public void testObject() throws IOException {
     assertEquals("{\"A\":1,\"B\":2}", writer.get().toString());
   }
 
+  public void testJsonValue() throws IOException {
+    JsonTreeWriter writer = new JsonTreeWriter();
+    writer.beginObject();
+    writer.name("A").jsonValue("1234");
+    writer.endObject();
+    assertEquals("{\"A\":1234}", writer.get().toString());
+  }
+
   public void testNestedObject() throws IOException {
     JsonTreeWriter writer = new JsonTreeWriter();
     writer.beginObject();