Merge branch '1.5.x'

8 years ago · 38271b7397
parent 519f9c6c54 367963f29f
commit 38271b7397
1 changed files with 2 additions and 2 deletions
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/JolokiaAutoConfigurationTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/JolokiaAutoConfigurationTests.java
@ -144,8 +144,8 @@ public class JolokiaAutoConfigurationTests {
 		public EndpointHandlerMapping endpointHandlerMapping(
 				Collection<? extends MvcEndpoint> endpoints) {
 			EndpointHandlerMapping mapping = new EndpointHandlerMapping(endpoints);
-			mapping.setSecurityInterceptor(
-					new MvcEndpointSecurityInterceptor(false, Collections.emptyList()));
+			mapping.setSecurityInterceptor(new MvcEndpointSecurityInterceptor(false,
+					Collections.<String>emptyList()));
 			return mapping;
 		}