Some preparatory work for #2678

2 files changed, 15 insertions, 4 deletions

diff --git a/src/test/java/com/fasterxml/jackson/failing/JacksonInject2465Test.java b/src/test/java/com/fasterxml/jackson/failing/JacksonInject2465Test.java
index d92e01ba1..8ec2d67e6 100644
--- a/src/test/java/com/fasterxml/jackson/failing/JacksonInject2465Test.java
+++ b/src/test/java/com/fasterxml/jackson/failing/JacksonInject2465Test.java
@@ -10,8 +10,10 @@ import com.fasterxml.jackson.annotation.PropertyAccessor;
 
 import com.fasterxml.jackson.databind.*;
 
+// [databind#2465]
 public class JacksonInject2465Test extends BaseMapTest
 {
+    // [databind#2465]
     public static final class TestCase2465 {
         private final Internal2465 str;
         private final int id;
diff --git a/src/test/java/com/fasterxml/jackson/failing/JacksonInject2678Test.java b/src/test/java/com/fasterxml/jackson/failing/JacksonInject2678Test.java
index f8c23da7d..9ca2bca29 100644
--- a/src/test/java/com/fasterxml/jackson/failing/JacksonInject2678Test.java
+++ b/src/test/java/com/fasterxml/jackson/failing/JacksonInject2678Test.java
@@ -9,19 +9,21 @@ import com.fasterxml.jackson.annotation.OptBoolean;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 
+// [databind#2678]: constructor-passed data overridden via field/setter injection
 public class JacksonInject2678Test extends BaseMapTest
 {
+    // [databind#2678]
     protected static class Some {
-        private final String field1;
+        private String field1;
 
-        @JacksonInject(value = "defaultValueForField2", useInput = OptBoolean.TRUE)
-        private final String field2;
+        private String field2;
 
         public Some(@JsonProperty("field1") final String field1,
                 @JsonProperty("field2")
                 @JacksonInject(value = "defaultValueForField2", useInput = OptBoolean.TRUE)
                 final String field2) {
-             this.field1 = Objects.requireNonNull(field1);
+//System.err.println("CTOR: setField2 as ["+field2+"]");            
+            this.field1 = Objects.requireNonNull(field1);
              this.field2 = Objects.requireNonNull(field2);
         }
 
@@ -32,8 +34,15 @@ public class JacksonInject2678Test extends BaseMapTest
         public String getField2() {
              return field2;
         }
+
+        @JacksonInject(value = "defaultValueForField2", useInput = OptBoolean.TRUE)
+        public void setField2(String v) {
+//System.err.println("DEBUG: setField2, was ["+field2+"], set to ["+v+"]");            
+            field2 = v;
+        }
     }
 
+    // [databind#2678]
     public void testReadValueInjectables() throws Exception {
         final InjectableValues injectableValues =
                   new InjectableValues.Std().addValue("defaultValueForField2", "somedefaultValue");