From 0fb374d4bf5e393be233c840e4d711270bd7483b Mon Sep 17 00:00:00 2001 From: Mitsunori Komatsu Date: Fri, 27 Nov 2015 13:18:07 +0900 Subject: [PATCH] Fix failure writing UUID, URL and URI --- .../com/fasterxml/jackson/jr/ob/impl/JSONWriter.java | 3 ++- .../com/fasterxml/jackson/jr/ob/WriteSimpleTest.java | 9 +++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/jr-objects/src/main/java/com/fasterxml/jackson/jr/ob/impl/JSONWriter.java b/jr-objects/src/main/java/com/fasterxml/jackson/jr/ob/impl/JSONWriter.java index 3a34aaea..853beabf 100644 --- a/jr-objects/src/main/java/com/fasterxml/jackson/jr/ob/impl/JSONWriter.java +++ b/jr-objects/src/main/java/com/fasterxml/jackson/jr/ob/impl/JSONWriter.java @@ -251,7 +251,8 @@ public void writeField(String fieldName, Object value) throws IOException, JsonP case SER_UUID: case SER_URL: case SER_URI: - writeStringLikeValue(value.toString(), type); + writeStringLikeField(fieldName, value.toString(), type); + return; // Others diff --git a/jr-objects/src/test/java/com/fasterxml/jackson/jr/ob/WriteSimpleTest.java b/jr-objects/src/test/java/com/fasterxml/jackson/jr/ob/WriteSimpleTest.java index f8bffd40..7f29c6df 100644 --- a/jr-objects/src/test/java/com/fasterxml/jackson/jr/ob/WriteSimpleTest.java +++ b/jr-objects/src/test/java/com/fasterxml/jackson/jr/ob/WriteSimpleTest.java @@ -2,6 +2,7 @@ import java.io.File; import java.net.URI; +import java.net.URL; import java.util.*; import com.fasterxml.jackson.jr.ob.JSON; @@ -45,8 +46,12 @@ public void testSimpleMap() throws Exception stuff.put("a", 15); stuff.put("b", Boolean.TRUE); stuff.put("c", "foobar"); - - assertEquals("{\"a\":15,\"b\":true,\"c\":\"foobar\"}", + stuff.put("d", UUID.fromString("8f88e079-7dc6-46f8-abfb-a533130f4ea0")); + stuff.put("e", new URL("https://github.com/FasterXML/jackson-jr?a=x&b=y")); + stuff.put("f", URI.create("https://github.com/FasterXML/jackson-jr?c=x&c=y")); + + assertEquals("{\"a\":15,\"b\":true,\"c\":\"foobar\",\"d\":\"8f88e079-7dc6-46f8-abfb-a533130f4ea0\"," + + "\"e\":\"https://github.com/FasterXML/jackson-jr?a=x&b=y\",\"f\":\"https://github.com/FasterXML/jackson-jr?c=x&c=y\"}", JSON.std.asString(stuff)); }