Merge branch '2.10'

Author: cowtowncoder

release-notes/CREDITS-2.x

@@ -956,6 +956,10 @@ Hesham Massoud (heshamMassoud@github)
    (2.10.0)
 
 David Connelly (dconnelly@github)
-  * Reported#2446: Java 11: Unable to load JDK7 types (annotations, java.nio.file.Path):
+  * Reported #2446: Java 11: Unable to load JDK7 types (annotations, java.nio.file.Path):
     no Java7 support added
    (2.10.0)
+
+Wahey (KevynBct@github)
+  * Reported #2466: Didn't find class "java.nio.file.Path" below Android api 26
+  (2.10.0)

release-notes/VERSION-2.x

@@ -4,6 +4,11 @@ Project: jackson-databind
 === Releases === 
 ------------------------------------------------------------------------
 
+2.10.0 (not yet released)
+
+#2466: Didn't find class "java.nio.file.Path" below Android api 26
+ (reported by KevynBct@github)
+
 2.10.0.pr3 (17-Sep-2019)
 
 #1093: Default typing does not work with `writerFor(Object.class)`

src/main/java/com/fasterxml/jackson/databind/ext/beans/JavaBeansAnnotationsImpl.java

@@ -14,7 +14,8 @@ public class JavaBeansAnnotationsImpl extends JavaBeansAnnotations
     private final Class<?> _bogus;
 
     public JavaBeansAnnotationsImpl() {
-        // Trigger loading of annotations that only JDK 7 has...
+    // Trigger loading of annotations that only JDK 7 has, to trigger
+    // early fail (see [databind#2466])
         Class<?> cls = Transient.class;
         cls = ConstructorProperties.class;
         _bogus = cls;

src/test/java/com/fasterxml/jackson/failing/JacksonInject2465Test.java

@@ -0,0 +1,53 @@
+package com.fasterxml.jackson.failing;
+
+import com.fasterxml.jackson.annotation.JacksonInject;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonSetter;
+import com.fasterxml.jackson.annotation.Nulls;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+
+import com.fasterxml.jackson.databind.*;
+
+public class JacksonInject2465Test extends BaseMapTest
+{
+    public static final class TestCase2465 {
+        private final Internal2465 str;
+        private final int id;
+
+        @JsonCreator
+        public TestCase2465(@JacksonInject Internal2465 str, @JsonProperty("id") int id) {
+            this.str = str;
+            this.id = id;
+        }
+
+        public int fetchId() { return id; }
+        public Internal2465 fetchInternal() { return str; }
+    }
+
+    public static final class Internal2465 {
+        final String val;
+
+        public Internal2465(String val) {
+            this.val = val;
+        }
+    }
+
+    // [databind#2465]
+    public void testInjectWithCreator() throws Exception
+    {
+        ObjectMapper mapper = jsonMapperBuilder()
+                .defaultSetterInfo(JsonSetter.Value.construct(Nulls.AS_EMPTY, Nulls.AS_EMPTY))
+                .build();
+        mapper.setVisibility(mapper.getVisibilityChecker().withVisibility(PropertyAccessor.FIELD,
+                JsonAutoDetect.Visibility.ANY));
+
+        final Internal2465 injected = new Internal2465("test");
+        TestCase2465 o = mapper.readerFor(TestCase2465.class)
+                .with(new InjectableValues.Std().addValue(Internal2465.class, injected))
+                .readValue("{\"id\":3}");
+        assertEquals(3, o.fetchId());
+        assertNotNull(o.fetchInternal());
+    }
+}