Update postgres version to 42.1.1

Update spring version to 4.3.8
Update pom version to 2.0.0-SNAPSHOT
Fix integration test to support new postgres driver version.

Author: vadeg

pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <groupId>de.zalando</groupId>
     <artifactId>zalando-sprocwrapper</artifactId>
-    <version>1.5.2-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Stored Procedure Wrapper</name>
     <description>Library to make PostgreSQL stored procedures available through simple Java "*SProcService" interfaces including automatic object serialization and deserialization (using typemapper and convention-over-configuration). Supports sharding, advisory locking, statement timeouts and PostgreSQL types such as enums and hstore.</description>
@@ -61,9 +61,8 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <spring.version>3.2.3.RELEASE</spring.version>
-        <postgresql.version>9.3-1102-jdbc41</postgresql.version>
-
+        <spring.version>4.3.8.RELEASE</spring.version>
+        <postgresql.version>42.1.1</postgresql.version>
     </properties>
 
     <build>

src/main/java/de/zalando/typemapper/core/TypeMapper.java

@@ -1,36 +1,25 @@
 package de.zalando.typemapper.core;
 
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-
-import java.util.List;
-import java.util.Map;
-
-import org.postgresql.jdbc4.Jdbc4Array;
-import org.postgresql.jdbc4.Jdbc4ResultSet;
-
-import org.postgresql.util.PGobject;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.springframework.jdbc.core.RowMapper;
-
 import de.zalando.typemapper.core.db.DbFunction;
 import de.zalando.typemapper.core.db.DbFunctionRegister;
 import de.zalando.typemapper.core.db.DbTypeField;
 import de.zalando.typemapper.core.fieldMapper.ArrayFieldMapper;
 import de.zalando.typemapper.core.fieldMapper.ObjectFieldMapper;
-import de.zalando.typemapper.core.result.ArrayResultNode;
-import de.zalando.typemapper.core.result.DbResultNode;
-import de.zalando.typemapper.core.result.DbResultNodeType;
-import de.zalando.typemapper.core.result.MapResultNode;
-import de.zalando.typemapper.core.result.ObjectResultNode;
-import de.zalando.typemapper.core.result.ResultTree;
-import de.zalando.typemapper.core.result.SimpleResultNode;
+import de.zalando.typemapper.core.result.*;
 import de.zalando.typemapper.parser.exception.RowParserException;
 import de.zalando.typemapper.parser.postgres.ParseUtils;
+import org.postgresql.jdbc.PgArray;
+import org.postgresql.jdbc.PgResultSet;
+import org.postgresql.util.PGobject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.jdbc.core.RowMapper;
+
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.util.List;
+import java.util.Map;
 
 public class TypeMapper<ITEM> implements RowMapper<ITEM> {
 
@@ -76,7 +65,7 @@ private ResultTree extractResultTree(final ResultSet set) throws SQLException {
         LOG.trace("Extracting result tree");
 
         // cast to obtain more information from the result set.
-        final Jdbc4ResultSet pgSet = set.unwrap(Jdbc4ResultSet.class);
+        final PgResultSet pgSet = set.unwrap(PgResultSet.class);
         final ResultSetMetaData rsMetaData = pgSet.getMetaData();
 
         final ResultTree tree = new ResultTree();
@@ -126,8 +115,8 @@ private ResultTree extractResultTree(final ResultSet set) throws SQLException {
                 final PGobject pgObj = (PGobject) obj;
                 node = new ObjectResultNode(pgObj.getValue(), name, pgObj.getType(), typeId,
                         pgSet.getStatement().getConnection());
-            } else if (obj instanceof Jdbc4Array) {
-                final Jdbc4Array arrayObj = (Jdbc4Array) obj;
+            } else if (obj instanceof PgArray) {
+                final PgArray arrayObj = (PgArray) obj;
 
                 // TODO pribeiro jdbc driver lacks support for arrays of user defined types. We should whether
                 // implement the missing feature in driver or use the current approach (parse string).

src/main/java/de/zalando/typemapper/core/fieldMapper/DateFieldMapper.java

@@ -4,7 +4,7 @@
 import java.sql.SQLException;
 import java.sql.Timestamp;
 
-import org.postgresql.jdbc2.PostgresJDBCDriverReusedTimestampUtils;
+import org.postgresql.jdbc.PostgresJDBCDriverReusedTimestampUtils;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/de/zalando/typemapper/postgres/PgTypeHelper.java

@@ -14,7 +14,7 @@
 
 import org.postgresql.core.BaseConnection;
 
-import org.postgresql.jdbc2.PostgresJDBCDriverReusedTimestampUtils;
+import org.postgresql.jdbc.PostgresJDBCDriverReusedTimestampUtils;
 
 import org.postgresql.util.PGobject;
 

src/main/java/org/postgresql/jdbc2/PostgresJDBCDriverReusedTimestampUtils.java renamed to src/main/java/org/postgresql/jdbc/PostgresJDBCDriverReusedTimestampUtils.java

@@ -1,13 +1,22 @@
-package org.postgresql.jdbc2;
+package org.postgresql.jdbc;
+
+import org.postgresql.core.Provider;
+
+import java.util.TimeZone;
 
 /**
  * Helper class to reuse TimestampUtils from the postgres jdbc-driver. Must be placed in org.postgresql.jdbc2 package
  * because of package based constructor
  *
- * @author  wolters
+ * @author wolters
  */
 public class PostgresJDBCDriverReusedTimestampUtils extends TimestampUtils {
     public PostgresJDBCDriverReusedTimestampUtils() {
-        super(true, true, false);
+        super(false, new Provider<TimeZone>() {
+            @Override
+            public TimeZone get() {
+                return TimeZone.getDefault();
+            }
+        });
     }
 }

src/test/java/de/zalando/sprocwrapper/SimpleIT.java

@@ -574,11 +574,11 @@ public void testRuntime() {
 
         final String sql = "SELECT ";
 
-        final int xx = (new JdbcTemplate(dataSource1)).queryForInt(sql + 11111);
+        final int xx = (new JdbcTemplate(dataSource1)).queryForObject(sql + 11111, Integer.class);
 
         final long startTime = System.currentTimeMillis();
         for (int i = 0; i < loops; i++) {
-            final int j = (new JdbcTemplate(dataSource1)).queryForInt(sql + i);
+            final int j = (new JdbcTemplate(dataSource1)).queryForObject(sql + i, Integer.class);
         }
 
         final long endTime = System.currentTimeMillis();

src/test/java/de/zalando/typemapper/postgres/PgSerializerTest.java

@@ -9,6 +9,7 @@
 
 import java.sql.SQLException;
 
+import java.time.Instant;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Date;
@@ -61,8 +62,9 @@ public PgSerializerTest(final Object objectToSerialize, final Object expected) {
     public static Collection<Object[]> generateData() throws SQLException {
         return Arrays.asList(
                 new Object[][] {
-                    {new Date(112, 11, 1, 6, 6, 6), Pattern.compile("2012-12-01 06:06:06.000000 [+-]?\\d{2}:\\d{2}:00")},
-                    {new Date(112, 9, 1, 6, 6, 6), Pattern.compile("2012-10-01 06:06:06.000000 [+-]?\\d{2}:\\d{2}:00")},
+                    {new Date(112, 11, 1, 6, 6, 6), Pattern.compile("2012-12-01 06:06:06[+-]?\\d{2}")},
+                    {new Date(112, 9, 1, 6, 6, 6), Pattern.compile("2012-10-01 06:06:06[+-]?\\d{2}")},
+                    {Date.from(Instant.parse("2017-05-14T12:34:56.123456789Z")), Pattern.compile("2017-05-14 14:34:56.123000[+-]?\\d{2}")},
                     {1, "1"},
                     {69, "69"},
                     {true, "t"},

src/test/java/de/zalando/typemapper/postgres/PgSerializerToDatabaseTestIT.java

@@ -196,10 +196,10 @@ public static Collection<Object[]> generateData() throws SQLException {
                     },
 
                     /* 20 */
-                    {new Date(112, 11, 1, 6, 6, 6), "2012-12-01 06:06:06.000000 +01:00:00", Types.TIMESTAMP},
+                    {new Date(112, 11, 1, 6, 6, 6), "2012-12-01 06:06:06+01", Types.TIMESTAMP},
 
                     /* 21 */
-                    {new Date(112, 9, 1, 6, 6, 6), "2012-10-01 06:06:06.000000 +02:00:00", Types.TIMESTAMP},
+                    {new Date(112, 9, 1, 6, 6, 6), "2012-10-01 06:06:06+02", Types.TIMESTAMP},
 
                     /* 22 */
                     {PgTypeHelper.asPGobject(new InheritedClassWithPrimitives(1L, "1", 12)), "(1,12,1)", Types.OTHER},