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

Polish

Browse Source
This commit is contained in:
Andy Wilkinson
2019-03-10 12:42:09 +00:00
parent 89bb973745
commit 7d0317419d
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/EndpointServlet.java
View File

@@ -21,7 +21,7 @@ import java.util.LinkedHashMap;
import java.util.Map;
import javax.servlet.Servlet;
import javax.servlet.ServletRegistration;
import javax.servlet.ServletRegistration.Dynamic;
import org.springframework.beans.BeanUtils;
import org.springframework.util.Assert;
@@ -86,7 +86,7 @@ public final class EndpointServlet {
* @return a new instance of {@link EndpointServlet} with the provided
* {@code loadOnStartup} value set
* @since 2.2.0
* @see ServletRegistration.Dynamic#setLoadOnStartup(int)
* @see Dynamic#setLoadOnStartup(int)
*/
public EndpointServlet withLoadOnStartup(int loadOnStartup) {
return new EndpointServlet(this.servlet, this.initParameters, loadOnStartup);

1
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/ConstructorParametersBinder.java
View File

@@ -55,6 +55,7 @@ class ConstructorParametersBinder implements BeanBinder {
}
@Override
@SuppressWarnings("unchecked")
public <T> T bind(ConfigurationPropertyName name, Bindable<T> target,
Binder.Context context, BeanPropertyBinder propertyBinder) {
Bean bean = Bean.get(target);

6
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java
View File

@@ -1195,7 +1195,7 @@ public class ConfigurationPropertiesTests {
@EnableConfigurationProperties(WithCustomValidatorProperties.class)
static class WithCustomValidatorConfiguration {
@Bean(name = ConfigurationPropertiesBindingPostProcessor.VALIDATOR_BEAN_NAME)
@Bean(name = ConfigurationPropertiesBindingPostProcessorRegistrar.VALIDATOR_BEAN_NAME)
public CustomPropertiesValidator validator() {
return new CustomPropertiesValidator();
}
@@ -1206,7 +1206,7 @@ public class ConfigurationPropertiesTests {
@EnableConfigurationProperties(WithSetterThatThrowsValidationExceptionProperties.class)
static class WithUnsupportedCustomValidatorConfiguration {
@Bean(name = ConfigurationPropertiesBindingPostProcessor.VALIDATOR_BEAN_NAME)
@Bean(name = ConfigurationPropertiesBindingPostProcessorRegistrar.VALIDATOR_BEAN_NAME)
public CustomPropertiesValidator validator() {
return new CustomPropertiesValidator();
}
@@ -1823,7 +1823,7 @@ public class ConfigurationPropertiesTests {
@ConfigurationProperties(prefix = "test")
static class OtherInjectedProperties {
private final DataSizeProperties dataSizeProperties;
final DataSizeProperties dataSizeProperties;
@Autowired
OtherInjectedProperties(ObjectProvider<DataSizeProperties> dataSizeProperties) {