From edcc345516b7afb522402bed2840113cb719184e Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Mon, 8 Sep 2014 22:38:38 -0700 Subject: [PATCH 1/3] Javadoc fix (#534) --- .../com/fasterxml/jackson/databind/DeserializationFeature.java | 2 +- .../jackson/databind/ser/std/AsArraySerializerBase.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/com/fasterxml/jackson/databind/DeserializationFeature.java b/src/main/java/com/fasterxml/jackson/databind/DeserializationFeature.java index 64662caa38..080867112d 100644 --- a/src/main/java/com/fasterxml/jackson/databind/DeserializationFeature.java +++ b/src/main/java/com/fasterxml/jackson/databind/DeserializationFeature.java @@ -246,7 +246,7 @@ public enum DeserializationFeature implements ConfigFeature * kinds of JSON values); if enable, empty JSON String can be taken * to be equivalent of JSON null. *

- * Feature is enabled by default. + * Feature is disabled by default. */ ACCEPT_EMPTY_STRING_AS_NULL_OBJECT(false), diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/AsArraySerializerBase.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/AsArraySerializerBase.java index ada854cfab..5e0676392d 100644 --- a/src/main/java/com/fasterxml/jackson/databind/ser/std/AsArraySerializerBase.java +++ b/src/main/java/com/fasterxml/jackson/databind/ser/std/AsArraySerializerBase.java @@ -1,7 +1,6 @@ package com.fasterxml.jackson.databind.ser.std; import java.io.IOException; -import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import com.fasterxml.jackson.core.*; @@ -15,7 +14,6 @@ import com.fasterxml.jackson.databind.ser.ContainerSerializer; import com.fasterxml.jackson.databind.ser.ContextualSerializer; import com.fasterxml.jackson.databind.ser.impl.PropertySerializerMap; -import com.fasterxml.jackson.databind.type.TypeFactory; /** * Base class for serializers that will output contents as JSON From 2dde6452a68fc696bdb716a841a5faad9e23fa06 Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Wed, 10 Sep 2014 19:51:05 -0700 Subject: [PATCH 2/3] update parent pom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c0c9f9d3ac..b8755af6b9 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.fasterxml.jackson jackson-parent - 2.5-SNAPSHOT + 2.5-rc1 com.fasterxml.jackson.core From 52dc7c0365c53dab018a9bed0c92a86b502b87e3 Mon Sep 17 00:00:00 2001 From: Marcus Date: Sat, 13 Sep 2014 11:50:06 +0200 Subject: [PATCH 3/3] Update README.md Fix broken wiki link. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 64bc22e8e2..cd501360f4 100644 --- a/README.md +++ b/README.md @@ -376,7 +376,7 @@ Main differences compared to 1.0 "mapper" jar are: # Further reading -* [Documentation](https://github.com/FasterXML/jackson-databind/wiki/Documentation) +* [Documentation](https://github.com/FasterXML/jackson-databind/wiki) Related: