Merge branch '2.10' into 2.11

Author: cowtowncoder

release-notes/CREDITS-2.x

@@ -991,6 +991,10 @@ Johan Haleby (johanhaleby@github)
     in 2.10
   (2.10.1)
 
+Richard Wise (Woodz@github)
+  * Reported #2519: Serializing `BigDecimal` values inside containers ignores shape override	
+  (2.10.1)
+
 Ville Koskela (vjkoskela@github)
   * Contributed #2487: BeanDeserializerBuilder Protected Factory Method for Extension
   (2.11.0)

release-notes/VERSION-2.x

@@ -27,6 +27,8 @@ Project: jackson-databind
  (contributed by Marc M)
 #2513: BigDecimalAsStringSerializer in NumberSerializer throws IllegalStateException in 2.10
  (reported by Johan H)
+#2519: Serializing `BigDecimal` values inside containers ignores shape override
+ (reported by Richard W)
 
 2.10.0 (26-Sep-2019)
 

src/main/java/com/fasterxml/jackson/databind/introspect/ConcreteBeanPropertyBase.java

@@ -29,13 +29,6 @@ public abstract class ConcreteBeanPropertyBase
      */
     protected final PropertyMetadata _metadata;
 
-    /**
-     * Lazily accessed value for per-property format override definition.
-     * 
-     * @since 2.8
-     */
-    protected transient JsonFormat.Value _propertyFormat;
-
     /**
      * @since 2.9
      */
@@ -47,7 +40,6 @@ protected ConcreteBeanPropertyBase(PropertyMetadata md) {
 
     protected ConcreteBeanPropertyBase(ConcreteBeanPropertyBase src) {
         _metadata = src._metadata;
-        _propertyFormat = src._propertyFormat;
     }
 
     @Override
@@ -78,27 +70,19 @@ public final JsonFormat.Value findFormatOverrides(AnnotationIntrospector intr) {
     @Override
     public JsonFormat.Value findPropertyFormat(MapperConfig<?> config, Class<?> baseType)
     {
-        // 15-Apr-2016, tatu: Let's calculate lazily, retain; assumption being however that
-        //    baseType is always the same
-        JsonFormat.Value v = _propertyFormat;
-        if (v == null) {
-            JsonFormat.Value v1 = config.getDefaultPropertyFormat(baseType);
-            JsonFormat.Value v2 = null;
-            AnnotationIntrospector intr = config.getAnnotationIntrospector();
-            if (intr != null) {
-                AnnotatedMember member = getMember();
-                if (member != null) {
-                    v2 = intr.findFormat(member);
-                }
-            }
-            if (v1 == null) {
-                v = (v2 == null) ? EMPTY_FORMAT : v2;
-            } else {
-                v = (v2 == null) ? v1 : v1.withOverrides(v2);
+        JsonFormat.Value v1 = config.getDefaultPropertyFormat(baseType);
+        JsonFormat.Value v2 = null;
+        AnnotationIntrospector intr = config.getAnnotationIntrospector();
+        if (intr != null) {
+            AnnotatedMember member = getMember();
+            if (member != null) {
+                v2 = intr.findFormat(member);
             }
-            _propertyFormat = v;
         }
-        return v;
+        if (v1 == null) {
+            return (v2 == null) ? EMPTY_FORMAT : v2;
+        }
+        return (v2 == null) ? v1 : v1.withOverrides(v2);
     }
 
     @Override

src/test/java/com/fasterxml/jackson/failing/BigDecimalAsString2519Test.java renamed to src/test/java/com/fasterxml/jackson/databind/ser/jdk/BigDecimalAsString2519Test.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.ser.jdk;
 
 import java.math.BigDecimal;
 import java.util.*;