From c2c5611f7762638b78e31d62e77ba736d4615c5e Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Fri, 18 Nov 2016 15:58:56 -0800 Subject: [PATCH] Polish --- .../cloudfoundry/CloudFoundryEndpointHandlerMapping.java | 2 +- .../CloudFoundryEndpointHandlerMappingTests.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryEndpointHandlerMapping.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryEndpointHandlerMapping.java index ebee4c2a81..8a2ecf1984 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryEndpointHandlerMapping.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryEndpointHandlerMapping.java @@ -112,9 +112,9 @@ class CloudFoundryEndpointHandlerMapping /** * {@link HandlerInterceptor} that processes the response for CORS. - * */ class CorsInterceptor extends HandlerInterceptorAdapter { + private final CorsConfiguration config; CorsInterceptor(CorsConfiguration config) { diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryEndpointHandlerMappingTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryEndpointHandlerMappingTests.java index 08e029686d..b3d13d326f 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryEndpointHandlerMappingTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryEndpointHandlerMappingTests.java @@ -41,6 +41,8 @@ import org.springframework.web.servlet.HandlerExecutionChain; import org.springframework.web.servlet.HandlerInterceptor; import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; /** * Tests for {@link CloudFoundryEndpointHandlerMapping}. @@ -56,7 +58,7 @@ public class CloudFoundryEndpointHandlerMappingTests CorsConfiguration corsConfiguration = new CorsConfiguration(); CloudFoundryEndpointHandlerMapping handlerMapping = new CloudFoundryEndpointHandlerMapping( Collections.singleton(endpoint), corsConfiguration, null); - CorsProcessor corsProcessor = Mockito.mock(CorsProcessor.class); + CorsProcessor corsProcessor = mock(CorsProcessor.class); handlerMapping.setCorsProcessor(corsProcessor); MockHttpServletRequest request = new MockHttpServletRequest(); HandlerExecutionChain handlerExecutionChain = handlerMapping @@ -65,8 +67,7 @@ public class CloudFoundryEndpointHandlerMappingTests CloudFoundryEndpointHandlerMapping.CorsInterceptor corsInterceptor = (CloudFoundryEndpointHandlerMapping.CorsInterceptor) interceptors[0]; MockHttpServletResponse response = new MockHttpServletResponse(); corsInterceptor.preHandle(request, response, new Object()); - Mockito.verify(corsProcessor).processRequest(corsConfiguration, request, - response); + verify(corsProcessor).processRequest(corsConfiguration, request, response); } @Test