Fix LOGBACK-1326

Signed-off-by: Ceki Gulcu <ceki@qos.ch>
qos-ch · Jul 26, 2021 · 49c6b67 · 49c6b67
1 parent 718c0c4
commit 49c6b67
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/...cessor/LoggerModelDependencyAnalyser.java → ...gerOrAppenderModelDependencyAnalyser.java b/...cessor/LoggerModelDependencyAnalyser.java → ...gerOrAppenderModelDependencyAnalyser.java
diff --git a/logback-core/src/main/java/ch/qos/logback/core/encoder/LayoutWrappingEncoder.java b/logback-core/src/main/java/ch/qos/logback/core/encoder/LayoutWrappingEncoder.java
@@ -15,10 +15,10 @@
 
 import java.nio.charset.Charset;
 
-import ch.qos.logback.core.Appender;
 import ch.qos.logback.core.CoreConstants;
 import ch.qos.logback.core.Layout;
 import ch.qos.logback.core.OutputStreamAppender;
+import ch.qos.logback.core.spi.ContextAware;
 
 public class LayoutWrappingEncoder<E> extends EncoderBase<E> {
 
@@ -32,7 +32,7 @@ public class LayoutWrappingEncoder<E> extends EncoderBase<E> {
      */
     private Charset charset;
 
-    Appender<?> parent;
+    ContextAware parent;
     Boolean immediateFlush = null;
 
     public Layout<E> getLayout() {
@@ -148,7 +148,7 @@ private void appendIfNotNull(StringBuilder sb, String s) {
      * 
      * @param parent
      */
-    public void setParent(Appender<?> parent) {
+    public void setParent(ContextAware parent) {
         this.parent = parent;
     }
 }
diff --git a/logback-core/src/main/java/ch/qos/logback/core/util/AggregationType.java b/logback-core/src/main/java/ch/qos/logback/core/util/AggregationType.java
@@ -25,8 +25,9 @@
  * @author Ceki Gulcu
  */
 public enum AggregationType {
-    NOT_FOUND, AS_BASIC_PROPERTY, // Long, Integer, Double,..., java primitive, String,
-                                  // Duration or FileSize
+    NOT_FOUND, 
+    AS_BASIC_PROPERTY, // Long, Integer, Double,..., java primitive, String,
+                       // Duration or FileSize
     AS_COMPLEX_PROPERTY, // a complex property, a.k.a. attribute, is any attribute
                          // not covered by basic attributes, i.e.
                          // object types defined by the user