Merge pull request #10032 from izeye:polish-20170818
* pr/10032: Polish
This commit is contained in:
@@ -19,7 +19,7 @@ package org.springframework.boot.actuate.autoconfigure;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
/**
|
||||
* Configurtaion class used to enable configuration of a child management context.
|
||||
* Configuration class used to enable configuration of a child management context.
|
||||
*
|
||||
* @author Andy Wilkinson
|
||||
*/
|
||||
|
||||
@@ -77,7 +77,7 @@ public class ManagementContextAutoConfiguration {
|
||||
|
||||
@Override
|
||||
public void afterSingletonsInstantiated() {
|
||||
veriifySslConfiguration();
|
||||
verifySslConfiguration();
|
||||
verifyContextPathConfiguration();
|
||||
if (this.environment instanceof ConfigurableEnvironment) {
|
||||
addLocalManagementPortPropertyAlias(
|
||||
@@ -85,7 +85,7 @@ public class ManagementContextAutoConfiguration {
|
||||
}
|
||||
}
|
||||
|
||||
private void veriifySslConfiguration() {
|
||||
private void verifySslConfiguration() {
|
||||
if (this.environment.getProperty("management.ssl.enabled", Boolean.class,
|
||||
false)) {
|
||||
throw new IllegalStateException(
|
||||
|
||||
@@ -15,6 +15,6 @@
|
||||
*/
|
||||
|
||||
/**
|
||||
* Classes for cache statictics.
|
||||
* Classes for cache statistics.
|
||||
*/
|
||||
package org.springframework.boot.actuate.cache;
|
||||
|
||||
@@ -120,7 +120,7 @@ public class EnvironmentEndpointTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void sensitiveKeysMatchingCustonNameHaveTheirValuesSanitized() {
|
||||
public void sensitiveKeysMatchingCustomNameHaveTheirValuesSanitized() {
|
||||
System.setProperty("dbPassword", "123456");
|
||||
System.setProperty("apiKey", "123456");
|
||||
EnvironmentEndpoint endpoint = new EnvironmentEndpoint(new StandardEnvironment());
|
||||
|
||||
@@ -46,9 +46,9 @@ public class ShutdownEndpointTests {
|
||||
|
||||
@Test
|
||||
public void shutdown() throws Exception {
|
||||
ApplicationContextRunner contexRunner = new ApplicationContextRunner()
|
||||
ApplicationContextRunner contextRunner = new ApplicationContextRunner()
|
||||
.withUserConfiguration(EndpointConfig.class);
|
||||
contexRunner.run((context) -> {
|
||||
contextRunner.run((context) -> {
|
||||
EndpointConfig config = context.getBean(EndpointConfig.class);
|
||||
ClassLoader previousTccl = Thread.currentThread().getContextClassLoader();
|
||||
Map<String, Object> result;
|
||||
|
||||
@@ -40,7 +40,7 @@ public class OperationRequestPredicate {
|
||||
private final Collection<String> produces;
|
||||
|
||||
/**
|
||||
* Creates a new {@code WebEndpointRequestPredict}.
|
||||
* Creates a new {@code OperationRequestPredicate}.
|
||||
*
|
||||
* @param path the path for the operation
|
||||
* @param httpMethod the HTTP method that the operation supports
|
||||
|
||||
@@ -121,8 +121,8 @@ public class JerseyEndpointResourceFactory {
|
||||
arguments.putAll(body);
|
||||
}
|
||||
}
|
||||
arguments.putAll(extractPathParmeters(data));
|
||||
arguments.putAll(extractQueryParmeters(data));
|
||||
arguments.putAll(extractPathParameters(data));
|
||||
arguments.putAll(extractQueryParameters(data));
|
||||
try {
|
||||
return convertToJaxRsResponse(this.operationInvoker.invoke(arguments),
|
||||
data.getRequest().getMethod());
|
||||
@@ -132,12 +132,12 @@ public class JerseyEndpointResourceFactory {
|
||||
}
|
||||
}
|
||||
|
||||
private Map<String, Object> extractPathParmeters(
|
||||
private Map<String, Object> extractPathParameters(
|
||||
ContainerRequestContext requestContext) {
|
||||
return extract(requestContext.getUriInfo().getPathParameters());
|
||||
}
|
||||
|
||||
private Map<String, Object> extractQueryParmeters(
|
||||
private Map<String, Object> extractQueryParameters(
|
||||
ContainerRequestContext requestContext) {
|
||||
return extract(requestContext.getUriInfo().getQueryParameters());
|
||||
}
|
||||
|
||||
@@ -95,7 +95,7 @@ public class WebEndpointServletHandlerMapping extends RequestMappingInfoHandlerM
|
||||
* operations of the given {@code webEndpoints}.
|
||||
* @param endpointPath the path beneath which all endpoints should be mapped
|
||||
* @param webEndpoints the web endpoints
|
||||
* @param corsConfiguration the CORS configuraton for the endpoints
|
||||
* @param corsConfiguration the CORS configuration for the endpoints
|
||||
*/
|
||||
public WebEndpointServletHandlerMapping(String endpointPath,
|
||||
Collection<EndpointInfo<WebEndpointOperation>> webEndpoints,
|
||||
|
||||
@@ -97,7 +97,7 @@ public class WebEndpointReactiveHandlerMapping extends RequestMappingInfoHandler
|
||||
* operations of the given {@code webEndpoints}.
|
||||
* @param endpointPath the path beneath which all endpoints should be mapped
|
||||
* @param webEndpoints the web endpoints
|
||||
* @param corsConfiguration the CORS configuraton for the endpoints
|
||||
* @param corsConfiguration the CORS configuration for the endpoints
|
||||
*/
|
||||
public WebEndpointReactiveHandlerMapping(String endpointPath,
|
||||
Collection<EndpointInfo<WebEndpointOperation>> webEndpoints,
|
||||
|
||||
@@ -41,7 +41,7 @@ public class CachingOperationInvokerTests {
|
||||
public final ExpectedException thrown = ExpectedException.none();
|
||||
|
||||
@Test
|
||||
public void createInstanceWithTllSetToZero() {
|
||||
public void createInstanceWithTtlSetToZero() {
|
||||
this.thrown.expect(IllegalStateException.class);
|
||||
this.thrown.expectMessage("TimeToLive");
|
||||
new CachingOperationInvoker(mock(OperationInvoker.class), 0);
|
||||
|
||||
Reference in New Issue
Block a user