From 58826644d1daed45b431d762c2c4a3c89a10d93c Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Fri, 11 Aug 2017 10:28:32 -0400 Subject: [PATCH 1/2] Expose SpringBootCondition's logger See gh-10000 --- .../autoconfigure/condition/SpringBootCondition.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/SpringBootCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/SpringBootCondition.java index 1345df71737..017bf114b08 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/SpringBootCondition.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/SpringBootCondition.java @@ -18,7 +18,7 @@ package org.springframework.boot.autoconfigure.condition; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - +import org.slf4j.Logger; import org.springframework.context.annotation.Condition; import org.springframework.context.annotation.ConditionContext; import org.springframework.core.type.AnnotatedTypeMetadata; @@ -158,4 +158,12 @@ public abstract class SpringBootCondition implements Condition { return condition.matches(context, metadata); } + /** + * Returns the instance of {@link Logger} used by this + * instance of the condition. + * @return instance of {@link Logger} + */ + protected final Log getLogger() { + return this.logger; + } } From fa85308ab9e279b320d17c2cc1647716eaa987ee Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Aug 2017 11:44:40 +0200 Subject: [PATCH 2/2] Polish "Expose SpringBootCondition's logger" Closes gh-10000 --- .../boot/autoconfigure/condition/SpringBootCondition.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/SpringBootCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/SpringBootCondition.java index 017bf114b08..786f7d24088 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/SpringBootCondition.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/SpringBootCondition.java @@ -18,7 +18,7 @@ package org.springframework.boot.autoconfigure.condition; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.slf4j.Logger; + import org.springframework.context.annotation.Condition; import org.springframework.context.annotation.ConditionContext; import org.springframework.core.type.AnnotatedTypeMetadata; @@ -159,11 +159,11 @@ public abstract class SpringBootCondition implements Condition { } /** - * Returns the instance of {@link Logger} used by this - * instance of the condition. - * @return instance of {@link Logger} + * Return the {@link Log logger} used by this instance of the condition. + * @return the {@link Log logger} */ protected final Log getLogger() { return this.logger; } + }