Merge branch '2.5' into 2.6

Conflicts:
	release-notes/VERSION
	src/test/java/com/fasterxml/jackson/databind/ser/DateSerializationTest.java

Author: cowtowncoder

release-notes/VERSION

@@ -9,6 +9,8 @@ Project: jackson-databind
 #1052: Don't generate a spurious NullNode after parsing an embedded object
  (reported by philipa@github)
 #1061: Problem with Object Id and Type Id as Wrapper Object (regression in 2.5.1)
+#1073: Add try-catch around `java.sql` type serializers
+ (suggested by claudemt@github)
 
 2.6.4 (07-Dec-2015)
 

src/main/java/com/fasterxml/jackson/databind/ser/BasicSerializerFactory.java

@@ -83,14 +83,7 @@ public abstract class BasicSerializerFactory
         // Other discrete non-container types:
         // First, Date/Time zoo:
         _concrete.put(Calendar.class.getName(), CalendarSerializer.instance);
-        DateSerializer dateSer = DateSerializer.instance;
-        _concrete.put(java.util.Date.class.getName(), dateSer);
-        // note: timestamps are very similar to java.util.Date, thus serialized as such
-        _concrete.put(java.sql.Timestamp.class.getName(), dateSer);
-        
-        // leave some of less commonly used ones as lazy, no point in proactive construction
-        _concreteLazy.put(java.sql.Date.class.getName(), SqlDateSerializer.class);
-        _concreteLazy.put(java.sql.Time.class.getName(), SqlTimeSerializer.class);
+        _concrete.put(java.util.Date.class.getName(), DateSerializer.instance);
 
         // And then other standard non-structured JDK types
         for (Map.Entry<Class<?>,Object> en : StdJdkSerializers.all()) {

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

@@ -21,9 +21,9 @@ public class SqlTimeSerializer
     public SqlTimeSerializer() { super(java.sql.Time.class); }
 
     @Override
-    public void serialize(java.sql.Time value, JsonGenerator jgen, SerializerProvider provider) throws IOException
+    public void serialize(java.sql.Time value, JsonGenerator g, SerializerProvider provider) throws IOException
     {
-        jgen.writeString(value.toString());
+        g.writeString(value.toString());
     }
 
     @Override

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

@@ -53,6 +53,19 @@ public static Collection<Map.Entry<Class<?>, Object>> all()
         sers.put(Void.class, NullSerializer.instance);
         sers.put(Void.TYPE, NullSerializer.instance);
 
+        // 09-Jan-2015, tatu: As per [databind#1073], let's try to guard against possibility
+        //   of some environments missing `java.sql.` types
+        try {
+            // note: timestamps are very similar to java.util.Date, thus serialized as such
+            sers.put(java.sql.Timestamp.class, DateSerializer.instance);
+    
+            // leave some of less commonly used ones as lazy, no point in proactive construction
+            sers.put(java.sql.Date.class, SqlDateSerializer.class);
+            sers.put(java.sql.Time.class, SqlTimeSerializer.class);
+        } catch (NoClassDefFoundError e) {
+            // nothing much we can do here; could log, but probably not useful for now.
+        }
+        
         return sers.entrySet();
     }
 

src/test/java/com/fasterxml/jackson/databind/ser/DateSerializationTest.java

@@ -116,7 +116,16 @@ public void testSqlTime() throws IOException
         // does use is quite simple:
         assertEquals(quote(time.toString()), MAPPER.writeValueAsString(time));
     }
-    
+
+    public void testSqlTimestamp() throws IOException
+    {
+        java.sql.Timestamp input = new java.sql.Timestamp(0L);
+        // just should produce same output as standard `java.util.Date`:
+        Date altTnput = new Date(0L);
+        assertEquals(MAPPER.writeValueAsString(altTnput),
+                MAPPER.writeValueAsString(input));
+    }
+
     public void testTimeZone() throws IOException
     {
         TimeZone input = TimeZone.getTimeZone("PST");