From 99cff21c17b5581d3418a7288e176c9665667b03 Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 11 Feb 2020 19:24:28 -0800 Subject: [PATCH] Add default name for DelegatingAppender. Resolves gh-73. --- .../logging/slf4j/logback/DelegatingAppender.java | 12 ++++++++---- .../slf4j/logback/DelegatingAppenderUnitTests.java | 5 +++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/spring-geode-starter-logging/src/main/java/org/springframework/geode/logging/slf4j/logback/DelegatingAppender.java b/spring-geode-starter-logging/src/main/java/org/springframework/geode/logging/slf4j/logback/DelegatingAppender.java index 32eabecf..1a0378c9 100644 --- a/spring-geode-starter-logging/src/main/java/org/springframework/geode/logging/slf4j/logback/DelegatingAppender.java +++ b/spring-geode-starter-logging/src/main/java/org/springframework/geode/logging/slf4j/logback/DelegatingAppender.java @@ -39,15 +39,19 @@ import ch.qos.logback.core.helpers.NOPAppender; public class DelegatingAppender extends AppenderBase { @SuppressWarnings("rawtypes") - protected static final Appender defaultAppender = new NOPAppender<>(); + protected static final Appender DEFAULT_APPENDER = new NOPAppender<>(); + + protected static final String DEFAULT_NAME = "delegate"; public DelegatingAppender() { Optional.ofNullable(LoggerFactory.getILoggerFactory()) - .filter(it -> Objects.isNull(defaultAppender.getContext())) + .filter(it -> Objects.isNull(DEFAULT_APPENDER.getContext())) .filter(Context.class::isInstance) .map(Context.class::cast) - .ifPresent(defaultAppender::setContext); + .ifPresent(DEFAULT_APPENDER::setContext); + + this.name = DEFAULT_NAME; } private volatile Appender appender; @@ -58,7 +62,7 @@ public class DelegatingAppender extends AppenderBase { @SuppressWarnings("unchecked") protected Appender getAppender() { - return Optional.ofNullable(this.appender).orElse(defaultAppender); + return Optional.ofNullable(this.appender).orElse(DEFAULT_APPENDER); } @Override diff --git a/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/DelegatingAppenderUnitTests.java b/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/DelegatingAppenderUnitTests.java index 04263ee3..eb8f3f08 100644 --- a/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/DelegatingAppenderUnitTests.java +++ b/spring-geode-starter-logging/src/test/java/org/springframework/geode/logging/slf4j/logback/DelegatingAppenderUnitTests.java @@ -38,6 +38,11 @@ import ch.qos.logback.core.helpers.NOPAppender; */ public class DelegatingAppenderUnitTests { + @Test + public void delegatingAppenderDefaultsNameToDelegate() { + assertThat(new DelegatingAppender<>().getName()).isEqualTo(DelegatingAppender.DEFAULT_NAME); + } + @Test public void delegatingAppenderDefaultsToNoOpAppender() { assertThat(new DelegatingAppender<>().getAppender()).isInstanceOf(NOPAppender.class);