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

Polish

Browse Source
This commit is contained in:
Phillip Webb
2017-08-28 15:29:36 -07:00
parent b02edd2e81
commit 2c97d3a5e9
143 changed files with 689 additions and 655 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java
View File

@@ -395,8 +395,8 @@ public class SpringApplicationBuilder {
Map<String, Object> map = new HashMap<>();
for (String property : properties) {
int index = lowestIndexOf(property, ":", "=");
String key = index > 0 ? property.substring(0, index) : property;
String value = index > 0 ? property.substring(index + 1) : "";
String key = (index > 0 ? property.substring(0, index) : property);
String value = (index > 0 ? property.substring(index + 1) : "");
map.put(key, value);
}
return map;

4
spring-boot/src/main/java/org/springframework/boot/endpoint/EndpointPathResolver.java
View File

@@ -17,8 +17,7 @@
package org.springframework.boot.endpoint;
/**
* Strategy interface that can be used to resolve endpoint paths
* based on endpoint id.
* Strategy interface that can be used to resolve endpoint paths based on endpoint id.
*
* @author Madhura Bhave
* @since 2.0.0
@@ -33,4 +32,3 @@ public interface EndpointPathResolver {
String resolvePath(String endpointId);
}

3
spring-boot/src/main/java/org/springframework/boot/web/context/ServerPortInfoApplicationContextInitializer.java
View File

@@ -49,7 +49,8 @@ import org.springframework.core.env.PropertySource;
* @since 2.0.0
*/
public class ServerPortInfoApplicationContextInitializer
implements ApplicationContextInitializer<ConfigurableApplicationContext>, ApplicationListener<WebServerInitializedEvent> {
implements ApplicationContextInitializer<ConfigurableApplicationContext>,
ApplicationListener<WebServerInitializedEvent> {
@Override
public void initialize(ConfigurableApplicationContext applicationContext) {

2
spring-boot/src/main/java/org/springframework/boot/web/servlet/DispatcherType.java
View File

@@ -18,7 +18,7 @@ package org.springframework.boot.web.servlet;
/**
* Enumeration of filter dispatcher types, identical to
* {@link javax.servlet.DispatcherType} and used in configuration as the servlet api may
* {@link javax.servlet.DispatcherType} and used in configuration as the servlet API may
* not be present.
*
* @author Stephane Nicoll

2
spring-boot/src/test/java/org/springframework/boot/context/config/DelegatingApplicationListenerTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2016 the original author or authors.
* Copyright 2012-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

4
spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BindFailureAnalyzerTests.java
View File

@@ -102,8 +102,8 @@ public class BindFailureAnalyzerTests {
Map<String, Object> map = new HashMap<>();
for (String pair : environment) {
int index = pair.indexOf("=");
String key = index > 0 ? pair.substring(0, index) : pair;
String value = index > 0 ? pair.substring(index + 1) : "";
String key = (index > 0 ? pair.substring(0, index) : pair);
String value = (index > 0 ? pair.substring(index + 1) : "");
map.put(key.trim(), value.trim());
}
sources.addFirst(new MapPropertySource("test", map));

4
spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BindValidationFailureAnalyzerTests.java
View File

@@ -135,8 +135,8 @@ public class BindValidationFailureAnalyzerTests {
Map<String, Object> map = new HashMap<>();
for (String pair : environment) {
int index = pair.indexOf("=");
String key = index > 0 ? pair.substring(0, index) : pair;
String value = index > 0 ? pair.substring(index + 1) : "";
String key = (index > 0 ? pair.substring(0, index) : pair);
String value = (index > 0 ? pair.substring(index + 1) : "");
map.put(key.trim(), value.trim());
}
sources.addFirst(new MapPropertySource("test", map));

4
spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/UnboundConfigurationPropertyFailureAnalyzerTests.java
View File

@@ -98,8 +98,8 @@ public class UnboundConfigurationPropertyFailureAnalyzerTests {
Map<String, Object> map = new HashMap<>();
for (String pair : environment) {
int index = pair.indexOf("=");
String key = index > 0 ? pair.substring(0, index) : pair;
String value = index > 0 ? pair.substring(index + 1) : "";
String key = (index > 0 ? pair.substring(0, index) : pair);
String value = (index > 0 ? pair.substring(index + 1) : "");
map.put(key.trim(), value.trim());
}
sources.addFirst(new MapPropertySource("test", map));

14
spring-boot/src/test/java/org/springframework/boot/endpoint/AnnotationEndpointDiscovererTests.java
View File

@@ -119,9 +119,8 @@ public class AnnotationEndpointDiscovererTests {
Map<Method, TestEndpointOperation> operations = mapOperations(
endpoints.get("test"));
assertThat(operations).hasSize(4);
operations.values()
.forEach(operation -> assertThat(operation.getInvoker())
.isNotInstanceOf(CachingOperationInvoker.class));
operations.values().forEach(operation -> assertThat(operation.getInvoker())
.isNotInstanceOf(CachingOperationInvoker.class));
});
}
@@ -138,9 +137,8 @@ public class AnnotationEndpointDiscovererTests {
Map<Method, TestEndpointOperation> operations = mapOperations(
endpoints.get("test"));
assertThat(operations).hasSize(4);
operations.values()
.forEach(operation -> assertThat(operation.getInvoker())
.isNotInstanceOf(CachingOperationInvoker.class));
operations.values().forEach(operation -> assertThat(operation.getInvoker())
.isNotInstanceOf(CachingOperationInvoker.class));
});
}
@@ -190,8 +188,8 @@ public class AnnotationEndpointDiscovererTests {
EndpointInfo<TestEndpointOperation> endpoint) {
Map<Method, TestEndpointOperation> operationByMethod = new HashMap<>();
endpoint.getOperations().forEach((operation) -> {
Operation existing = operationByMethod
.put(operation.getOperationMethod(), operation);
Operation existing = operationByMethod.put(operation.getOperationMethod(),
operation);
if (existing != null) {
throw new AssertionError(String.format(
"Found endpoint with duplicate operation method '%s'",

2
spring-boot/src/test/java/org/springframework/boot/endpoint/jmx/EndpointMBeanTests.java
View File

@@ -113,7 +113,7 @@ public class EndpointMBeanTests {
// deleteOne
Object deleteResponse = this.server.invoke(objectName, "deleteOne",
new Object[] { "one" }, new String[] { String.class.getName() });
assertThat(oneResponse).isEqualTo("ONE");
assertThat(deleteResponse).isNull();
// getOne validation after delete
updatedOneResponse = this.server.invoke(objectName, "getOne",

5
spring-boot/src/test/java/org/springframework/boot/endpoint/web/AbstractWebEndpointIntegrationTests.java
View File

@@ -171,8 +171,8 @@ public abstract class AbstractWebEndpointIntegrationTests<T extends Configurable
@Test
public void deleteOperationWithVoidResponse() {
load(VoidDeleteResponseEndpointConfiguration.class, (context, client) -> {
client.delete().uri("/voiddelete").accept(MediaType.APPLICATION_JSON).exchange()
.expectStatus().isNoContent().expectBody().isEmpty();
client.delete().uri("/voiddelete").accept(MediaType.APPLICATION_JSON)
.exchange().expectStatus().isNoContent().expectBody().isEmpty();
verify(context.getBean(EndpointDelegate.class)).delete();
});
}
@@ -346,7 +346,6 @@ public abstract class AbstractWebEndpointIntegrationTests<T extends Configurable
}
@Configuration
@Import(BaseConfiguration.class)
static class NullWriteResponseEndpointConfiguration {