Complete implementation of #301

Author: cowtowncoder

cbor/src/main/java/com/fasterxml/jackson/dataformat/cbor/databind/CBORMapper.java

@@ -1,9 +1,12 @@
 package com.fasterxml.jackson.dataformat.cbor.databind;
 
 import com.fasterxml.jackson.core.Version;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.cfg.MapperBuilder;
+
 import com.fasterxml.jackson.dataformat.cbor.CBORFactory;
+import com.fasterxml.jackson.dataformat.cbor.CBORGenerator;
 import com.fasterxml.jackson.dataformat.cbor.PackageVersion;
 
 /**
@@ -23,8 +26,50 @@ public class CBORMapper extends ObjectMapper
      */
     public static class Builder extends MapperBuilder<CBORMapper, Builder>
     {
+        protected final CBORFactory _streamFactory; // since 2.14
+
         public Builder(CBORMapper m) {
             super(m);
+            _streamFactory = m.getFactory();
+        }
+
+        /*
+        /******************************************************************
+        /* Format features
+        /******************************************************************
+         */
+
+        /**
+         * @since 2.14
+         */
+        public Builder enable(CBORGenerator.Feature... features) {
+            for (CBORGenerator.Feature f : features) {
+                _streamFactory.enable(f);
+            }
+            return this;
+        }
+
+        /**
+         * @since 2.14
+         */
+        public Builder disable(CBORGenerator.Feature... features) {
+            for (CBORGenerator.Feature f : features) {
+                _streamFactory.disable(f);
+            }
+            return this;
+        }
+
+        /**
+         * @since 2.14
+         */
+        public Builder configure(CBORGenerator.Feature f, boolean state)
+        {
+            if (state) {
+                _streamFactory.enable(f);
+            } else {
+                _streamFactory.disable(f);
+            }
+            return this;
         }
     }
 
@@ -46,7 +91,6 @@ protected CBORMapper(CBORMapper src) {
         super(src);
     }
 
-    @SuppressWarnings("unchecked")
     public static CBORMapper.Builder builder() {
         return new Builder(new CBORMapper());
     }

cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/mapper/CBORMapperTest.java

@@ -0,0 +1,36 @@
+package com.fasterxml.jackson.dataformat.cbor.mapper;
+
+import com.fasterxml.jackson.dataformat.cbor.CBORGenerator;
+import com.fasterxml.jackson.dataformat.cbor.CBORTestBase;
+import com.fasterxml.jackson.dataformat.cbor.databind.CBORMapper;
+
+public class CBORMapperTest extends CBORTestBase
+{
+    /*
+    /**********************************************************
+    /* Tests for [dataformats-binary#301]
+    /**********************************************************
+     */
+
+    public void testStreamingFeaturesViaMapper() throws Exception
+    {
+        final Integer SMALL_INT = Integer.valueOf(3);
+        CBORMapper mapperWithMinimalInts = CBORMapper.builder()
+                .enable(CBORGenerator.Feature.WRITE_MINIMAL_INTS)
+                .build();
+        byte[] encodedMinimal = mapperWithMinimalInts.writeValueAsBytes(SMALL_INT);
+        assertEquals(1, encodedMinimal.length);
+
+        CBORMapper mapperFullInts = CBORMapper.builder()
+                .disable(CBORGenerator.Feature.WRITE_MINIMAL_INTS)
+                .build();
+        byte[] encodedNotMinimal = mapperFullInts.writeValueAsBytes(SMALL_INT);
+        assertEquals(5, encodedNotMinimal.length);
+
+        // And then verify we can read it back, either way
+        assertEquals(SMALL_INT, mapperWithMinimalInts.readValue(encodedMinimal, Object.class));
+        assertEquals(SMALL_INT, mapperWithMinimalInts.readValue(encodedNotMinimal, Object.class));
+        assertEquals(SMALL_INT, mapperFullInts.readValue(encodedMinimal, Object.class));
+        assertEquals(SMALL_INT, mapperFullInts.readValue(encodedNotMinimal, Object.class));
+    }
+}

release-notes/VERSION-2.x

@@ -10,6 +10,11 @@ Modules:
 === Releases ===
 ------------------------------------------------------------------------
 
+2.14.0 (not yet released)
+
+#301: (cbor, smile) Missing configuration methods for format-specific
+  parser/generator features
+
 2.13.1 (not yet released)
 
 - (ion) Add missing `withDefaultImpl()` override for `IonAnnotationTypeResolverBuilder`