Remove encoder

tersesystems · Mar 7, 2020 · 584f9be · 584f9be
1 parent 18f3638
commit 584f9be
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 247 deletions.
diff --git a/logback-correlationid/logback-correlationid.gradle b/logback-correlationid/logback-correlationid.gradle
@@ -12,6 +12,7 @@ dependencies {
     implementation project(":logback-classic")
     implementation project(":logback-jdbc-appender")
     implementation project(":logback-uniqueid-appender")
+    implementation project(":logback-ringbuffer")
 
     testImplementation "com.h2database:h2:1.4.200"
     testImplementation 'org.awaitility:awaitility:4.0.2'

diff --git a/...ck-ringbuffer/src/main/java/com/tersesystems/logback/ringbuffer/BufferedEventEncoder.java b/...ck-ringbuffer/src/main/java/com/tersesystems/logback/ringbuffer/BufferedEventEncoder.java
diff --git a/...ck-ringbuffer/src/main/java/com/tersesystems/logback/ringbuffer/BufferedLoggingEvent.java b/...ck-ringbuffer/src/main/java/com/tersesystems/logback/ringbuffer/BufferedLoggingEvent.java
diff --git a/...buffer/src/main/java/com/tersesystems/logback/ringbuffer/BufferedLoggingEventFactory.java b/...buffer/src/main/java/com/tersesystems/logback/ringbuffer/BufferedLoggingEventFactory.java
diff --git a/...ffer/src/main/java/com/tersesystems/logback/ringbuffer/MessagePassingQueueRingBuffer.java b/...ffer/src/main/java/com/tersesystems/logback/ringbuffer/MessagePassingQueueRingBuffer.java
@@ -4,6 +4,7 @@
 import org.jctools.queues.MessagePassingQueue;
 import org.jctools.queues.MpmcArrayQueue;
 
+/** An implementation of ring buffer using a multi-producer/multi-consumer array queue. */
 public class MessagePassingQueueRingBuffer extends RingBufferBase {
 
   // https://psy-lob-saw.blogspot.com/2015/01/mpmc-multi-multi-queue-vs-clq.html

diff --git a/...ringbuffer/src/main/java/com/tersesystems/logback/ringbuffer/RingBufferAwareAppender.java b/...ringbuffer/src/main/java/com/tersesystems/logback/ringbuffer/RingBufferAwareAppender.java
@@ -1,7 +1,6 @@
 package com.tersesystems.logback.ringbuffer;
 
 import ch.qos.logback.classic.spi.ILoggingEvent;
-import ch.qos.logback.core.encoder.Encoder;
 import ch.qos.logback.core.spi.AppenderAttachableImpl;
 import ch.qos.logback.core.spi.FilterReply;
 import com.tersesystems.logback.core.DefaultAppenderAttachable;
@@ -11,26 +10,12 @@
 public class RingBufferAwareAppender extends AbstractRingBufferAppender<ILoggingEvent>
     implements DefaultAppenderAttachable<ILoggingEvent> {
 
-  protected final BufferedLoggingEventFactory eventFactory = new BufferedLoggingEventFactory();
-
-  private Encoder<ILoggingEvent> encoder;
-
   private final AppenderAttachableImpl<ILoggingEvent> aai = new AppenderAttachableImpl<>();
 
   // Provide a transform function we can override in subclasses
-  protected Function<ILoggingEvent, ILoggingEvent> transformFunction =
-      e -> {
-        byte[] encodedData = getEncoder().encode(e);
-        return eventFactory.create(e, encodedData);
-      };
-
-  public Encoder<ILoggingEvent> getEncoder() {
-    return encoder;
-  }
-
-  public void setEncoder(Encoder<ILoggingEvent> encoder) {
-    this.encoder = encoder;
-  }
+  // This gives us the option of doing encoding or isolating event logic without requiring
+  // anything at base level
+  protected Function<ILoggingEvent, ILoggingEvent> transformFunction = Function.identity();
 
   @Override
   public AppenderAttachableImpl<ILoggingEvent> appenderAttachableImpl() {
@@ -47,10 +32,6 @@ public void setTransformFunction(Function<ILoggingEvent, ILoggingEvent> transfor
 
   @Override
   public void start() {
-    if (this.encoder == null) {
-      addError("Null encoder!");
-      return;
-    }
     super.start();
   }