Skip to content

Commit e417fe4

Browse files
committed
Merge pull request #31 from komamitsu/write_uuid_url_uri
Fix failure writing UUID, URL and URI
2 parents eac74b4 + 0fb374d commit e417fe4

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

jr-objects/src/main/java/com/fasterxml/jackson/jr/ob/impl/JSONWriter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,8 @@ public void writeField(String fieldName, Object value) throws IOException, JsonP
251251
case SER_UUID:
252252
case SER_URL:
253253
case SER_URI:
254-
writeStringLikeValue(value.toString(), type);
254+
writeStringLikeField(fieldName, value.toString(), type);
255+
return;
255256

256257
// Others
257258

jr-objects/src/test/java/com/fasterxml/jackson/jr/ob/WriteSimpleTest.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.io.File;
44
import java.net.URI;
5+
import java.net.URL;
56
import java.util.*;
67

78
import com.fasterxml.jackson.jr.ob.JSON;
@@ -45,8 +46,12 @@ public void testSimpleMap() throws Exception
4546
stuff.put("a", 15);
4647
stuff.put("b", Boolean.TRUE);
4748
stuff.put("c", "foobar");
48-
49-
assertEquals("{\"a\":15,\"b\":true,\"c\":\"foobar\"}",
49+
stuff.put("d", UUID.fromString("8f88e079-7dc6-46f8-abfb-a533130f4ea0"));
50+
stuff.put("e", new URL("https://github.com/FasterXML/jackson-jr?a=x&b=y"));
51+
stuff.put("f", URI.create("https://github.com/FasterXML/jackson-jr?c=x&c=y"));
52+
53+
assertEquals("{\"a\":15,\"b\":true,\"c\":\"foobar\",\"d\":\"8f88e079-7dc6-46f8-abfb-a533130f4ea0\"," +
54+
"\"e\":\"https://github.com/FasterXML/jackson-jr?a=x&b=y\",\"f\":\"https://github.com/FasterXML/jackson-jr?c=x&c=y\"}",
5055
JSON.std.asString(stuff));
5156
}
5257

0 commit comments

Comments
 (0)