Find, fix #24

Author: cowtowncoder

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

@@ -663,13 +663,17 @@ public JSONComposer<OutputStream> composeTo(File f) throws IOException, JSONObje
     @SuppressWarnings("resource")
     public JSONComposer<String> composeString() throws IOException, JSONObjectException {
         SegmentedStringWriter out = new SegmentedStringWriter(_jsonFactory._getBufferRecycler());
-        return JSONComposer.stringComposer(_features, _jsonFactory.createGenerator(out), out);
+        JsonGenerator gen = _jsonFactory.createGenerator(out)
+                .setCodec(asCodec());
+        return JSONComposer.stringComposer(_features, gen, out);
     }
 
     @SuppressWarnings("resource")
     public JSONComposer<byte[]> composeBytes() throws IOException, JSONObjectException {
         ByteArrayBuilder out = new ByteArrayBuilder(_jsonFactory._getBufferRecycler());
-        return JSONComposer.bytesComposer(_features, _jsonFactory.createGenerator(out), out);
+        JsonGenerator gen = _jsonFactory.createGenerator(out)
+                .setCodec(asCodec());
+        return JSONComposer.bytesComposer(_features, gen, out);
     }
 
     public CollectionComposer<?,List<Object>> composeList() {

jr-objects/src/main/java/com/fasterxml/jackson/jr/ob/comp/CollectionComposer.java

@@ -143,7 +143,7 @@ public CollectionComposer<PARENT,C> add(boolean value)
     /**
      * Method used to add Java Object ("POJO") into sequence being
      * composed: this <b>requires</b> that the underlying {@link JsonGenerator}
-     * has a properly configure {@link com.fasterxml.jackson.core.ObjectCodec}
+     * has a properly configured {@link com.fasterxml.jackson.core.ObjectCodec}
      * to use for serializer object.
      */
     public CollectionComposer<PARENT,C> addObject(Object pojo)

jr-objects/src/main/java/com/fasterxml/jackson/jr/ob/comp/ObjectComposer.java

@@ -118,6 +118,21 @@ public ObjectComposer<PARENT> putNull(String fieldName)
         return this;
     }
 
+    /**
+     * Method used to put a Java Object ("POJO") value into Object being
+     * composed: this <b>requires</b> that the underlying {@link JsonGenerator}
+     * has a properly configured {@link com.fasterxml.jackson.core.ObjectCodec}
+     * to use for serializer object.
+     * 
+     * @since 2.6
+     */
+    public ObjectComposer<PARENT> putObject(String fieldName, Object value)
+        throws IOException, JsonProcessingException
+    {
+        _generator.writeObjectField(fieldName, value);
+        return this;
+    }
+
     public ObjectComposer<PARENT> put(String fieldName, int value)
         throws IOException, JsonProcessingException
     {

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

@@ -50,6 +50,10 @@ public void testSimpleMap() throws Exception
         assertEquals(3, ((Map<?,?>) ob).size());
         // actually, verify with write...
         assertEquals(INPUT, JSON.std.asString(ob));
+
+        // or, via explicit Map read
+        Map<String,Object> stuff = JSON.std.mapFrom(INPUT);
+        assertEquals(3, stuff.size());
     }
 
     public void testSimpleMixed() throws Exception

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

@@ -6,6 +6,17 @@
 
 public class SimpleComposerTest extends TestBase
 {
+    public static class NameBean {
+        String first;
+
+        public NameBean(String f) {
+            first = f;
+        }
+        
+        public String getFirst() { return first; }
+        public void setFirst(String s) { first = s; }
+    }
+
     public void testSimpleNonNestedObject() throws Exception
     {
         String json = JSON.std.composeString()
@@ -104,4 +115,17 @@ public void testListComposer() throws Exception
                 .finish();
         assertEquals("[-3,{\"a\":1,\"b\":2}]", JSON.std.asString(list));
     }
+
+    public void testComposerWithPojo() throws Exception
+    {
+        String json = JSON.std.composeString()
+                .startArray()
+                    .addObject(new NameBean("Bob"))
+                    .startObject()
+                        .putObject("name", new NameBean("Bill"))
+                    .end()
+                .end()
+                .finish();
+        assertEquals(aposToQuotes("[{'first':'Bob'},{'name':{'first':'Bill'}}]"), json);
+    }
 }

release-notes/VERSION

@@ -6,6 +6,7 @@ Project: jackson-jr
 
 2.6.0 (not yet released)
 
+#24: String/byte[] composers can not write POJOs (ObjectCodec not linked)
 - Minor performance optimizations, using new jackson-core 2.6 methods
 
 2.5.3 (24-Apr-2015)