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

Merge pull request #17505 from dreis2211

Browse Source 
* pr/17505:
  Polish

Closes gh-17505
This commit is contained in:
Stephane Nicoll
2019-07-14 11:38:51 +02:00
parent b7e092e821 82047a2544
commit e73f8c1008
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscovererTests.java
View File

@@ -166,7 +166,7 @@ class EndpointDiscovererTests {
void getEndpointsWhenTtlSetByIdAndIdDoesNotMatchShouldNotCacheInvokeCalls() {
load(TestEndpointConfiguration.class, (context) -> {
TestEndpointDiscoverer discoverer = new TestEndpointDiscoverer(context,
(endpointId) -> (endpointId.equals("foo") ? 500L : 0L));
(endpointId) -> (endpointId.equals(EndpointId.of("foo")) ? 500L : 0L));
Map<EndpointId, TestExposableEndpoint> endpoints = mapEndpoints(discoverer.getEndpoints());
assertThat(endpoints).containsOnlyKeys(EndpointId.of("test"));
Map<Method, TestOperation> operations = mapOperations(endpoints.get(EndpointId.of("test")));

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) {