Fixed #1184

Author: cowtowncoder

release-notes/CREDITS

@@ -474,3 +474,7 @@ Lokesh Kumar (LokeshN@github)
   * Reported #1217: `@JsonIgnoreProperties` on Pojo fields not working for deserialization
    (2.8.0)
 
+Maarten Billemont (lhunath@github)
+  * Suggested #1184: Allow overriding of `transient` with explicit inclusion with `@JsonProperty`
+   (2.8.0)
+

release-notes/VERSION

@@ -28,6 +28,8 @@ Project: jackson-databind
  (reported, contributed fix by Ross G)
 #1181: Add the ability to specify the initial capacity of the ArrayNode
  (suggested by Matt V, mveitas@github)
+#1184: Allow overriding of `transient` with explicit inclusion with `@JsonProperty`
+ (suggested by Maarten B)
 #1187: Refactor `AtomicReferenceDeserializer` into `ReferenceTypeDeserializer`
 #1204: Add a convenience accessor `JavaType.hasContentType()` (true for container or reference type)
 #1206: Add "anchor type" member for `ReferenceType`

src/main/java/com/fasterxml/jackson/databind/MapperFeature.java

@@ -220,11 +220,13 @@ public enum MapperFeature implements ConfigFeature
     ALLOW_FINAL_FIELDS_AS_MUTATORS(true),
 
     /**
-     * Feature that determines for <code>transient</code> modifier for fields
-     * is handled: if disabled, it is only taken to mean exclusion of
+     * Feature that determines how <code>transient</code> modifier for fields
+     * is handled: if disabled, it is only taken to mean exclusion of the field
+     * as accessor; if true, removal of the whole property.
      *<p>
      * Feature is disabled by default, meaning that existence of `transient`
-     * for a field does not necessarily lead to ignoral of getters or setters.
+     * for a field does not necessarily lead to ignoral of getters or setters
+     * but just ignoring the use of field for access.
      *
      * @since 2.6
      */

src/main/java/com/fasterxml/jackson/databind/deser/std/NumberDeserializers.java

@@ -139,12 +139,6 @@ public final T getNullValue(DeserializationContext ctxt) throws JsonMappingExcep
             return _nullValue;
         }
 
-        @Override
-        @Deprecated // remove in 2.7
-        public final T getNullValue() {
-            return _nullValue;
-        }
-
         @Override
         public T getEmptyValue(DeserializationContext ctxt) throws JsonMappingException {
             // [databind#1095]: Should not allow coercion from into null from Empty String

src/main/java/com/fasterxml/jackson/databind/ext/NioPathDeserializer.java

@@ -30,17 +30,16 @@ public Path deserialize(JsonParser p, DeserializationContext ctxt) throws IOExce
             ctxt.reportMappingException(Path.class, p.getCurrentToken());
         }
         final String value = p.getText();
-        if (value.contains(":")) {
-            try {
-                URI uri = new URI(value);
-                return Paths.get(uri);
-            } catch (URISyntaxException e) {
-                return (Path) ctxt.handleInstantiationProblem(handledType(), value, e);
-            }
-        } else {
-            // If someone gives us an input with no : at all, treat as local path, instead of failing
-            // with invalid URI.
+        // If someone gives us an input with no : at all, treat as local path, instead of failing
+        // with invalid URI.
+        if (value.indexOf(':') < 0) {
             return Paths.get(value);
         }
+        try {
+            URI uri = new URI(value);
+            return Paths.get(uri);
+        } catch (URISyntaxException e) {
+            return (Path) ctxt.handleInstantiationProblem(handledType(), value, e);
+        }
     }
 }

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

@@ -367,7 +367,8 @@ protected void _addFields(Map<String, POJOPropertyBuilder> props)
             } else {
                 pn = ai.findNameForDeserialization(f);
             }
-            boolean nameExplicit = (pn != null);
+            boolean hasName = (pn != null);
+            boolean nameExplicit = hasName;
 
             if (nameExplicit && pn.isEmpty()) { // empty String meaning "use default name", here just means "same as field name"
                 pn = _propNameFromSimple(implName);
@@ -383,9 +384,13 @@ protected void _addFields(Map<String, POJOPropertyBuilder> props)
 
             // 13-May-2015, tatu: Moved from earlier place (AnnotatedClass) in 2.6
             if (f.isTransient()) {
-                visible = false;
-                if (transientAsIgnoral) {
-                    ignored = true;
+                // 20-May-2016, tatu: as per [databind#1184] explicit annotation should override
+                //    "default" `transient`
+                if (!hasName) {
+                    visible = false;
+                    if (transientAsIgnoral) {
+                        ignored = true;
+                    }
                 }
             }
             /* [databind#190]: this is the place to prune final fields, if they are not

src/main/java/com/fasterxml/jackson/databind/node/TextNode.java

@@ -57,9 +57,9 @@ public String textValue() {
      * base64 encoded; if so, they are decoded and resulting binary
      * data is returned.
      */
+    @SuppressWarnings("resource")
     public byte[] getBinaryValue(Base64Variant b64variant) throws IOException
     {
-        @SuppressWarnings("resource")
         ByteArrayBuilder builder = new ByteArrayBuilder(100);
         final String str = _value;
         int ptr = 0;

src/main/java/com/fasterxml/jackson/databind/ser/impl/StringArraySerializer.java

@@ -28,6 +28,7 @@ public class StringArraySerializer
     /* Note: not clean in general, but we are betting against
      * anyone re-defining properties of String.class here...
      */
+    @SuppressWarnings("deprecation")
     private final static JavaType VALUE_TYPE = TypeFactory.defaultInstance().uncheckedSimpleType(String.class);
 
     public final static StringArraySerializer instance = new StringArraySerializer();

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

@@ -86,6 +86,7 @@ public static class BooleanArraySerializer
         extends ArraySerializerBase<boolean[]>
     {
         // as above, assuming no one re-defines primitive/wrapper types
+        @SuppressWarnings("deprecation")
         private final static JavaType VALUE_TYPE = TypeFactory.defaultInstance().uncheckedSimpleType(Boolean.class);
 
         public BooleanArraySerializer() { super(boolean[].class); }
@@ -176,6 +177,7 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType t
     public static class ShortArraySerializer extends TypedPrimitiveArraySerializer<short[]>
     {
         // as above, assuming no one re-defines primitive/wrapper types
+        @SuppressWarnings("deprecation")
         private final static JavaType VALUE_TYPE = TypeFactory.defaultInstance().uncheckedSimpleType(Short.TYPE);
 
         public ShortArraySerializer() { super(short[].class); }
@@ -343,6 +345,7 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType t
     public static class IntArraySerializer extends ArraySerializerBase<int[]>
     {
         // as above, assuming no one re-defines primitive/wrapper types
+        @SuppressWarnings("deprecation")
         private final static JavaType VALUE_TYPE = TypeFactory.defaultInstance().uncheckedSimpleType(Integer.TYPE);
 
         public IntArraySerializer() { super(int[].class); }
@@ -432,6 +435,7 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType t
     public static class LongArraySerializer extends TypedPrimitiveArraySerializer<long[]>
     {
         // as above, assuming no one re-defines primitive/wrapper types
+        @SuppressWarnings("deprecation")
         private final static JavaType VALUE_TYPE = TypeFactory.defaultInstance().uncheckedSimpleType(Long.TYPE);
 
         public LongArraySerializer() { super(long[].class); }
@@ -525,6 +529,7 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType t
     public static class FloatArraySerializer extends TypedPrimitiveArraySerializer<float[]>
     {
         // as above, assuming no one re-defines primitive/wrapper types
+        @SuppressWarnings("deprecation")
         private final static JavaType VALUE_TYPE = TypeFactory.defaultInstance().uncheckedSimpleType(Float.TYPE);
 
         public FloatArraySerializer() {
@@ -616,6 +621,7 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType t
     public static class DoubleArraySerializer extends ArraySerializerBase<double[]>
     {
         // as above, assuming no one re-defines primitive/wrapper types
+        @SuppressWarnings("deprecation")
         private final static JavaType VALUE_TYPE = TypeFactory.defaultInstance().uncheckedSimpleType(Double.TYPE);
 
         public DoubleArraySerializer() { super(double[].class); }

src/test/java/com/fasterxml/jackson/databind/introspect/TransientTest.java

@@ -2,6 +2,7 @@
 
 import java.beans.Transient;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.databind.*;
 
@@ -30,6 +31,15 @@ static class BeanTransient {
         public int getY() { return 4; }
     }
 
+    // for [databind#1184]
+    static class OverridableTransient {
+        @JsonProperty
+//        @JsonProperty("value") // should override transient here, to force inclusion
+        public transient int value;
+
+        public OverridableTransient(int v) { value = v; }
+    }
+
     /*
     /**********************************************************
     /* Unit tests
@@ -58,4 +68,11 @@ public void testBeanTransient() throws Exception
         assertEquals(aposToQuotes("{'y':4}"),
                 MAPPER.writeValueAsString(new BeanTransient()));
     }
+
+    // for [databind#1184]
+    public void testOverridingTransient() throws Exception
+    {
+        assertEquals(aposToQuotes("{'value':38}"),
+                MAPPER.writeValueAsString(new OverridableTransient(38)));
+    }
 }