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

Polish

Browse Source 
See gh-17505
This commit is contained in:
dreis2211
2019-07-13 19:36:48 +02:00
committed by Stephane Nicoll
parent b7e092e821
commit 82047a2544
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/json/DuplicateJsonObjectContextCustomizerFactory.java
View File

@@ -17,7 +17,7 @@
package org.springframework.boot.test.json;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
import java.util.List;
@@ -57,17 +57,14 @@ class DuplicateJsonObjectContextCustomizerFactory implements ContextCustomizerFa
}
private List<URL> findJsonObjects() {
List<URL> jsonObjects = new ArrayList<>();
try {
Enumeration<URL> resources = getClass().getClassLoader().getResources("org/json/JSONObject.class");
while (resources.hasMoreElements()) {
jsonObjects.add(resources.nextElement());
}
return Collections.list(resources);
}
catch (Exception ex) {
// Continue
}
return jsonObjects;
return Collections.emptyList();
}
private void logDuplicateJsonObjectsWarning(List<URL> jsonObjects) {