Add release notes, minor tweaks

Author: cowtowncoder

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

@@ -1939,10 +1939,15 @@ private final byte[] _getBinaryFromString(Base64Variant variant) throws IOExcept
      * and the token is reported as {@link JsonToken#VALUE_NULL}.
      *
      * @return {@code true} if current token is an `undefined`, {@code false} otherwise
+     *
      * @since 2.20
      */
     public boolean isUndefined() {
-        return (_inputBuffer[_inputPtr - 1] & 0xFF) == SIMPLE_VALUE_UNDEFINED;
+        if ((_currToken == JsonToken.VALUE_NULL) || (_currToken == JsonToken.VALUE_NULL)) {
+            return (_inputBuffer != null)
+                    && (_inputBuffer[_inputPtr - 1] & 0xFF) == SIMPLE_VALUE_UNDEFINED;
+        }
+        return false;
     }
 
     /*
@@ -3686,20 +3691,20 @@ private final static long _long(int i1, int i2)
      * Helper method to encapsulate details of handling of mysterious `undefined` value
      * that is allowed to be used as something encoder could not handle (as per spec),
      * whatever the heck that should be.
-     *
      * <p>
-     * For backward compatibility with Jackson 2.9.6 to 2.19, this value is decoded
+     * For backward compatibility with Jackson 2.10 to 2.19, this value is decoded
      * as {@link JsonToken#VALUE_NULL} by default.
      * <p>
      *
      * since 2.20 If {@link CBORParser.Feature#HANDLE_UNDEFINED_AS_EMBEDDED_OBJECT} is enabled,
      * the value will instead be decoded as {@link JsonToken#VALUE_EMBEDDED_OBJECT}
      * with an embedded value of {@code null}.
      *
-     * @since 2.9.6
+     * @since 2.10
      */
     protected JsonToken _decodeUndefinedValue() {
-        if (CBORParser.Feature.HANDLE_UNDEFINED_AS_EMBEDDED_OBJECT.enabledIn(_formatFeatures)) {
+        if (Feature.HANDLE_UNDEFINED_AS_EMBEDDED_OBJECT.enabledIn(_formatFeatures)) {
+            _binaryValue = null; // should be clear but just in case
             return JsonToken.VALUE_EMBEDDED_OBJECT;
         }
         return JsonToken.VALUE_NULL;

release-notes/CREDITS-2.x

@@ -391,6 +391,9 @@ Brian Gruber (@bgruber)
   (2.20.0)
 
 Fawzi Essam (@iifawzi)
+ * Contributed implementation of #137: (cbor) Allow exposing CBOR "undefined" value as
+  `JsonToken.VALUE_EMBEDDED_OBJECT`; with embedded value of `null`
+  (2.20.0)
  * Contributed fix for #431: (cbor) Negative `BigInteger` values not encoded/decoded
    correctly
   (2.20.0)

release-notes/VERSION-2.x

@@ -16,6 +16,10 @@ Active maintainers:
 
 2.20.0 (not yet released)
 
+#137: (cbor) Allow exposing CBOR "undefined" value as `JsonToken.VALUE_EMBEDDED_OBJECT`;
+  with embedded value of `null`
+ (implementation contributed by Fawzi E) 
+  
 #431: (cbor) Negative `BigInteger` values not encoded/decoded correctly
  (reported by Brian G)
  (fix contributed by Fawzi E)