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

Share BinderConversionService with a static

Browse Source 
Use a single shared static `BinderConversionService` instance for all
created binders to save memory and improve performance.

Fixes gh-11352
This commit is contained in:
Phillip Webb
2017-12-21 15:23:35 -08:00
parent 6cb331ed2c
commit e141f77801
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/Binder.java
View File

@@ -351,8 +351,8 @@ public class Binder {
* @return a {@link Binder} instance
*/
public static Binder get(Environment environment) {
return new Binder(ConfigurationPropertySources.get(environment),
new PropertySourcesPlaceholdersResolver(environment));
return new Binder(ConfigurationPropertySources
.get(environment), new PropertySourcesPlaceholdersResolver(environment));
}
/**

15
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/convert/BinderConversionService.java
View File

@@ -38,9 +38,11 @@ import org.springframework.format.support.DefaultFormattingConversionService;
*/
public class BinderConversionService implements ConversionService {
private final ConversionService conversionService;
private static final ConversionService additionalConversionService = createAdditionalConversionService();
private final ConversionService additionalConversionService;
private static final ConversionService defaultConversionService = new DefaultFormattingConversionService();
private final ConversionService conversionService;
/**
* Create a new {@link BinderConversionService} instance.
@@ -48,22 +50,21 @@ public class BinderConversionService implements ConversionService {
*/
public BinderConversionService(ConversionService conversionService) {
this.conversionService = (conversionService != null ? conversionService
: new DefaultFormattingConversionService());
this.additionalConversionService = createAdditionalConversionService();
: defaultConversionService);
}
@Override
public boolean canConvert(Class<?> sourceType, Class<?> targetType) {
return (this.conversionService != null
&& this.conversionService.canConvert(sourceType, targetType))
|| this.additionalConversionService.canConvert(sourceType, targetType);
|| additionalConversionService.canConvert(sourceType, targetType);
}
@Override
public boolean canConvert(TypeDescriptor sourceType, TypeDescriptor targetType) {
return (this.conversionService != null
&& this.conversionService.canConvert(sourceType, targetType))
|| this.additionalConversionService.canConvert(sourceType, targetType);
|| additionalConversionService.canConvert(sourceType, targetType);
}
@Override
@@ -92,7 +93,7 @@ public class BinderConversionService implements ConversionService {
private <T> T callAdditionalConversionService(Function<ConversionService, T> call,
RuntimeException cause) {
try {
return call.apply(this.additionalConversionService);
return call.apply(additionalConversionService);
}
catch (ConverterNotFoundException ex) {
throw (cause != null ? cause : ex);