Complete #253

Author: cowtowncoder

cbor/src/main/java/com/fasterxml/jackson/dataformat/cbor/CBORParser.java

@@ -291,6 +291,18 @@ private Feature(boolean defaultState) {
      */
     protected int _quad1, _quad2, _quad3;
 
+    /**
+     * Marker flag to indicate that standard symbol handling is used
+     * (one with symbol table assisted canonicalization. May be disabled
+     * in which case alternate stream-line, non-canonicalizing handling
+     * is used: usually due to set of symbols
+     * (Object property names) is unbounded and will not benefit from
+     * canonicalization attempts.
+     *
+     * @since 2.13
+     */
+    protected final boolean _symbolsCanonical;
+
     /*
     /**********************************************************
     /* Constants and fields of former 'JsonNumericParserBase'
@@ -355,6 +367,7 @@ public CBORParser(IOContext ctxt, int parserFeatures, int cborFeatures,
         _ioContext = ctxt;
         _objectCodec = codec;
         _symbols = sym;
+        _symbolsCanonical = sym.isCanonicalizing();
 
         _inputStream = in;
         _inputBuffer = inputBuffer;
@@ -1231,12 +1244,16 @@ public String nextFieldName() throws IOException
                     if ((_inputEnd - _inputPtr) < lenMarker) {
                         _loadToHaveAtLeast(lenMarker);
                     }
-                    name = _findDecodedFromSymbols(lenMarker);
-                    if (name != null) {
-                        _inputPtr += lenMarker;
+                    if (_symbolsCanonical) {
+                        name = _findDecodedFromSymbols(lenMarker);
+                        if (name != null) {
+                            _inputPtr += lenMarker;
+                        } else {
+                            name = _decodeContiguousName(lenMarker);
+                            name = _addDecodedToSymbols(lenMarker, name);
+                        }
                     } else {
                         name = _decodeContiguousName(lenMarker);
-                        name = _addDecodedToSymbols(lenMarker, name);
                     }
                 }
             } else {
@@ -2614,12 +2631,16 @@ protected final JsonToken _decodePropertyName() throws IOException
                 if ((_inputEnd - _inputPtr) < lenMarker) {
                     _loadToHaveAtLeast(lenMarker);
                 }
-                name = _findDecodedFromSymbols(lenMarker);
-                if (name != null) {
-                    _inputPtr += lenMarker;
+                if (_symbolsCanonical) {
+                    name = _findDecodedFromSymbols(lenMarker);
+                    if (name != null) {
+                        _inputPtr += lenMarker;
+                    } else {
+                        name = _decodeContiguousName(lenMarker);
+                        name = _addDecodedToSymbols(lenMarker, name);
+                    }
                 } else {
                     name = _decodeContiguousName(lenMarker);
-                    name = _addDecodedToSymbols(lenMarker, name);
                 }
             }
         } else {
@@ -2722,15 +2743,18 @@ private final String _decodeLongerName(int len) throws IOException
             }
             _loadToHaveAtLeast(len);
         }
-        String name = _findDecodedFromSymbols(len);
-        if (name != null) {
-            _inputPtr += len;
-            return name;
+        if (_symbolsCanonical) {
+            String name = _findDecodedFromSymbols(len);
+            if (name != null) {
+                _inputPtr += len;
+                return name;
+            }
+            name = _decodeContiguousName(len);
+            return _addDecodedToSymbols(len, name);
         }
-        name = _decodeContiguousName(len);
-        return _addDecodedToSymbols(len, name);
+        return _decodeContiguousName(len);
     }
-    
+
     private final String _decodeChunkedName() throws IOException
     {
         _finishChunkedText();

cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/parse/SymbolTableTest.java

@@ -84,9 +84,6 @@ public void testSimpleDefault() throws Exception
     // Assumption: there is still non-null symbol table, but has "no canonicalization"
     public void testNoCanonicalizeWithMapper() throws Exception
     {
-        if (true) {
-            return;
-        }
         final byte[] doc = cborDoc(a2q("{ 'x':13, 'y':-999}"));
         try (JsonParser p = NO_CAN_MAPPER.createParser(doc)) {
             Point point = NO_CAN_MAPPER.readValue(p, Point.class);
@@ -98,10 +95,6 @@ public void testNoCanonicalizeWithMapper() throws Exception
     // [dataformats-binary#252]: should be able to prevent canonicalization
     public void testSimpleNoCanonicalize() throws Exception
     {
-        // !!! TODO: enable
-        if (true) {
-            return;
-        }
         final String[] fieldNames = new String[] {
             // Ascii, various lengths
             "abc", "abcd123", "abcdefghi123940963", "",

release-notes/VERSION-2.x

@@ -12,9 +12,10 @@ Modules:
 
 2.13.0 (not yet released)
 
-#239: Should validate UTF-8 multi-byte validity for short decode path too
-#248: Deprecate `CloseSafeUTF8Writer`, remove use
-#252: Make `SmileFactory` support `JsonFactory.Feature.CANONICALIZE_FIELD_NAMES`
+#239: (cbor) Should validate UTF-8 multi-byte validity for short decode path too
+#248: (ion) Deprecate `CloseSafeUTF8Writer`, remove use
+#252: (smile) Make `SmileFactory` support `JsonFactory.Feature.CANONICALIZE_FIELD_NAMES`
+#253: (cbor) Make `CBORFactory` support `JsonFactory.Feature.CANONICALIZE_FIELD_NAMES`
 - `Ion-java` dep 1.4.0 -> 1.8.0
 
 2.12.2 (03-Mar-2021)