Fix #2822

Author: cowtowncoder

release-notes/CREDITS-2.x

@@ -1145,12 +1145,15 @@ Daniel Hrabovcak (TheSpiritXIII@github)
   * Reported #2796: `TypeFactory.constructType()` does not take `TypeBindings` correctly
   (2.11.2)
 
-Daniel Wu (DanielYWoo@github)
-  * Reported #2840: `ObjectMapper.activateDefaultTypingAsProperty()` is not using
-  (2.11.3)
-
 Lari Hotari (lhotari@github)
-
   * Reported #2821: Json serialization fails or a specific case that contains generics and
    static methods with generic parameters (2.11.1 -> 2.11.2 regression)
   (2.11.3)
+
+Nils Christian Ehmke (nils-christian@github)
+  * Reported #2822: Using JsonValue and JsonFormat on one field does not work as expected
+  (2.11.3)
+
+Daniel Wu (DanielYWoo@github)
+  * Reported #2840: `ObjectMapper.activateDefaultTypingAsProperty()` is not using
+  (2.11.3)

release-notes/VERSION-2.x

@@ -10,6 +10,8 @@ Project: jackson-databind
 #2821: Json serialization fails or a specific case that contains generics and
   static methods with generic parameters (2.11.1 -> 2.11.2 regression)
  (reported by Lari H)
+#2822: Using JsonValue and JsonFormat on one field does not work as expected
+ (reported by Nils-Christian E)
 #2840: `ObjectMapper.activateDefaultTypingAsProperty()` is not using
   parameter `PolymorphicTypeValidator`
  (reported by Daniel W)

src/main/java/com/fasterxml/jackson/databind/ser/std/JsonValueSerializer.java

@@ -97,7 +97,7 @@ public JsonValueSerializer(JsonValueSerializer src, BeanProperty property,
     private final static Class<Object> _notNullClass(Class<?> cls) {
         return (cls == null) ? Object.class : (Class<Object>) cls;
     }
-    
+
     public JsonValueSerializer withResolved(BeanProperty property,
             JsonSerializer<?> ser, boolean forceTypeInfo)
     {
@@ -125,9 +125,9 @@ public JsonSerializer<?> createContextual(SerializerProvider provider,
     {
         JsonSerializer<?> ser = _valueSerializer;
         if (ser == null) {
-            /* Can only assign serializer statically if the declared type is final:
-             * if not, we don't really know the actual type until we get the instance.
-             */
+            // Can only assign serializer statically if the declared type is final:
+            // if not, we don't really know the actual type until we get the instance.
+
             // 10-Mar-2010, tatu: Except if static typing is to be used
             JavaType t = _accessor.getType();
             if (provider.isEnabled(MapperFeature.USE_STATIC_TYPING) || t.isFinal()) {
@@ -145,14 +145,18 @@ public JsonSerializer<?> createContextual(SerializerProvider provider,
                 boolean forceTypeInformation = isNaturalTypeWithStdHandling(t.getRawClass(), ser);
                 return withResolved(property, ser, forceTypeInformation);
             }
+            // [databind#2822]: better hold on to "property", regardless
+            if (property != _property) {
+                return withResolved(property, ser, _forceTypeInformation);
+            }
         } else {
             // 05-Sep-2013, tatu: I _think_ this can be considered a primary property...
             ser = provider.handlePrimaryContextualization(ser, property);
             return withResolved(property, ser, _forceTypeInformation);
         }
         return this;
     }
-    
+
     /*
     /**********************************************************
     /* Actual serialization
@@ -171,10 +175,10 @@ public void serialize(Object bean, JsonGenerator gen, SerializerProvider prov) t
             JsonSerializer<Object> ser = _valueSerializer;
             if (ser == null) {
                 Class<?> c = value.getClass();
-                /* 10-Mar-2010, tatu: Ideally we would actually separate out type
-                 *   serializer from value serializer; but, alas, there's no access
-                 *   to serializer factory at this point... 
-                 */
+                // 10-Mar-2010, tatu: Ideally we would actually separate out type
+                //   serializer from value serializer; but, alas, there's no access
+                //   to serializer factory at this point...
+
                 // let's cache it, may be needed soon again
                 ser = prov.findTypedValueSerializer(c, true, _property);
             }

src/test/java/com/fasterxml/jackson/databind/BaseMapTest.java

@@ -354,6 +354,11 @@ protected byte[] utf8Bytes(String str) {
         }
     }
 
+    // @since 2.11.3
+    protected static String a2q(String json) {
+        return json.replace("'", "\"");
+    }
+
     protected static String aposToQuotes(String json) {
         return json.replace("'", "\"");
     }

src/test/java/com/fasterxml/jackson/databind/ser/JsonValueTest.java

@@ -1,10 +1,13 @@
 package com.fasterxml.jackson.databind.ser;
 
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.util.*;
 
 import com.fasterxml.jackson.annotation.*;
+
 import com.fasterxml.jackson.core.JsonGenerator;
+
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.module.SimpleModule;
@@ -192,14 +195,37 @@ public void serialize(Bean838 value, JsonGenerator gen,
             gen.writeNumber(42);
         }
     }
+
+    // [databind#2822]
+    @JsonPropertyOrder({ "description", "b" })
+    static class A2822 {
+        public final String description;
+
+        @JsonFormat(shape = JsonFormat.Shape.STRING)
+        public final B2822 b;
+
+        public A2822(final String description, final B2822 b ) {
+            this.description = description;
+            this.b = b;
+        }
+    }
+
+    static class B2822 {
+        @JsonValue
+        private final BigDecimal value;
+
+        public B2822(final BigDecimal value ) {
+            this.value = value;
+        }
+    }
 
     /*
     /*********************************************************
     /* Test cases
     /*********************************************************
      */
 
-    private final ObjectMapper MAPPER = new ObjectMapper();
+    private final ObjectMapper MAPPER = newJsonMapper();
 
     public void testSimpleMethodJsonValue() throws Exception
     {
@@ -295,4 +321,12 @@ public void testJsonValueWithCustomOverride() throws Exception
             );
         assertEquals("42", mapper.writeValueAsString(INPUT));
     }
+
+    // [databind#2822]
+    public void testFormatWithJsonValue() throws Exception
+    {
+        final String json = MAPPER.writeValueAsString(new A2822("desc",
+                new B2822(BigDecimal.ONE)));
+        assertEquals(a2q("{'description':'desc','b':'1'}"), json);
+    }
 }