root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Avoid premature declaration of variables 

Closes gh-15215
This commit is contained in:
dreis2211 2018-11-19 14:09:28 +01:00 committed by Stephane Nicoll
parent 6d2a91ed83
commit f57f16c190
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryWebEndpointServletHandlerMapping.java
View File

@ -91,12 +91,12 @@ class CloudFoundryWebEndpointServletHandlerMapping
} }
AccessLevel accessLevel = (AccessLevel) request AccessLevel accessLevel = (AccessLevel) request
.getAttribute(AccessLevel.REQUEST_ATTRIBUTE); .getAttribute(AccessLevel.REQUEST_ATTRIBUTE);
Map<String, Link> links = CloudFoundryWebEndpointServletHandlerMapping.this.linksResolver
.resolveLinks(request.getRequestURL().toString());
Map<String, Link> filteredLinks = new LinkedHashMap<>(); Map<String, Link> filteredLinks = new LinkedHashMap<>();
if (accessLevel == null) { if (accessLevel == null) {
return Collections.singletonMap("_links", filteredLinks); return Collections.singletonMap("_links", filteredLinks);
} }
Map<String, Link> links = CloudFoundryWebEndpointServletHandlerMapping.this.linksResolver
.resolveLinks(request.getRequestURL().toString());
filteredLinks = links.entrySet().stream() filteredLinks = links.entrySet().stream()
.filter((e) -> e.getKey().equals("self") .filter((e) -> e.getKey().equals("self")
|| accessLevel.isAccessAllowed(e.getKey())) || accessLevel.isAccessAllowed(e.getKey()))

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementPortType.java
View File

@ -42,11 +42,11 @@ public enum ManagementPortType {
DIFFERENT; DIFFERENT;
static ManagementPortType get(Environment environment) { static ManagementPortType get(Environment environment) {
Integer serverPort = getPortProperty(environment, "server.");
Integer managementPort = getPortProperty(environment, "management.server."); Integer managementPort = getPortProperty(environment, "management.server.");
if (managementPort != null && managementPort < 0) { if (managementPort != null && managementPort < 0) {
return DISABLED; return DISABLED;
} }
Integer serverPort = getPortProperty(environment, "server.");
return ((managementPort == null return ((managementPort == null
|| (serverPort == null && managementPort.equals(8080)) || (serverPort == null && managementPort.equals(8080))
|| (managementPort != 0 && managementPort.equals(serverPort))) ? SAME || (managementPort != 0 && managementPort.equals(serverPort))) ? SAME

2
spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/properties/AnnotationsPropertySource.java
View File

@ -120,7 +120,6 @@ public class AnnotationsPropertySource extends EnumerablePropertySource<Class<?>
if (skip == SkipPropertyMapping.YES) { if (skip == SkipPropertyMapping.YES) {
return; return;
} }
String name = getName(typeMapping, attributeMapping, attribute);
ReflectionUtils.makeAccessible(attribute); ReflectionUtils.makeAccessible(attribute);
Object value = ReflectionUtils.invokeMethod(attribute, annotation); Object value = ReflectionUtils.invokeMethod(attribute, annotation);
if (skip == SkipPropertyMapping.ON_DEFAULT_VALUE) { if (skip == SkipPropertyMapping.ON_DEFAULT_VALUE) {
@ -130,6 +129,7 @@ public class AnnotationsPropertySource extends EnumerablePropertySource<Class<?>
return; return;
} }
} }
String name = getName(typeMapping, attributeMapping, attribute);
putProperties(name, value, properties); putProperties(name, value, properties);
} }

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

@ -242,12 +242,12 @@ final class BindConverter {
} }
private PropertyEditor getPropertyEditor(Class<?> type) { private PropertyEditor getPropertyEditor(Class<?> type) {
SimpleTypeConverter typeConverter = this.typeConverter;
if (type == null || type == Object.class if (type == null || type == Object.class
|| Collection.class.isAssignableFrom(type) || Collection.class.isAssignableFrom(type)
|| Map.class.isAssignableFrom(type)) { || Map.class.isAssignableFrom(type)) {
return null; return null;
} }
SimpleTypeConverter typeConverter = this.typeConverter;
PropertyEditor editor = typeConverter.getDefaultEditor(type); PropertyEditor editor = typeConverter.getDefaultEditor(type);
if (editor == null) { if (editor == null) {
editor = typeConverter.findCustomEditor(type, null); editor = typeConverter.findCustomEditor(type, null);