Update release notes wrt #2925, minor test reorg

cowtowncoder · cowtowncoder · commit 627d1188f709 · 2020-11-08T18:27:42.000-08:00
diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x
@@ -982,7 +982,7 @@ David Connelly (dconnelly@github)
 XakepSDK@github
   * Reported #2458: `Nulls` property metadata ignored for creators
    (2.10.0)
-  * Contributed #2913: Make some java platform modules optional
+  * Contributed #2910: Make some java platform modules optional
    (2.12.0)
 
 Wahey (KevynBct@github)
@@ -1262,3 +1262,7 @@ Sergiy Yevtushenko (siy@github)
   * Contributed #2879: Add support for disabling special handling of "Creator properties" wrt
     alphabetic property ordering
   (2.12.0)
+
+M Rizky Satrio (rsatrio@github)
+  * Contributed #2925: Add support for `java.sql.Blob`
+   (2.12.0)
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -31,8 +31,10 @@ Project: jackson-databind
 #2903: Allow preventing "Enum from integer" coercion using new `CoercionConfig` system
 #2909: `@JsonValue` not considered when evaluating inclusion
  (reported by chrylis@github)
-#2913: Make some java platform modules optional
+#2910: Make some java platform modules optional
  (contributed by XakepSDK@github)
+#2925: Add support for `java.sql.Blob`
+ (contributed by M Rizky S)
 - Full "LICENSE" included in jar for easier access by compliancy tools
 
 2.12.0-rc1 (12-Oct-2020)
diff --git a/src/main/java/com/fasterxml/jackson/databind/ext/OptionalHandlerFactory.java b/src/main/java/com/fasterxml/jackson/databind/ext/OptionalHandlerFactory.java
@@ -3,13 +3,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import com.fasterxml.jackson.databind.BeanDescription;
-import com.fasterxml.jackson.databind.DeserializationConfig;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializationConfig;
+import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.deser.Deserializers;
 import com.fasterxml.jackson.databind.ser.Serializers;
 import com.fasterxml.jackson.databind.ser.std.DateSerializer;
@@ -103,7 +97,7 @@ protected OptionalHandlerFactory() {
         _sqlDeserializers.put(CLS_NAME_JAVA_SQL_TIMESTAMP,
                 "com.fasterxml.jackson.databind.deser.std.DateDeserializers$TimestampDeserializer");
         _sqlDeserializers.put(CLS_NAME_JAVA_SQL_BLOB,
-                "com.fasterxml.jackson.databind.deser.std.SqlBlobDeserializer");
+                "com.fasterxml.jackson.databind.ext.SqlBlobDeserializer");
 
         _sqlSerializers = new HashMap<>();
         // 09-Jan-2015, tatu: As per [databind#1073], let's try to guard against possibility
@@ -113,8 +107,8 @@ protected OptionalHandlerFactory() {
         _sqlSerializers.put(CLS_NAME_JAVA_SQL_TIMESTAMP, DateSerializer.instance);
         _sqlSerializers.put(CLS_NAME_JAVA_SQL_DATE, "com.fasterxml.jackson.databind.ser.std.SqlDateSerializer");
         _sqlSerializers.put(CLS_NAME_JAVA_SQL_TIME, "com.fasterxml.jackson.databind.ser.std.SqlTimeSerializer");
-        _sqlSerializers.put(CLS_NAME_JAVA_SQL_BLOB, "com.fasterxml.jackson.databind.ser.std.SqlBlobSerializer");
-        _sqlSerializers.put(CLS_NAME_JAVA_SQL_SERIALBLOB, "com.fasterxml.jackson.databind.ser.std.SqlBlobSerializer");
+        _sqlSerializers.put(CLS_NAME_JAVA_SQL_BLOB, "com.fasterxml.jackson.databind.ext.SqlBlobSerializer");
+        _sqlSerializers.put(CLS_NAME_JAVA_SQL_SERIALBLOB, "com.fasterxml.jackson.databind.ext.SqlBlobSerializer");
     }
 
     /*
diff --git a/src/main/java/com/fasterxml/jackson/databind/ext/SqlBlobDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/ext/SqlBlobDeserializer.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.deser.std;
+package com.fasterxml.jackson.databind.ext;
 
 import java.io.IOException;
 import java.sql.Blob;
@@ -10,6 +10,7 @@
 import com.fasterxml.jackson.core.Base64Variants;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.deser.std.FromStringDeserializer;
 import com.fasterxml.jackson.databind.exc.InvalidFormatException;
 
 
diff --git a/src/main/java/com/fasterxml/jackson/databind/ext/SqlBlobSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ext/SqlBlobSerializer.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.ser.std;
+package com.fasterxml.jackson.databind.ext;
 
 import java.io.IOException;
 import java.sql.Blob;
@@ -9,6 +9,7 @@
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
+import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer;
 
 /**
  * This is serializer for {@link java.sql.Blob}  into base64 String
diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/jdk/DateDeserializationTest.java b/src/test/java/com/fasterxml/jackson/databind/deser/jdk/DateDeserializationTest.java
@@ -782,18 +782,9 @@ public void testInvalidFormat() throws Exception
 
     private String dateToString(java.util.Date value)
     {
-        /* Then from String. This is bit tricky, since JDK does not really
-         * suggest a 'standard' format. So let's try using something...
-         */
+        // Then from String. This is bit tricky, since JDK does not really
+        // suggest a 'standard' format. So let's try using something...
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
         return df.format(value);
     }
-
-    private static Calendar gmtCalendar(long time)
-    {
-        Calendar c = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
-        c.setTimeInMillis(time);
-        return c;
-    }
-
 }
diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/jdk/Java6CollectionsDeserTest.java b/src/test/java/com/fasterxml/jackson/databind/deser/jdk/Java6CollectionsDeserTest.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.ext;
+package com.fasterxml.jackson.databind.deser.jdk;
 
 import java.util.Deque;
 import java.util.NavigableSet;
@@ -9,7 +9,7 @@
  * Tests to ensure that we can handle 1.6-only types, even if
  * registrations are done without direct refs
  */
-public class TestJava6Types extends com.fasterxml.jackson.databind.BaseMapTest
+public class Java6CollectionsDeserTest extends com.fasterxml.jackson.databind.BaseMapTest
 {
     // for [databind#216]
     public void test16Types() throws Exception
diff --git a/src/test/java/com/fasterxml/jackson/databind/ext/DOMTypeReadWriteTest.java b/src/test/java/com/fasterxml/jackson/databind/ext/DOMTypeReadWriteTest.java
@@ -8,7 +8,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-public class TestDOM extends com.fasterxml.jackson.databind.BaseMapTest
+public class DOMTypeReadWriteTest extends com.fasterxml.jackson.databind.BaseMapTest
 {
     final static String SIMPLE_XML =
         "<root attr='3'><leaf>Rock &amp; Roll!</leaf><?proc instr?></root>";
diff --git a/src/test/java/com/fasterxml/jackson/databind/ext/MiscJavaXMLTypesReadWriteTest.java b/src/test/java/com/fasterxml/jackson/databind/ext/MiscJavaXMLTypesReadWriteTest.java
@@ -11,10 +11,8 @@
  * since some Java(-like) platforms do not include them: specifically, Google AppEngine
  * and Android seem to skimp on their inclusion. As such, they are dynamically loaded
  * only as needed, and need bit special handling.
- * 
- * @author tatu
  */
-public class TestCoreXMLTypes
+public class MiscJavaXMLTypesReadWriteTest
     extends BaseMapTest
 {
     /*
diff --git a/src/test/java/com/fasterxml/jackson/databind/ext/SqlBlobSerializationTest.java b/src/test/java/com/fasterxml/jackson/databind/ext/SqlBlobSerializationTest.java
@@ -1,11 +1,9 @@
 package com.fasterxml.jackson.databind.ext;
 
 import java.sql.Blob;
-import java.util.Base64;
 
 import javax.sql.rowset.serial.SerialBlob;
 
-import com.fasterxml.jackson.core.Base64Variant;
 import com.fasterxml.jackson.core.Base64Variants;
 import com.fasterxml.jackson.databind.BaseMapTest;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -14,7 +12,6 @@
 public class SqlBlobSerializationTest extends BaseMapTest
 {
     static class BlobObject {
-        //        @JsonSerialize(using=SqlBlobSerializer.class)
         Blob sqlBlob1;
 
         public Blob getSqlBlob1() {
@@ -24,28 +21,25 @@ public Blob getSqlBlob1() {
         public void setSqlBlob1(Blob sqlBlob1) {
             this.sqlBlob1 = sqlBlob1;
         }
-
-
     } 
 
     /*
     /**********************************************************
     /* Test methods
     /**********************************************************
      */
-    public void testSqlBlobSerializer() throws Exception    {
-        ObjectMapper m = new ObjectMapper();
-        String testWord="TestObject1";
-        SerialBlob blob1=new SerialBlob(testWord.getBytes());
-        String base64Blob=Base64Variants.getDefaultVariant().encode(testWord.getBytes());
-
 
-        BlobObject obj1=new BlobObject();
-        obj1.sqlBlob1=blob1;
+    public void testSqlBlobSerializer() throws Exception
+    {
+        ObjectMapper m = newJsonMapper();
+        String testWord = "TestObject1";
+        SerialBlob blob1 = new SerialBlob(testWord.getBytes());
+        String base64Blob = Base64Variants.getDefaultVariant().encode(testWord.getBytes());
 
-        String json=m.writeValueAsString(obj1);
-        assertEquals("{\"sqlBlob1\":\""+base64Blob+"\"}", json);
 
+        BlobObject obj1 = new BlobObject();
+        obj1.sqlBlob1 = blob1;
 
+        assertEquals("{\"sqlBlob1\":"+q(base64Blob)+"}", m.writeValueAsString(obj1));
     }
 }
diff --git a/src/test/java/com/fasterxml/jackson/databind/ser/GenericTypeSerializationTest.java b/src/test/java/com/fasterxml/jackson/databind/ser/GenericTypeSerializationTest.java
@@ -288,9 +288,9 @@ public static <F extends StringStubSubclass, FF> GenericSpecificityWrapper1<F, F
     }
 
     public static class StringStub {
-        private final String value;
+        final String value;
 
-        private StringStub(String value) {
+        StringStub(String value) {
             this.value = value;
         }
 
@@ -337,7 +337,7 @@ public static <F extends Stub<StringStubSubclass>, FF> GenericSpecificityWrapper
     }
 
     public static class Stub<T> {
-        private final T value;
+        final T value;
 
         private Stub(T value) {
             this.value = value;
@@ -373,9 +373,9 @@ public GG second() {
         }
     }
 
-    public static class SimpleWrapper<T> {
-
-        private final T value;
+    public static class SimpleWrapper<T>
+    {
+        final T value;
 
         SimpleWrapper(T value) {
             this.value = value;
@@ -388,11 +388,10 @@ public static <T> SimpleWrapper<T> fromJson(JsonSimpleWrapper<T> value) {
     }
 
     @JsonDeserialize
-    public static final class JsonSimpleWrapper<T> {
-
+    public static final class JsonSimpleWrapper<T>
+    {
         @JsonProperty("object")
         public T object;
-
     }
 
     /*
diff --git a/src/test/java/com/fasterxml/jackson/databind/struct/FormatFeatureAcceptSingleTest.java b/src/test/java/com/fasterxml/jackson/databind/struct/FormatFeatureAcceptSingleTest.java
@@ -60,7 +60,7 @@ static class StringListWrapper {
     static class StringListWrapperWithBuilder {
         public final List<String> values;
 
-        private StringListWrapperWithBuilder(List<String> values) {
+        StringListWrapperWithBuilder(List<String> values) {
             this.values = values;
         }
 
@@ -102,7 +102,7 @@ static class RolesInList {
     static class RolesInListWithBuilder {
         public final List<Role> roles;
 
-        private RolesInListWithBuilder(List<Role> roles) {
+        RolesInListWithBuilder(List<Role> roles) {
             this.roles = roles;
         }
 
@@ -137,7 +137,7 @@ static class Role {
 
     @JsonDeserialize
     static class WrapperWithStringFactory {
-        private final Role role;
+        final Role role;
 
         private WrapperWithStringFactory(Role role) {
             this.role = role;
@@ -152,7 +152,7 @@ static WrapperWithStringFactory from(String value) {
         }
     }
 
-    private final ObjectMapper MAPPER = new ObjectMapper();
+    private final ObjectMapper MAPPER = newJsonMapper();
 
     /*
     /**********************************************************

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`import com.fasterxml.jackson.databind.ObjectMapper;`
`10`	`10`
`11`		`-public class TestDOM extends com.fasterxml.jackson.databind.BaseMapTest`
	`11`	`+public class DOMTypeReadWriteTest extends com.fasterxml.jackson.databind.BaseMapTest`
`12`	`12`	`{`
`13`	`13`	`final static String SIMPLE_XML =`
`14`	`14`	`"<root attr='3'><leaf>Rock & Roll!</leaf><?proc instr?></root>";`