Add explicit AtomicLongDeserializer as well

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/deser/std/AtomicIntegerDeserializer.java

@@ -28,7 +28,7 @@ public AtomicInteger deserialize(JsonParser p, DeserializationContext ctxt) thro
     }
 
     @Override
-    public LogicalType logicalType() { return LogicalType.Boolean; }
+    public LogicalType logicalType() { return LogicalType.Integer; }
 
     @Override // @since 2.12
     public Object getEmptyValue(DeserializationContext ctxt) throws JsonMappingException {

src/main/java/com/fasterxml/jackson/databind/deser/std/AtomicLongDeserializer.java

@@ -0,0 +1,37 @@
+package com.fasterxml.jackson.databind.deser.std;
+
+import java.io.IOException;
+import java.util.concurrent.atomic.AtomicLong;
+
+import com.fasterxml.jackson.core.JsonParser;
+
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.type.LogicalType;
+
+// @since 2.12
+public class AtomicLongDeserializer extends StdScalarDeserializer<AtomicLong>
+{
+    private static final long serialVersionUID = 1L;
+
+    public AtomicLongDeserializer() { super(AtomicLong.class); }
+
+    @Override
+    public AtomicLong deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
+        if (p.isExpectedNumberIntToken()) {
+            return new AtomicLong(p.getLongValue());
+        }
+        // 12-Jun-2020, tatu: May look convoluted, but need to work correctly with
+        //   CoercionConfig
+        Long L = _parseLong(p, ctxt, AtomicLong.class);
+        return (L == null) ? null : new AtomicLong(L.intValue());
+    }
+
+    @Override
+    public LogicalType logicalType() { return LogicalType.Integer; }
+
+    @Override // @since 2.12
+    public Object getEmptyValue(DeserializationContext ctxt) throws JsonMappingException {
+        return new AtomicLong();
+    }
+}

src/main/java/com/fasterxml/jackson/databind/deser/std/JdkDeserializers.java

@@ -4,6 +4,7 @@
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
 
 import com.fasterxml.jackson.databind.*;
 
@@ -20,6 +21,7 @@ public class JdkDeserializers
                 UUID.class,
                 AtomicBoolean.class,
                 AtomicInteger.class,
+                AtomicLong.class,
                 StackTraceElement.class,
                 ByteBuffer.class,
                 Void.class
@@ -42,12 +44,14 @@ public static JsonDeserializer<?> find(Class<?> rawType, String clsName)
                 return new StackTraceElementDeserializer();
             }
             if (rawType == AtomicBoolean.class) {
-                // (note: AtomicInteger/Long work due to single-arg constructor. For now?
                 return new AtomicBooleanDeserializer();
             }
             if (rawType == AtomicInteger.class) {
                 return new AtomicIntegerDeserializer();
             }
+            if (rawType == AtomicLong.class) {
+                return new AtomicLongDeserializer();
+            }
             if (rawType == ByteBuffer.class) {
                 return new ByteBufferDeserializer();
             }

src/main/java/com/fasterxml/jackson/databind/deser/std/NumberDeserializers.java

@@ -570,53 +570,7 @@ public Long deserialize(JsonParser p, DeserializationContext ctxt) throws IOExce
             if (_primitive) {
                 return _parseLongPrimitive(p, ctxt);
             }
-            return _parseLong(p, ctxt);
-        }
-
-        protected final Long _parseLong(JsonParser p, DeserializationContext ctxt)
-                throws IOException
-        {
-            String text;
-            switch (p.currentTokenId()) {
-            case JsonTokenId.ID_STRING:
-                text = p.getText();
-                break;
-            case JsonTokenId.ID_NUMBER_FLOAT:
-                final CoercionAction act = _checkFloatToIntCoercion(p, ctxt, _valueClass);
-                if (act == CoercionAction.AsNull) {
-                    return (Long) getNullValue(ctxt);
-                }
-                if (act == CoercionAction.AsEmpty) {
-                    return (Long) getEmptyValue(ctxt);
-                }
-                return p.getValueAsLong();
-            case JsonTokenId.ID_NULL: // null fine for non-primitive
-                return (Long) getNullValue(ctxt);
-            case JsonTokenId.ID_NUMBER_INT:
-                return p.getLongValue();
-            // 29-Jun-2020, tatu: New! "Scalar from Object" (mostly for XML)
-            case JsonTokenId.ID_START_OBJECT:
-                text = ctxt.extractScalarFromObject(p, this, _valueClass);
-                break;
-            case JsonTokenId.ID_START_ARRAY:
-                return (Long) _deserializeFromArray(p, ctxt);
-            default:
-                return (Long) ctxt.handleUnexpectedToken(getValueType(ctxt), p);
-            }
-
-            final CoercionAction act = _checkFromStringCoercion(ctxt, text);
-            if (act == CoercionAction.AsNull) {
-                return (Long) getNullValue(ctxt);
-            }
-            if (act == CoercionAction.AsEmpty) {
-                return (Long) getEmptyValue(ctxt);
-            }
-            text = text.trim();
-            if (_checkTextualNull(ctxt, text)) {
-                return (Long) getNullValue(ctxt);
-            }
-            // let's allow Strings to be converted too
-            return _parseLongPrimitive(ctxt, text);
+            return _parseLong(p, ctxt, Long.class);
         }
     }
 

src/main/java/com/fasterxml/jackson/databind/deser/std/StdDeserializer.java

@@ -879,6 +879,56 @@ protected final long _parseLongPrimitive(DeserializationContext ctxt, String tex
         }
     }
 
+    /**
+     * @since 2.12
+     */
+    protected final Long _parseLong(JsonParser p, DeserializationContext ctxt,
+            Class<?> targetType)
+        throws IOException
+    {
+        String text;
+        switch (p.currentTokenId()) {
+        case JsonTokenId.ID_STRING:
+            text = p.getText();
+            break;
+        case JsonTokenId.ID_NUMBER_FLOAT:
+            final CoercionAction act = _checkFloatToIntCoercion(p, ctxt, targetType);
+            if (act == CoercionAction.AsNull) {
+                return (Long) getNullValue(ctxt);
+            }
+            if (act == CoercionAction.AsEmpty) {
+                return (Long) getEmptyValue(ctxt);
+            }
+            return p.getValueAsLong();
+        case JsonTokenId.ID_NULL: // null fine for non-primitive
+            return (Long) getNullValue(ctxt);
+        case JsonTokenId.ID_NUMBER_INT:
+            return p.getLongValue();
+        // 29-Jun-2020, tatu: New! "Scalar from Object" (mostly for XML)
+        case JsonTokenId.ID_START_OBJECT:
+            text = ctxt.extractScalarFromObject(p, this, targetType);
+            break;
+        case JsonTokenId.ID_START_ARRAY:
+            return (Long) _deserializeFromArray(p, ctxt);
+        default:
+            return (Long) ctxt.handleUnexpectedToken(getValueType(ctxt), p);
+        }
+
+        final CoercionAction act = _checkFromStringCoercion(ctxt, text);
+        if (act == CoercionAction.AsNull) {
+            return (Long) getNullValue(ctxt);
+        }
+        if (act == CoercionAction.AsEmpty) {
+            return (Long) getEmptyValue(ctxt);
+        }
+        text = text.trim();
+        if (_checkTextualNull(ctxt, text)) {
+            return (Long) getNullValue(ctxt);
+        }
+        // let's allow Strings to be converted too
+        return _parseLongPrimitive(ctxt, text);
+    }
+
     protected final float _parseFloatPrimitive(JsonParser p, DeserializationContext ctxt)
         throws IOException
     {