Merge pull request #41 from vadeg/featute/postgres-driver-and-spring-update

Update postgres driver and spring versions.

Author: vadeg

.travis.yml

@@ -1,12 +1,13 @@
 language: java
 
 jdk:
-    - openjdk7
-    - oraclejdk7
+    - openjdk8
     - oraclejdk8
+      
+dist: trusty
 
 addons:
-    postgresql: "9.5"
+    postgresql: "9.6"
 
 # go faster on travis
 sudo: false

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>
@@ -73,8 +72,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.5.1</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
             <plugin>

src/main/java/de/zalando/sprocwrapper/proxy/OtherStoredProcedureParameter.java

@@ -1,32 +1,44 @@
 package de.zalando.sprocwrapper.proxy;
 
 import java.lang.reflect.Method;
-
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.UUID;
 
 import org.postgresql.util.PGobject;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 import de.zalando.typemapper.postgres.PgTypeHelper;
 
 /**
- * @author  jmussler
+ * @author jmussler
  */
 class OtherStoredProcedureParameter extends StoredProcedureParameter {
     private static final Logger LOG = LoggerFactory.getLogger(OtherStoredProcedureParameter.class);
 
     public OtherStoredProcedureParameter(final Class<?> clazz, final Method m, final String typeName, final int sqlType,
-            final int javaPosition, final boolean sensitive) {
+                                         final int javaPosition, final boolean sensitive) {
         super(clazz, m, typeName, sqlType, javaPosition, sensitive);
     }
 
     @Override
     public Object mapParam(final Object value, final Connection connection) {
         if (value == null) {
+            if (clazz.isEnum()) {
+                /*
+                * In situation when there is null value passed as an argument and
+                * argument type maps to custom database type which inherited from ENUM
+                * sql type "OTHER" will fallback to sql type "VARCHAR" what will cause an exception
+                 *  "No function matches the given name and argument types. You might need to add explicit type casts."
+                  *  That happens because SP expects custom type but not VARCHAR
+                 *
+                */
+                final PGobject pgobj = new PGobject();
+                pgobj.setType(typeName);
+                return pgobj;
+            }
             return null;
         }
 

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

@@ -1,50 +1,39 @@
 package de.zalando.sprocwrapper;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
 import java.math.BigDecimal;
-
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.sql.Timestamp;
-
 import java.text.SimpleDateFormat;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
-
 import javax.sql.DataSource;
-
 import javax.validation.ConstraintViolationException;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 import org.joda.time.DateTime;
-
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
-
 import org.junit.runner.RunWith;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-
 import org.springframework.jdbc.core.JdbcTemplate;
-
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
 
 import de.zalando.sprocwrapper.example.AddressPojo;
 import de.zalando.sprocwrapper.example.Example1DomainObject1;
@@ -77,7 +66,6 @@
 import de.zalando.sprocwrapper.example.TestInheritanceChild;
 import de.zalando.sprocwrapper.example.WrapperLookupSchema;
 import de.zalando.sprocwrapper.example.WrapperOptionalLookupType;
-
 import de.zalando.typemapper.parser.DateTimeUtil;
 
 @RunWith(SpringJUnit4ClassRunner.class)
@@ -574,11 +562,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();
@@ -1088,4 +1076,14 @@ public void testSQLUpdate() {
         assertTrue(l1.size() == 1);
         assertTrue(l2.size() == 0);
     }
+
+    @Test
+    public void testNullComplexParam() throws Exception {
+        exampleSProcService.createOrder(null);
+    }
+
+    @Test
+    public void testNullEnumParam() {
+        exampleSProcService.useEnumParam(null);
+    }
 }