From ab6adc826595d64a0270e250701f5f27d5c337d0 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Sat, 30 Jun 2018 02:11:30 +0900 Subject: [PATCH] Polish Closes gh-13616 --- .../endpoint/web/ServletEndpointRegistrar.java | 11 ++++++----- .../condition/OnExpressionCondition.java | 5 ++--- .../condition/ConditionalOnExpressionTests.java | 9 +++------ .../SpringIterableConfigurationPropertySource.java | 2 +- .../boot/logging/logback/SpringProfileAction.java | 5 ++++- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/ServletEndpointRegistrar.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/ServletEndpointRegistrar.java index 8024fae074..3859766a77 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/ServletEndpointRegistrar.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/ServletEndpointRegistrar.java @@ -81,11 +81,12 @@ public class ServletEndpointRegistrar implements ServletContextInitializer { } private String[] getUrlMappings(String endpointPath, String name) { - return this.basePaths.stream() - .map((bp) -> (bp != null ? bp + "/" + endpointPath : "/" + endpointPath)) - .distinct().map((p) -> { - logger.info("Registered '" + p + "' to " + name); - return (p.endsWith("/") ? p + "*" : p + "/*"); + return this.basePaths + .stream().map((basePath) -> (basePath != null + ? basePath + "/" + endpointPath : "/" + endpointPath)) + .distinct().map((path) -> { + logger.info("Registered '" + path + "' to " + name); + return (path.endsWith("/") ? path + "*" : path + "/*"); }).toArray(String[]::new); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnExpressionCondition.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnExpressionCondition.java index c6dde2b2ed..b6a5bb70a1 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnExpressionCondition.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnExpressionCondition.java @@ -42,10 +42,9 @@ class OnExpressionCondition extends SpringBootCondition { .getAnnotationAttributes(ConditionalOnExpression.class.getName()) .get("value"); expression = wrapIfNecessary(expression); - String rawExpression = expression; - expression = context.getEnvironment().resolvePlaceholders(expression); ConditionMessage.Builder messageBuilder = ConditionMessage - .forCondition(ConditionalOnExpression.class, "(" + rawExpression + ")"); + .forCondition(ConditionalOnExpression.class, "(" + expression + ")"); + expression = context.getEnvironment().resolvePlaceholders(expression); ConfigurableListableBeanFactory beanFactory = context.getBeanFactory(); if (beanFactory != null) { boolean result = evaluateExpression(beanFactory, expression); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnExpressionTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnExpressionTests.java index ac24a5675f..400b0924c7 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnExpressionTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnExpressionTests.java @@ -16,8 +16,7 @@ package org.springframework.boot.autoconfigure.condition; -import java.util.HashMap; -import java.util.Map; +import java.util.Collections; import org.junit.Test; @@ -49,7 +48,7 @@ public class ConditionalOnExpressionTests { } @Test - public void expressionEvaluatesToTrueRegisterBean() { + public void expressionEvaluatesToTrueRegistersBean() { this.contextRunner.withUserConfiguration(MissingConfiguration.class) .run((context) -> assertThat(context).doesNotHaveBean("foo")); } @@ -75,10 +74,8 @@ public class ConditionalOnExpressionTests { private AnnotatedTypeMetadata mockMetaData(String value) { AnnotatedTypeMetadata metadata = mock(AnnotatedTypeMetadata.class); - Map attributes = new HashMap<>(); - attributes.put("value", value); given(metadata.getAnnotationAttributes(ConditionalOnExpression.class.getName())) - .willReturn(attributes); + .willReturn(Collections.singletonMap("value", value)); return metadata; } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SpringIterableConfigurationPropertySource.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SpringIterableConfigurationPropertySource.java index f300fc045d..173e86c63d 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SpringIterableConfigurationPropertySource.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SpringIterableConfigurationPropertySource.java @@ -174,7 +174,7 @@ class SpringIterableConfigurationPropertySource extends SpringConfigurationPrope private static final class CacheKey { - private Object key; + private final Object key; private CacheKey(Object key) { this.key = key; diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringProfileAction.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringProfileAction.java index 93d59c6fd4..5b55e5c90a 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringProfileAction.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringProfileAction.java @@ -67,9 +67,12 @@ class SpringProfileAction extends Action implements InPlayListener { } private boolean acceptsProfiles(InterpretationContext ic, Attributes attributes) { + if (this.environment == null) { + return false; + } String[] profileNames = StringUtils.trimArrayElements(StringUtils .commaDelimitedListToStringArray(attributes.getValue(NAME_ATTRIBUTE))); - if (this.environment == null || profileNames.length == 0) { + if (profileNames.length == 0) { return false; } for (int i = 0; i < profileNames.length; i++) {