root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Start building against Spring Framework 5.0.4 snapshots 

This reverts commit f24c92c658 which is
no longer necessary as SPR-16456 has no been fixed.

See gh-11894
This commit is contained in:
Andy Wilkinson 2018-02-13 13:42:45 +00:00
parent fd13202b69
commit 9dd7b0689d
3 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-dependencies/pom.xml
View File

@ -141,7 +141,7 @@
<slf4j.version>1.7.25</slf4j.version> <slf4j.version>1.7.25</slf4j.version>
<snakeyaml.version>1.19</snakeyaml.version> <snakeyaml.version>1.19</snakeyaml.version>
<solr.version>6.6.2</solr.version> <solr.version>6.6.2</solr.version>
<spring.version>5.0.3.RELEASE</spring.version> <spring.version>5.0.4.BUILD-SNAPSHOT</spring.version>
<spring-amqp.version>2.0.2.RELEASE</spring-amqp.version> <spring-amqp.version>2.0.2.RELEASE</spring-amqp.version>
<spring-batch.version>4.0.0.RELEASE</spring-batch.version> <spring-batch.version>4.0.0.RELEASE</spring-batch.version>
<spring-cloud-connectors.version>2.0.1.RELEASE</spring-cloud-connectors.version> <spring-cloud-connectors.version>2.0.1.RELEASE</spring-cloud-connectors.version>

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

@ -40,7 +40,7 @@ class CollectionBinder extends IndexedElementsBinder<Collection<Object>> {
AggregateElementBinder elementBinder) { AggregateElementBinder elementBinder) {
Class<?> collectionType = (target.getValue() == null Class<?> collectionType = (target.getValue() == null
? target.getType().resolve(Object.class) : List.class); ? target.getType().resolve(Object.class) : List.class);
ResolvableType aggregateType = forClassWithGenerics(List.class, ResolvableType aggregateType = ResolvableType.forClassWithGenerics(List.class,
target.getType().asCollection().getGenerics()); target.getType().asCollection().getGenerics());
ResolvableType elementType = target.getType().asCollection().getGeneric(); ResolvableType elementType = target.getType().asCollection().getGeneric();
IndexedCollectionSupplier result = new IndexedCollectionSupplier( IndexedCollectionSupplier result = new IndexedCollectionSupplier(

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

@ -83,8 +83,8 @@ abstract class IndexedElementsBinder<T> extends AggregateBinder<T> {
if (property != null) { if (property != null) {
Object aggregate = convert(property.getValue(), aggregateType, Object aggregate = convert(property.getValue(), aggregateType,
target.getAnnotations()); target.getAnnotations());
ResolvableType collectionType = forClassWithGenerics( ResolvableType collectionType = ResolvableType
collection.get().getClass(), elementType); .forClassWithGenerics(collection.get().getClass(), elementType);
Collection<Object> elements = convert(aggregate, collectionType); Collection<Object> elements = convert(aggregate, collectionType);
collection.get().addAll(elements); collection.get().addAll(elements);
} }
@ -145,17 +145,6 @@ abstract class IndexedElementsBinder<T> extends AggregateBinder<T> {
.convert(conversionService, value); .convert(conversionService, value);
} }
// Work around for SPR-16456
protected static ResolvableType forClassWithGenerics(Class<?> type,
ResolvableType... generics) {
ResolvableType[] resolvedGenerics = new ResolvableType[generics.length];
for (int i = 0; i < generics.length; i++) {
resolvedGenerics[i] = forClassWithGenerics(generics[i].resolve(Object.class),
generics[i].getGenerics());
}
return ResolvableType.forClassWithGenerics(type, resolvedGenerics);
}
/** /**
* {@link AggregateBinder.AggregateSupplier AggregateSupplier} for an indexed * {@link AggregateBinder.AggregateSupplier AggregateSupplier} for an indexed
* collection. * collection.