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

Merge branch '2.1.x' 

Closes gh-18586
This commit is contained in:
Stephane Nicoll 2019-10-15 08:25:25 +02:00
parent 9c6e5f0904 f6d5f7777f
commit 98f676ca46
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,7 @@ package org.springframework.boot.context.properties.bind;
import java.util.ArrayList;
import java.util.Collections;
import java.util.EnumSet;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Set;
@ -433,7 +433,7 @@ class CollectionBinderTests {
private List<String> items = new ArrayList<>();
private Set<String> itemsSet = new HashSet<>();
private Set<String> itemsSet = new LinkedHashSet<>();
List<String> getItems() {
return this.items;