Issue #11 - Simplify serialization of raw values by using ObjectMapper#writeValueAsString().

Relates-to: FasterXML/jackson-databind#743

Author: martin-g

src/main/java/de/agilecoders/wicket/jquery/util/Json.java

@@ -1,5 +1,6 @@
 package de.agilecoders.wicket.jquery.util;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -31,6 +32,23 @@ private Json() {
         throw new UnsupportedOperationException();
     }
 
+    /**
+     * Convert a string to a Java value
+     *
+     * @param json Json value to convert.
+     * @param type Expected Java value type.
+     * @param <T>  type of return object
+     * @return casted value of given json object
+     * @throws ParseException to runtime if json node can't be casted to clazz.
+     */
+    public static <T> T fromJson(final String json, final JavaType type) {
+        try {
+            return createObjectMapper().readValue(json, type);
+        } catch (Exception e) {
+            throw new ParseException(e);
+        }
+    }
+
     /**
      * @return a new {@link ObjectMapper} instance which allows single
      *         quotes and unquoted keys by default
@@ -75,23 +93,6 @@ public static <T> T fromJson(final JsonNode json, final Class<T> clazz) {
         }
     }
 
-    /**
-     * Convert a string to a Java value
-     *
-     * @param json Json value to convert.
-     * @param type Expected Java value type.
-     * @param <T>  type of return object
-     * @return casted value of given json object
-     * @throws ParseException to runtime if json node can't be casted to clazz.
-     */
-    public static <T> T fromJson(final String json, final JavaType type) {
-        try {
-            return createObjectMapper().readValue(json, type);
-        } catch (Exception e) {
-            throw new ParseException(e);
-        }
-    }
-
     /**
      * Convert a JsonNode to a Java value
      *
@@ -121,7 +122,11 @@ public static ObjectNode newObject() {
      * @return stringified version of given json object
      */
     public static String stringify(final JsonNode json) {
-        return json != null ? json.toString() : "{}";
+        try {
+            return json != null ? createObjectMapper().writeValueAsString(json) : "{}";
+        } catch (JsonProcessingException jpx) {
+            throw new RuntimeException("A problem occurred while stringifying a JsonNode: " + jpx.getMessage(), jpx);
+        }
     }
 
     /**

src/main/java/de/agilecoders/wicket/jquery/util/serializer/ConfigSerializer.java

@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.util.RawValue;
 import de.agilecoders.wicket.jquery.Config;
 
 import java.io.IOException;
@@ -16,22 +15,6 @@
 public class ConfigSerializer extends JsonSerializer<Config> {
     @Override
     public void serialize(Config value, JsonGenerator jsonGenerator, SerializerProvider provider) throws IOException {
-        jsonGenerator.writeObject(new RV(value.toJsonString()));
-    }
-
-    /**
-     * An extension of com.fasterxml.jackson.databind.util.RawValue that delegates
-     * toString() to the rawValue
-     */
-    private static class RV extends RawValue
-    {
-        public RV(String v) {
-            super(v);
-        }
-
-        @Override
-        public String toString() {
-            return rawValue().toString();
-        }
+        jsonGenerator.writeRawValue(value.toJsonString());
     }
 }

src/main/java/de/agilecoders/wicket/jquery/util/serializer/RawSerializer.java

@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.util.RawValue;
 import de.agilecoders.wicket.jquery.util.Json;
 
 import java.io.IOException;
@@ -16,22 +15,6 @@
 public class RawSerializer extends JsonSerializer<Json.RawValue> {
     @Override
     public void serialize(Json.RawValue value, JsonGenerator jsonGenerator, SerializerProvider provider) throws IOException {
-        jsonGenerator.writeObject(new RV(value.value()));
-    }
-
-    /**
-     * An extension of com.fasterxml.jackson.databind.util.RawValue that delegates
-     * toString() to the rawValue
-     */
-    private static class RV extends RawValue {
-
-        public RV(String v) {
-            super(v);
-        }
-
-        @Override
-        public String toString() {
-            return rawValue().toString();
-        }
+        jsonGenerator.writeRawValue(value.value());
     }
 }