Merge branch '2.8'

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerBase.java

@@ -515,7 +515,7 @@ public void resolve(DeserializationContext ctxt)
             // Need to link managed references with matching back references
             prop = _resolveManagedReferenceProperty(ctxt, prop);
 
-            // [databind#351[: need to wrap properties that require object id resolution.
+            // [databind#351]: need to wrap properties that require object id resolution.
             if (!(prop instanceof ManagedReferenceProperty)) {
                 prop = _resolvedObjectIdProperty(ctxt, prop);
             }

src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerBuilder.java

@@ -183,6 +183,10 @@ public void  addBackReferenceProperty(String referenceName, SettableBeanProperty
         if (_backRefProperties == null) {
             _backRefProperties = new HashMap<String, SettableBeanProperty>(4);
         }
+        // 15-Sep-2016, tatu: For some reason fixing access at point of `build()` does
+        //    NOT work (2 failing unit tests). Not 100% clear why, but for now force
+        //    access set early; unfortunate, but since it works....
+        prop.fixAccess(_config);
         _backRefProperties.put(referenceName, prop);
         // also: if we had property with same name, actually remove it
         if (_properties != null) {
@@ -207,7 +211,7 @@ public void addInjectable(PropertyName propName, JavaType propType,
         _injectables.add(new ValueInjector(propName, propType,
                 contextAnnotations, member, valueId));
     }
-    
+
     /**
      * Method that will add property name as one of properties that can
      * be ignored if not recognized.
@@ -462,11 +466,15 @@ private void _fixAccess(Collection<SettableBeanProperty> mainProps)
             */
             prop.fixAccess(_config);
         }
+        // 15-Sep-2016, tatu: Access via back-ref properties has been done earlier
+        //   as it has to, for some reason, so not repeated here.
+/*        
         if (_backRefProperties != null) {
             for (SettableBeanProperty prop : _backRefProperties.values()) {
                 prop.fixAccess(_config);
             }
         }
+        */
         if (_anySetter != null) {
             _anySetter.fixAccess(_config);
         }

src/main/java/com/fasterxml/jackson/databind/deser/impl/FieldProperty.java

@@ -132,7 +132,7 @@ public final void set(Object instance, Object value) throws IOException
         try {
             _field.set(instance, value);
         } catch (Exception e) {
-            // 15-Sep-2015, tatu: How coud we get a ref to JsonParser?
+            // 15-Sep-2015, tatu: How could we get a ref to JsonParser?
             _throwAsIOE(e, value);
         }
     }
@@ -143,7 +143,7 @@ public Object setAndReturn(Object instance, Object value) throws IOException
         try {
             _field.set(instance, value);
         } catch (Exception e) {
-            // 15-Sep-2015, tatu: How coud we get a ref to JsonParser?
+            // 15-Sep-2015, tatu: How could we get a ref to JsonParser?
             _throwAsIOE(e, value);
         }
         return instance;

src/main/java/com/fasterxml/jackson/databind/deser/impl/ManagedReferenceProperty.java

@@ -22,17 +22,17 @@ public final class ManagedReferenceProperty
     private static final long serialVersionUID = 1L;
 
     protected final String _referenceName;
-    
+
     /**
      * Flag that indicates whether property to handle is a container type
      * (array, Collection, Map) or not.
      */
     protected final boolean _isContainer;
-    
+
     protected final SettableBeanProperty _managedProperty;
 
     protected final SettableBeanProperty _backProperty;
-    
+
     public ManagedReferenceProperty(SettableBeanProperty forward, String refName,
             SettableBeanProperty backward, Annotations contextAnnotations, boolean isContainer)
     {
@@ -66,7 +66,7 @@ protected ManagedReferenceProperty(ManagedReferenceProperty src, PropertyName ne
     public ManagedReferenceProperty withName(PropertyName newName) {
         return new ManagedReferenceProperty(this, newName);
     }
-    
+
     @Override
     public ManagedReferenceProperty withValueDeserializer(JsonDeserializer<?> deser) {
         return new ManagedReferenceProperty(this, deser);
@@ -83,7 +83,7 @@ public void fixAccess(DeserializationConfig config) {
     /* BeanProperty impl
     /**********************************************************
      */
-    
+
     @Override
     public <A extends Annotation> A getAnnotation(Class<A> acls) {
         return _managedProperty.getAnnotation(acls);

src/main/java/com/fasterxml/jackson/databind/deser/impl/MethodProperty.java

@@ -119,7 +119,7 @@ public Object deserializeSetAndReturn(JsonParser p,
             return null;
         }
     }
-    
+
     @Override
     public final void set(Object instance, Object value) throws IOException
     {

src/main/java/com/fasterxml/jackson/databind/util/ClassUtil.java

@@ -979,7 +979,6 @@ public static Ctor[] getConstructors(Class<?> cls) {
      * @since 2.7
      */
     public static Class<?> getDeclaringClass(Class<?> cls) {
-        // Caching does not seem worthwhile, as per profiling
         return isObjectOrPrimitive(cls) ? null : cls.getDeclaringClass();
     }
 

src/test/java/com/fasterxml/jackson/databind/struct/TestBackRefsWithPolymorphic.java

@@ -12,33 +12,6 @@
 // Unit test for [JACKSON-890]
 public class TestBackRefsWithPolymorphic extends BaseMapTest
 {
-    private final String CLASS_NAME = getClass().getName();
-
-    // NOTE: order is arbitrary, test is fragile... has to work for now
-    private final String JSON =
-        "{\"@class\":\""+CLASS_NAME+"$PropertySheetImpl\",\"id\":0,\"properties\":{\"p1name\":{\"@class\":"
-            +"\"" +CLASS_NAME+ "$StringPropertyImpl\",\"id\":0,\"name\":\"p1name\",\"value\":\"p1value\"},"
-            +"\"p2name\":{\"@class\":\""+CLASS_NAME+"$StringPropertyImpl\",\"id\":0,"
-            +"\"name\":\"p2name\",\"value\":\"p2value\"}}}";
-
-    private final ObjectMapper MAPPER = new ObjectMapper();
-
-    public void testDeserialize() throws IOException
-    {
-        PropertySheet input = MAPPER.readValue(JSON, PropertySheet.class);
-        assertEquals(JSON, MAPPER.writeValueAsString(input));
-    }
-
-    public void testSerialize() throws IOException
-    {
-        PropertySheet sheet = new PropertySheetImpl();
-
-        sheet.addProperty(new StringPropertyImpl("p1name", "p1value"));
-        sheet.addProperty(new StringPropertyImpl("p2name", "p2value"));
-        String actual = MAPPER.writeValueAsString(sheet);
-        assertEquals(JSON, actual);
-    }
-
     @JsonPropertyOrder(alphabetic=true)
     interface Entity
     {
@@ -217,4 +190,36 @@ public StringPropertyImpl(String name, String value) {
     }
 
     static class YetAnotherClass extends StringPropertyImpl { }
+
+    /*
+    /**********************************************************
+    /* Test methods
+    /**********************************************************
+     */
+
+    private final String CLASS_NAME = getClass().getName();
+    // NOTE: order is arbitrary, test is fragile... has to work for now
+    private final String JSON =
+        "{\"@class\":\""+CLASS_NAME+"$PropertySheetImpl\",\"id\":0,\"properties\":{\"p1name\":{\"@class\":"
+            +"\"" +CLASS_NAME+ "$StringPropertyImpl\",\"id\":0,\"name\":\"p1name\",\"value\":\"p1value\"},"
+            +"\"p2name\":{\"@class\":\""+CLASS_NAME+"$StringPropertyImpl\",\"id\":0,"
+            +"\"name\":\"p2name\",\"value\":\"p2value\"}}}";
+    
+    private final ObjectMapper MAPPER = new ObjectMapper();
+
+    public void testDeserialize() throws IOException
+    {
+        PropertySheet input = MAPPER.readValue(JSON, PropertySheet.class);
+        assertEquals(JSON, MAPPER.writeValueAsString(input));
+    }
+
+    public void testSerialize() throws IOException
+    {
+        PropertySheet sheet = new PropertySheetImpl();
+
+        sheet.addProperty(new StringPropertyImpl("p1name", "p1value"));
+        sheet.addProperty(new StringPropertyImpl("p2name", "p2value"));
+        String actual = MAPPER.writeValueAsString(sheet);
+        assertEquals(JSON, actual);
+    }
 }