Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove usage of deprecated APIs

Browse Source 
Resolves #3838
This commit is contained in:
Mahmoud Ben Hassine
2021-08-12 15:51:02 +02:00
parent 86e1b0a3a9
commit 27e11b52f9
20 changed files with 32 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapper.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2006-2019 the original author or authors.
* Copyright 2006-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
package org.springframework.batch.item.file.mapping;
import java.beans.PropertyEditor;
import java.lang.reflect.InvocationTargetException;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -245,9 +246,9 @@ public class BeanWrapperFieldSetMapper<T> extends DefaultPropertyEditorRegistrar
return (T) beanFactory.getBean(name);
}
try {
return type.newInstance();
return type.getDeclaredConstructor().newInstance();
}
catch (InstantiationException | IllegalAccessException e) {
catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
ReflectionUtils.handleReflectionException(e);
}
// should not happen
@@ -369,10 +370,10 @@ public class BeanWrapperFieldSetMapper<T> extends DefaultPropertyEditorRegistrar
Object nestedValue = wrapper.getPropertyValue(nestedName);
if (nestedValue == null) {
try {
nestedValue = wrapper.getPropertyType(nestedName).newInstance();
nestedValue = wrapper.getPropertyType(nestedName).getDeclaredConstructor().newInstance();
wrapper.setPropertyValue(nestedName, nestedValue);
}
catch (InstantiationException | IllegalAccessException e) {
catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
ReflectionUtils.handleReflectionException(e);
}
}

3
spring-batch-infrastructure/src/test/resources/data-source-context.xml
View File

@@ -43,10 +43,9 @@
<property name="order" value="2" />
</bean>
<bean id="placeholderProperties" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"
<bean id="placeholderProperties" class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
depends-on="environment">
<property name="location" value="classpath:batch-${ENVIRONMENT}.properties" />
<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
<property name="ignoreUnresolvablePlaceholders" value="true" />
<property name="order" value="1" />
</bean>