From 5cfeba09334a44ca3f9f107beb624d435587eb80 Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Sun, 31 May 2020 11:01:31 -0700
Subject: [PATCH] Minor reordering of code

---
 .../deser/std/EnumMapDeserializer.java        | 18 ++++++-------
 .../databind/deser/std/MapDeserializer.java   | 26 ++++++++++---------
 .../deser/std/NullifyingDeserializer.java     |  1 -
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/EnumMapDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/EnumMapDeserializer.java
index 8217eae06d..e5fcefa865 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/std/EnumMapDeserializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/std/EnumMapDeserializer.java
@@ -242,16 +242,16 @@ public EnumMap<?,?> deserialize(JsonParser p, DeserializationContext ctxt)
         }
         // Ok: must point to START_OBJECT
         JsonToken t = p.currentToken();
-        if ((t != JsonToken.START_OBJECT) && (t != JsonToken.FIELD_NAME) && (t != JsonToken.END_OBJECT)) {
-            // (empty) String may be ok however; or single-String-arg ctor
-            if (t == JsonToken.VALUE_STRING) {
-                return (EnumMap<?,?>) _valueInstantiator.createFromString(ctxt, p.getText());
-            }
-            // slightly redundant (since String was passed above), but also handles empty array case:
-            return _deserializeFromEmpty(p, ctxt);
+        if ((t == JsonToken.START_OBJECT) || (t == JsonToken.FIELD_NAME)
+                || (t == JsonToken.END_OBJECT)) {
+            return deserialize(p, ctxt, constructMap(ctxt));
+        }
+        // (empty) String may be ok however; or single-String-arg ctor
+        if (t == JsonToken.VALUE_STRING) {
+            return (EnumMap<?,?>) _valueInstantiator.createFromString(ctxt, p.getText());
         }
-        EnumMap result = constructMap(ctxt);
-        return deserialize(p, ctxt, result);
+        // slightly redundant (since String was passed above), but also handles empty array case:
+        return _deserializeFromEmpty(p, ctxt);
     }
 
     @Override
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/MapDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/MapDeserializer.java
index 9e27ee8b8f..6f5e00fdc8 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/std/MapDeserializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/std/MapDeserializer.java
@@ -357,21 +357,23 @@ public Map<Object,Object> deserialize(JsonParser p, DeserializationContext ctxt)
         }
         // Ok: must point to START_OBJECT, FIELD_NAME or END_OBJECT
         JsonToken t = p.currentToken();
-        if (t != JsonToken.START_OBJECT && t != JsonToken.FIELD_NAME && t != JsonToken.END_OBJECT) {
-            // (empty) String may be ok however; or single-String-arg ctor
-            if (t == JsonToken.VALUE_STRING) {
-                return (Map<Object,Object>) _valueInstantiator.createFromString(ctxt, p.getText());
+        if ((t == JsonToken.START_OBJECT) || (t == JsonToken.FIELD_NAME)
+                || (t == JsonToken.END_OBJECT)) {
+            final Map<Object,Object> result = (Map<Object,Object>) _valueInstantiator.createUsingDefault(ctxt);
+            if (_standardStringKey) {
+                _readAndBindStringKeyMap(p, ctxt, result);
+                return result;
             }
-            // slightly redundant (since String was passed above), but also handles empty array case:
-            return _deserializeFromEmpty(p, ctxt);
-        }
-        final Map<Object,Object> result = (Map<Object,Object>) _valueInstantiator.createUsingDefault(ctxt);
-        if (_standardStringKey) {
-            _readAndBindStringKeyMap(p, ctxt, result);
+            _readAndBind(p, ctxt, result);
             return result;
         }
-        _readAndBind(p, ctxt, result);
-        return result;
+
+        // (empty) String may be ok however; or single-String-arg ctor
+        if (t == JsonToken.VALUE_STRING) {
+            return (Map<Object,Object>) _valueInstantiator.createFromString(ctxt, p.getText());
+        }
+        // slightly redundant (since String was passed above), but also handles empty array case:
+        return _deserializeFromEmpty(p, ctxt);
     }
 
     @SuppressWarnings("unchecked")
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/NullifyingDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/NullifyingDeserializer.java
index 77dd1ab807..64b337ab0c 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/std/NullifyingDeserializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/std/NullifyingDeserializer.java
@@ -5,7 +5,6 @@
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-import com.fasterxml.jackson.databind.type.LogicalType;
 
 /**
  * Bogus deserializer that will simply skip all content there is to map