Remove deprecated usage of newInstance and some other methods.

Jan-M · Jan-M · commit 1d12bafc26e2 · 2021-03-18T23:32:29.000+01:00
diff --git a/.classpath b/.classpath
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="target/generated-sources/annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/.project b/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>zalando-sprocwrapper</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1616103069919</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
+encoding/<project>=UTF-8
diff --git a/.settings/org.eclipse.jdt.apt.core.prefs b/.settings/org.eclipse.jdt.apt.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.apt.aptEnabled=false
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,10 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
+org.eclipse.jdt.core.compiler.processAnnotations=disabled
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
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, InvocationTargetException {
         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, InvocationTargetException {
 
         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, InvocationTargetException {
 
         // 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
diff --git a/src/main/java/org/zalando/typemapper/core/fieldMapper/PrimitiveLongFieldMapper.java b/src/main/java/org/zalando/typemapper/core/fieldMapper/PrimitiveLongFieldMapper.java
diff --git a/src/main/java/org/zalando/typemapper/core/fieldMapper/ValueTransformerFieldMapper.java b/src/main/java/org/zalando/typemapper/core/fieldMapper/ValueTransformerFieldMapper.java

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+eclipse.preferences.version=1`
	`2`	`+org.eclipse.jdt.apt.aptEnabled=false`