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

Use type parameter for Supplier in AggregateBinder.merge()

Browse Source 
Closes gh-13139
This commit is contained in:
Johnny Lim
2018-05-11 14:40:15 +09:00
committed by Stephane Nicoll
parent 243023f2ad
commit d72ba70cba
4 changed files with 7 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/AggregateBinder.java
View File

@@ -60,7 +60,7 @@ abstract class AggregateBinder<T> {
if (result == null || value == null) { if (result == null || value == null) {
return result; return result;
} }
return merge(value, (T) result); return merge((Supplier<T>) value, (T) result);
} }
/** /**
@@ -79,7 +79,7 @@ abstract class AggregateBinder<T> {
* @param additional the additional elements to merge * @param additional the additional elements to merge
* @return the merged result * @return the merged result
*/ */
protected abstract T merge(Supplier<?> existing, T additional); protected abstract T merge(Supplier<T> existing, T additional);
/** /**
* Return the context being used by this binder. * Return the context being used by this binder.

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

@@ -56,7 +56,7 @@ class ArrayBinder extends IndexedElementsBinder<Object> {
} }
@Override @Override
protected Object merge(Supplier<?> existing, Object additional) { protected Object merge(Supplier<Object> existing, Object additional) {
return additional; return additional;
} }

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

@@ -55,10 +55,9 @@ class CollectionBinder extends IndexedElementsBinder<Collection<Object>> {
} }
@Override @Override
@SuppressWarnings("unchecked") protected Collection<Object> merge(Supplier<Collection<Object>> existing,
protected Collection<Object> merge(Supplier<?> existing,
Collection<Object> additional) { Collection<Object> additional) {
Collection<Object> existingCollection = (Collection<Object>) existing.get(); Collection<Object> existingCollection = existing.get();
if (existingCollection == null) { if (existingCollection == null) {
return additional; return additional;
} }

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

@@ -83,10 +83,9 @@ class MapBinder extends AggregateBinder<Map<Object, Object>> {
} }
@Override @Override
@SuppressWarnings("unchecked") protected Map<Object, Object> merge(Supplier<Map<Object, Object>> existing,
protected Map<Object, Object> merge(Supplier<?> existing,
Map<Object, Object> additional) { Map<Object, Object> additional) {
Map<Object, Object> existingMap = (Map<Object, Object>) existing.get(); Map<Object, Object> existingMap = existing.get();
if (existingMap == null) { if (existingMap == null) {
return additional; return additional;
} }