Minor changes to test out non-canonicalizing smile/cbor

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/perf/cbor/CBORColumnReadVanilla.java

@@ -4,7 +4,10 @@
 import org.openjdk.jmh.annotations.Scope;
 
 import com.fasterxml.jackson.databind.*;
+
 import com.fasterxml.jackson.dataformat.cbor.CBORFactory;
+import com.fasterxml.jackson.dataformat.cbor.databind.CBORMapper;
+
 import com.fasterxml.jackson.perf.ReadPerfBaseBasicJackson;
 import com.fasterxml.jackson.perf.data.InputConverter;
 import com.fasterxml.jackson.perf.model.MediaItem;
@@ -14,9 +17,9 @@
 public class CBORColumnReadVanilla
     extends ReadPerfBaseBasicJackson<MediaItem>
 {
-    private final static CBORFactory _cf = new CBORFactory();
+    private final static CBORFactory _cf = CBORFactory.builder().build();
 
-    private static final ObjectMapper MAPPER = new ObjectMapper(_cf);
+    private static final ObjectMapper MAPPER = new CBORMapper(_cf);
     static {
         MAPPER.setAnnotationIntrospector(new AsArrayIntrospector());
     }

src/main/java/com/fasterxml/jackson/perf/cbor/CBORStdReadVanilla.java

@@ -4,7 +4,10 @@
 import org.openjdk.jmh.annotations.Scope;
 
 import com.fasterxml.jackson.databind.*;
+
 import com.fasterxml.jackson.dataformat.cbor.CBORFactory;
+import com.fasterxml.jackson.dataformat.cbor.databind.CBORMapper;
+
 import com.fasterxml.jackson.perf.ReadPerfBaseFullJackson;
 import com.fasterxml.jackson.perf.data.InputConverter;
 import com.fasterxml.jackson.perf.model.MediaItem;
@@ -13,9 +16,11 @@
 public class CBORStdReadVanilla
     extends ReadPerfBaseFullJackson<MediaItem>
 {
-    private final static CBORFactory _cf = new CBORFactory();
+    private final static CBORFactory _cf = CBORFactory.builder()
+//            .disable(JsonFactory.Feature.CANONICALIZE_FIELD_NAMES)
+            .build();
 
-    private static final ObjectMapper MAPPER = new ObjectMapper(_cf);
+    private static final ObjectMapper MAPPER = new CBORMapper(_cf);
 
     private final static InputConverter CBORS = InputConverter.stdConverter(MAPPER);
 

src/main/java/com/fasterxml/jackson/perf/smile/SmileStdReadVanilla.java

@@ -4,7 +4,10 @@
 import org.openjdk.jmh.annotations.Scope;
 
 import com.fasterxml.jackson.databind.*;
+
 import com.fasterxml.jackson.dataformat.smile.SmileFactory;
+import com.fasterxml.jackson.dataformat.smile.databind.SmileMapper;
+
 import com.fasterxml.jackson.perf.ReadPerfBaseFullJackson;
 import com.fasterxml.jackson.perf.data.InputConverter;
 import com.fasterxml.jackson.perf.model.MediaItem;
@@ -13,9 +16,11 @@
 public class SmileStdReadVanilla
     extends ReadPerfBaseFullJackson<MediaItem>
 {
-    private final static SmileFactory _sf = new SmileFactory();
-    
-    private static final ObjectMapper MAPPER = new ObjectMapper(_sf);
+    private final static SmileFactory _sf = SmileFactory.builder()
+//            .disable(JsonFactory.Feature.CANONICALIZE_FIELD_NAMES)
+            .build();
+
+    private static final ObjectMapper MAPPER = new SmileMapper(_sf);
 
     private final static InputConverter SMILES = InputConverter.stdConverter(MAPPER);