Merge pull request #76 from zalando-stups/update-code-for-pg13-pgjdb-java11

vadeg · web-flow · commit 995106a441a8 · 2021-03-19T12:30:52.000+01:00
Update code for pg13 pgjdbc java11
diff --git a/.gitignore b/.gitignore
@@ -2,8 +2,14 @@
 *.iml
 .idea/
 
+# vscoode
+.project
+.settings/
+
 ### Maven ###
 target/
 /.mvn/wrapper/*.jar
 
 *.log
+.classpath
+
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ language: java
 sudo: false
 
 jdk:
-  - openjdk8
+  - openjdk11
 
 addons:
     postgresql: "13"
diff --git a/src/main/java/org/zalando/sprocwrapper/dsprovider/BitmapShardDataSourceProvider.java b/src/main/java/org/zalando/sprocwrapper/dsprovider/BitmapShardDataSourceProvider.java
@@ -75,7 +75,7 @@ public BitmapShardDataSourceProvider(final Map<String, DataSource> connectionDat
 
     public BitmapShardDataSourceProvider(final Class<? extends DataSource> dataSourceClass,
             final Map<String, String> commonDataSourceProperties, final Map<String, String> connectionUrls)
-        throws InstantiationException, IllegalAccessException, InvocationTargetException {
+        throws InstantiationException, IllegalAccessException, InvocationTargetException, SecurityException, NoSuchMethodException {
 
         int maskLength = 0;
         for (final Entry<String, String> entry : connectionUrls.entrySet()) {
@@ -88,7 +88,7 @@ public BitmapShardDataSourceProvider(final Class<? extends DataSource> dataSourc
         dataSources = new DataSource[1 << maskLength];
 
         for (final Entry<String, String> entry : connectionUrls.entrySet()) {
-            final DataSource ds = dataSourceClass.newInstance();
+            final DataSource ds = dataSourceClass.getDeclaredConstructor().newInstance();
             for (final Entry<String, String> prop : commonDataSourceProperties.entrySet()) {
                 BeanUtils.setProperty(ds, prop.getKey(), prop.getValue());
             }
diff --git a/src/main/java/org/zalando/sprocwrapper/globalobjecttransformer/GlobalObjectTransformerLoader.java b/src/main/java/org/zalando/sprocwrapper/globalobjecttransformer/GlobalObjectTransformerLoader.java
@@ -11,6 +11,7 @@
 import org.reflections.util.ClasspathHelper;
 import org.reflections.util.ConfigurationBuilder;
 import org.reflections.util.FilterBuilder;
+import java.lang.reflect.InvocationTargetException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,7 +34,7 @@ public class GlobalObjectTransformerLoader {
     private static volatile ImmutableMap<Class<?>, ObjectMapper<?>> register;
 
     public static <T> ObjectMapper<T> getObjectMapperForClass(final Class<T> genericType) throws InstantiationException,
-        IllegalAccessException {
+        IllegalAccessException, InvocationTargetException, SecurityException, IllegalArgumentException, NoSuchMethodException {
         Preconditions.checkNotNull(genericType, "genericType");
 
         // performance improvement. Volatile field is read only once in the commons scenario.
@@ -55,15 +56,15 @@ public static <T> ObjectMapper<T> getObjectMapperForClass(final Class<T> generic
     }
 
     private static ImmutableMap<Class<?>, ObjectMapper<?>> buildMappers() throws InstantiationException,
-        IllegalAccessException {
+        IllegalAccessException, InvocationTargetException, SecurityException, IllegalArgumentException, NoSuchMethodException {
 
         final Map<Class<?>, ObjectMapper<?>> mappers = new HashMap<>();
 
         for (final Class<?> foundGlobalObjectTransformer : findObjectMappers()) {
 
             if (ObjectMapper.class.isAssignableFrom(foundGlobalObjectTransformer)) {
 
-                final ObjectMapper<?> mapper = (ObjectMapper<?>) foundGlobalObjectTransformer.newInstance();
+                final ObjectMapper<?> mapper = (ObjectMapper<?>) foundGlobalObjectTransformer.getDeclaredConstructor().newInstance();
                 final Class<?> valueTransformerReturnType = mapper.getType();
 
                 final ObjectMapper<?> previousMapper = mappers.put(valueTransformerReturnType, mapper);
diff --git a/src/main/java/org/zalando/sprocwrapper/globalvaluetransformer/GlobalValueTransformerLoader.java b/src/main/java/org/zalando/sprocwrapper/globalvaluetransformer/GlobalValueTransformerLoader.java
@@ -1,5 +1,6 @@
 package org.zalando.sprocwrapper.globalvaluetransformer;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.Set;
 
 import org.reflections.Reflections;
@@ -33,7 +34,7 @@ public class GlobalValueTransformerLoader {
     private static boolean scannedClasspath = false;
 
     public static synchronized ValueTransformer<?, ?> getValueTransformerForClass(final Class<?> genericType)
-        throws InstantiationException, IllegalAccessException {
+        throws InstantiationException, IllegalAccessException, InvocationTargetException, NoSuchMethodException {
 
         // did we already scanned the classpath for global value transformers?
         if (scannedClasspath == false) {
@@ -71,7 +72,7 @@ public boolean apply(final String input) {
                         valueTransformerReturnType = ValueTransformerUtils.getUnmarshalFromDbClass(
                                 foundGlobalValueTransformer);
                         GlobalValueTransformerRegistry.register(valueTransformerReturnType,
-                            (ValueTransformer<?, ?>) foundGlobalValueTransformer.newInstance());
+                            (ValueTransformer<?, ?>) foundGlobalValueTransformer.getDeclaredConstructor().newInstance());
                     } catch (final RuntimeException e) {
                         LOG.error("Failed to add global transformer [{}] to global registry.",
                             foundGlobalValueTransformer, e);
diff --git a/src/main/java/org/zalando/sprocwrapper/proxy/GlobalValueTransformedParameter.java b/src/main/java/org/zalando/sprocwrapper/proxy/GlobalValueTransformedParameter.java
@@ -1,5 +1,6 @@
 package org.zalando.sprocwrapper.proxy;
 
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
 import java.sql.Connection;
@@ -25,7 +26,7 @@ public class GlobalValueTransformedParameter extends StoredProcedureParameter {
 
     public GlobalValueTransformedParameter(final ValueTransformer<?, ?> valueTransformerForClass, final Class<?> clazz,
             final Method m, final String typeName, final int javaPosition, final boolean sensitive,
-            final ObjectMapper<?> globalObjectMapper) throws InstantiationException, IllegalAccessException {
+            final ObjectMapper<?> globalObjectMapper) throws InstantiationException, IllegalAccessException, InvocationTargetException, SecurityException, IllegalArgumentException, NoSuchMethodException {
         super(getValueTransformedClazz(clazz, valueTransformerForClass), m, typeName, getValueTransformedTypeId(clazz),
             javaPosition, sensitive);
 
diff --git a/src/main/java/org/zalando/sprocwrapper/proxy/SProcCallHandler.java b/src/main/java/org/zalando/sprocwrapper/proxy/SProcCallHandler.java
@@ -11,6 +11,7 @@
 import org.springframework.jdbc.core.RowMapper;
 
 import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -41,8 +42,8 @@ List<Method> findSProcCallAnnotatedMethods(Class c) {
     private RowMapper getRowMapper(SProcCall scA) {
         if (scA.resultMapper() != Void.class) {
             try {
-                return (RowMapper<?>) scA.resultMapper().newInstance();
-            } catch (final InstantiationException | IllegalAccessException ex) {
+                return (RowMapper<?>) scA.resultMapper().getDeclaredConstructor().newInstance();
+            } catch (final InstantiationException | IllegalAccessException | SecurityException | InvocationTargetException | IllegalArgumentException | NoSuchMethodException ex) {
                 LOG.error("Result mapper for sproc can not be instantiated", ex);
                 throw new IllegalArgumentException("Result mapper for sproc can not be instantiated");
             }
@@ -113,8 +114,8 @@ public Map<Method, StoredProcedure> handle(Class c, SProcServiceAnnotationHandle
             VirtualShardKeyStrategy sprocStrategy = handlerResult.getShardKeyStrategy();
             if (scA.shardStrategy() != Void.class) {
                 try {
-                    sprocStrategy = (VirtualShardKeyStrategy) scA.shardStrategy().newInstance();
-                } catch (final InstantiationException | IllegalAccessException ex) {
+                    sprocStrategy = (VirtualShardKeyStrategy) scA.shardStrategy().getDeclaredConstructor().newInstance();
+                } catch (final InstantiationException | IllegalAccessException | SecurityException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException ex) {
                     LOG.error("Shard strategy for sproc can not be instantiated", ex);
                     throw new IllegalArgumentException("Shard strategy for sproc can not be instantiated");
                 }
@@ -153,7 +154,7 @@ public Map<Method, StoredProcedure> handle(Class c, SProcServiceAnnotationHandle
                         try {
                             params.add(StoredProcedureParameter.createParameter(clazz, genericType,
                                     method, dbTypeName, sParam.sqlType(), pos, sParam.sensitive()));
-                        } catch (final InstantiationException | IllegalAccessException e) {
+                        } catch (final InstantiationException | IllegalAccessException | NoSuchMethodException | IllegalArgumentException | SecurityException | InvocationTargetException e) {
                             LOG.error("Could not instantiate StoredProcedureParameter. ABORTING.", e);
                             throw new IllegalArgumentException("Could not instantiate StoredProcedureParameter. ABORTING.");
                         }
@@ -184,7 +185,7 @@ private StoredProcedure createStoredProcedure(SProcCall scA, SProcServiceAnnotat
                     writeTransaction);
 
             return storedProcedure;
-        } catch (final InstantiationException | IllegalAccessException e) {
+        } catch (final InstantiationException | IllegalAccessException | NoSuchMethodException | IllegalArgumentException | SecurityException | InvocationTargetException e) {
             LOG.error("Could not instantiate StoredProcedure. ABORTING.", e);
             throw new IllegalArgumentException("Could not instantiate StoredProcedure. ABORTING.");
         }
diff --git a/src/main/java/org/zalando/sprocwrapper/proxy/SProcServiceAnnotationHandler.java b/src/main/java/org/zalando/sprocwrapper/proxy/SProcServiceAnnotationHandler.java
@@ -1,6 +1,9 @@
 package org.zalando.sprocwrapper.proxy;
 import org.zalando.sprocwrapper.SProcService;
 import org.zalando.sprocwrapper.sharding.VirtualShardKeyStrategy;
+
+import java.lang.reflect.InvocationTargetException;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -58,8 +61,8 @@ public HandlerResult handle(final Class<?> c) {
         VirtualShardKeyStrategy keyStrategy;
 
         try {
-            keyStrategy = (VirtualShardKeyStrategy) serviceAnnotation.shardStrategy().newInstance();
-        } catch (final InstantiationException | IllegalAccessException ex) {
+            keyStrategy = (VirtualShardKeyStrategy) serviceAnnotation.shardStrategy().getDeclaredConstructor().newInstance();
+        } catch (final NoSuchMethodException | InstantiationException | IllegalAccessException | SecurityException | IllegalArgumentException | InvocationTargetException ex) {
             LOG.error("ShardKey strategy for service can not be instantiated", ex);
             throw new IllegalArgumentException("ShardKey strategy for service can not be instantiated");
         }
diff --git a/src/main/java/org/zalando/sprocwrapper/proxy/StoredProcedure.java b/src/main/java/org/zalando/sprocwrapper/proxy/StoredProcedure.java
@@ -1,5 +1,6 @@
 package org.zalando.sprocwrapper.proxy;
 
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.ParameterizedType;
 
 import java.sql.Connection;
@@ -101,7 +102,7 @@ public StoredProcedure(final String name, final String query, final List<StoredP
                            final VirtualShardKeyStrategy sStrategy, final List<ShardKeyParameter> shardKeyParameters, final boolean runOnAllShards, final boolean searchShards,
                            final boolean parallel, final RowMapper<?> resultMapper, final long timeout,
                            final AdvisoryLock advisoryLock, final boolean useValidation, final boolean readOnly,
-                           final WriteTransaction writeTransaction) throws InstantiationException, IllegalAccessException {
+                           final WriteTransaction writeTransaction) throws InstantiationException, IllegalAccessException, InvocationTargetException, NoSuchMethodException {
         this.name = name;
         this.params = new ArrayList<>(params);
         this.types = createTypes(params);
diff --git a/src/main/java/org/zalando/sprocwrapper/proxy/StoredProcedureParameter.java b/src/main/java/org/zalando/sprocwrapper/proxy/StoredProcedureParameter.java
@@ -1,5 +1,6 @@
 package org.zalando.sprocwrapper.proxy;
 
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 
@@ -54,7 +55,7 @@ class StoredProcedureParameter {
 
     public static StoredProcedureParameter createParameter(final Class<?> clazz, final Type genericType, final Method m,
             final String typeName, final int sqlType, final int javaPosition, final boolean sensitive)
-        throws InstantiationException, IllegalAccessException {
+        throws InstantiationException, IllegalAccessException, NoSuchMethodException, InvocationTargetException, SecurityException, IllegalArgumentException {
 
         // first check if this is a globally mapped class
         ValueTransformer<?, ?> valueTransformerForClass = null;
diff --git a/src/main/java/org/zalando/sprocwrapper/sharding/ShardedDataAccessException.java b/src/main/java/org/zalando/sprocwrapper/sharding/ShardedDataAccessException.java
@@ -13,6 +13,8 @@
  */
 public class ShardedDataAccessException extends DataAccessException {
 
+    private static final long serialVersionUID = 1L;
+
     private final Map<Integer, Throwable> causes;
 
     /**
diff --git a/src/main/java/org/zalando/typemapper/core/Mapping.java b/src/main/java/org/zalando/typemapper/core/Mapping.java
@@ -183,7 +183,7 @@ public Field getField() {
     }
 
     public FieldMapper getFieldMapper() throws NotsupportedTypeException, InstantiationException,
-        IllegalAccessException {
+        IllegalAccessException, InvocationTargetException, SecurityException, IllegalArgumentException, NoSuchMethodException {
         if (fieldMapper == null) {
             final DatabaseFieldDescriptor databaseFieldDescriptor = getDatabaseFieldDescriptor(field);
             if ((databaseFieldDescriptor != null) && (databaseFieldDescriptor.getTransformer() != null)) {
@@ -200,7 +200,7 @@ public FieldMapper getFieldMapper() throws NotsupportedTypeException, Instantiat
     }
 
     public void map(final Object target, Object value) throws IllegalArgumentException, IllegalAccessException,
-        InvocationTargetException, InstantiationException {
+        InvocationTargetException, InstantiationException, SecurityException, IllegalArgumentException, NoSuchMethodException {
         if (isOptionalField()) {
             value = Optional.fromNullable(value);
         }
@@ -230,10 +230,10 @@ public void map(final Object target, Object value) throws IllegalArgumentExcepti
     }
 
     private Object initEmbed(final Object target) throws InstantiationException, IllegalAccessException,
-        IllegalArgumentException, InvocationTargetException {
+        IllegalArgumentException, InvocationTargetException, NoSuchMethodException {
 
         final Method setter = getSetter(embedField);
-        final Object value = embedField.getType().newInstance();
+        final Object value = embedField.getType().getDeclaredConstructor().newInstance();
         if (setter != null) {
             setter.invoke(target, value);
         } else {
diff --git a/src/main/java/org/zalando/typemapper/core/TypeMapper.java b/src/main/java/org/zalando/typemapper/core/TypeMapper.java
@@ -14,6 +14,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.RowMapper;
 
+import java.lang.reflect.InvocationTargetException;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
@@ -59,10 +60,10 @@ public ITEM mapRow(final ResultSet set, final int count) throws SQLException {
                 }
             } else {
                 final ResultTree resultTree = extractResultTree(set);
-                result = resultClass.newInstance();
+                result = resultClass.getDeclaredConstructor().newInstance();
                 fillObject(result, resultTree);
             }
-        } catch (final InstantiationException | IllegalAccessException e) {
+        } catch (final InstantiationException | IllegalAccessException | NoSuchMethodException | IllegalArgumentException | SecurityException | InvocationTargetException e) {
             throw new SQLException(getResultClass() + " has no public nullary constructor: ", e);
         }
 
diff --git a/src/main/java/org/zalando/typemapper/core/fieldMapper/ArrayFieldMapper.java b/src/main/java/org/zalando/typemapper/core/fieldMapper/ArrayFieldMapper.java
@@ -22,7 +22,7 @@ public class ArrayFieldMapper {
 
     @SuppressWarnings({ "rawtypes", "unchecked" })
     public static Object mapField(final Field field, final ArrayResultNode node) throws InstantiationException,
-        IllegalAccessException, IllegalArgumentException, InvocationTargetException, NotsupportedTypeException {
+        IllegalAccessException, IllegalArgumentException, InvocationTargetException, NotsupportedTypeException, NoSuchMethodException, SecurityException {
         Collection result = null;
         if (field.getType().isAssignableFrom(List.class)) {
             result = new ArrayList();
diff --git a/src/main/java/org/zalando/typemapper/core/fieldMapper/ObjectFieldMapper.java b/src/main/java/org/zalando/typemapper/core/fieldMapper/ObjectFieldMapper.java
@@ -36,14 +36,14 @@ private static boolean isRowWithAllFieldsNull(final ObjectResultNode node) {
 
     public static final Object mapFromDbObjectNode(final Class classz, final ObjectResultNode node,
             final Mapping mapping) throws InstantiationException, IllegalAccessException, IllegalArgumentException,
-        InvocationTargetException, NotsupportedTypeException {
+        InvocationTargetException, NotsupportedTypeException, NoSuchMethodException, SecurityException {
         final DatabaseFieldDescriptor descriptor = getDatabaseFieldDescriptor(mapping.getField());
         final Object value;
 
         if (mapping.isOptionalField() && isRowWithAllFieldsNull(node)) {
             value = null;
         } else if (descriptor.getMapper() != DefaultObjectMapper.class) {
-            ObjectMapper mapper = descriptor.getMapper().newInstance();
+            ObjectMapper mapper = descriptor.getMapper().getDeclaredConstructor().newInstance();
             value = mapper.unmarshalFromDbNode(node);
         } else {
             value = mapField(mapping.getFieldClass(), node);
@@ -55,7 +55,7 @@ public static final Object mapFromDbObjectNode(final Class classz, final ObjectR
     @SuppressWarnings("unchecked")
     public static final Object mapField(@SuppressWarnings("rawtypes") final Class clazz, final ObjectResultNode node)
         throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException,
-            NotsupportedTypeException {
+            NotsupportedTypeException, SecurityException, NoSuchMethodException {
         if (node.getChildren() == null) {
             return null;
         }
@@ -67,7 +67,7 @@ public static final Object mapField(@SuppressWarnings("rawtypes") final Class cl
             final DbResultNode currentNode = node.getChildByName(node.getType());
             result = Enum.valueOf(clazz, currentNode.getValue());
         } else {
-            result = clazz.newInstance();
+            result = clazz.getDeclaredConstructor().newInstance();
 
             final List<Mapping> mappings = Mapping.getMappingsForClass(clazz);
 
diff --git a/src/main/java/org/zalando/typemapper/core/fieldMapper/PrimitiveLongFieldMapper.java b/src/main/java/org/zalando/typemapper/core/fieldMapper/PrimitiveLongFieldMapper.java
@@ -10,7 +10,7 @@ public class PrimitiveLongFieldMapper implements FieldMapper {
     @Override
     public Object mapField(final String string, final Class clazz) {
         if (string == null) {
-            return new Long(0);
+            return Long.valueOf(0);
         }
 
         try {
@@ -19,7 +19,7 @@ public Object mapField(final String string, final Class clazz) {
             LOG.error("Could not convert {} to long.", string, e);
         }
 
-        return new Long(0);
+        return Long.valueOf(0);
     }
 
 }
diff --git a/src/main/java/org/zalando/typemapper/core/fieldMapper/ValueTransformerFieldMapper.java b/src/main/java/org/zalando/typemapper/core/fieldMapper/ValueTransformerFieldMapper.java
@@ -1,14 +1,16 @@
 package org.zalando.typemapper.core.fieldMapper;
 
+import java.lang.reflect.InvocationTargetException;
+
 import org.zalando.typemapper.core.ValueTransformer;
 
 public class ValueTransformerFieldMapper implements FieldMapper {
 
     private final ValueTransformer<?, ?> valueTransformer;
 
     public ValueTransformerFieldMapper(final Class<? extends ValueTransformer<?, ?>> valueTransformer)
-        throws InstantiationException, IllegalAccessException {
-        this.valueTransformer = valueTransformer.newInstance();
+        throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
+        this.valueTransformer = valueTransformer.getDeclaredConstructor().newInstance();
     }
 
     public ValueTransformerFieldMapper(final ValueTransformer<?, ?> valueTransformer) {
diff --git a/src/main/java/org/zalando/typemapper/postgres/PgTypeHelper.java b/src/main/java/org/zalando/typemapper/postgres/PgTypeHelper.java
