diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml index e1b12520..10c67717 100644 --- a/src/checkstyle/checkstyle.xml +++ b/src/checkstyle/checkstyle.xml @@ -36,7 +36,15 @@ - + + + + + + + + + @@ -86,5 +94,6 @@ + diff --git a/src/main/java/net/logstash/logback/LogstashAccessFormatter.java b/src/main/java/net/logstash/logback/LogstashAccessFormatter.java index 4af665aa..4c30f18b 100644 --- a/src/main/java/net/logstash/logback/LogstashAccessFormatter.java +++ b/src/main/java/net/logstash/logback/LogstashAccessFormatter.java @@ -17,9 +17,6 @@ import java.util.Collections; -import ch.qos.logback.access.spi.IAccessEvent; -import ch.qos.logback.core.joran.spi.DefaultClass; -import ch.qos.logback.core.spi.ContextAware; import net.logstash.logback.composite.ContextJsonProvider; import net.logstash.logback.composite.FieldNamesAware; import net.logstash.logback.composite.GlobalCustomFieldsJsonProvider; @@ -46,6 +43,9 @@ import net.logstash.logback.composite.accessevent.StatusCodeJsonProvider; import net.logstash.logback.fieldnames.LogstashAccessFieldNames; +import ch.qos.logback.access.spi.IAccessEvent; +import ch.qos.logback.core.joran.spi.DefaultClass; +import ch.qos.logback.core.spi.ContextAware; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/main/java/net/logstash/logback/LogstashFormatter.java b/src/main/java/net/logstash/logback/LogstashFormatter.java index f18361c3..6813f528 100644 --- a/src/main/java/net/logstash/logback/LogstashFormatter.java +++ b/src/main/java/net/logstash/logback/LogstashFormatter.java @@ -40,13 +40,11 @@ import net.logstash.logback.composite.loggingevent.ThreadNameJsonProvider; import net.logstash.logback.fieldnames.LogstashFieldNames; -import org.slf4j.MDC; - import ch.qos.logback.classic.pattern.ThrowableHandlingConverter; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.spi.ContextAware; - import com.fasterxml.jackson.databind.JsonNode; +import org.slf4j.MDC; /** * A {@link LoggingEventCompositeJsonFormatter} that contains a common diff --git a/src/main/java/net/logstash/logback/appender/AbstractLogstashTcpSocketAppender.java b/src/main/java/net/logstash/logback/appender/AbstractLogstashTcpSocketAppender.java index 6e3b1b5d..80ece066 100644 --- a/src/main/java/net/logstash/logback/appender/AbstractLogstashTcpSocketAppender.java +++ b/src/main/java/net/logstash/logback/appender/AbstractLogstashTcpSocketAppender.java @@ -52,10 +52,6 @@ import net.logstash.logback.encoder.SeparatorParser; import net.logstash.logback.encoder.StreamingEncoder; -import com.lmax.disruptor.EventHandler; -import com.lmax.disruptor.LifecycleAware; -import com.lmax.disruptor.RingBuffer; - import ch.qos.logback.core.encoder.Encoder; import ch.qos.logback.core.joran.spi.DefaultClass; import ch.qos.logback.core.net.ssl.ConfigurableSSLSocketFactory; @@ -65,6 +61,9 @@ import ch.qos.logback.core.spi.DeferredProcessingAware; import ch.qos.logback.core.util.CloseUtil; import ch.qos.logback.core.util.Duration; +import com.lmax.disruptor.EventHandler; +import com.lmax.disruptor.LifecycleAware; +import com.lmax.disruptor.RingBuffer; /** * An {@link AsyncDisruptorAppender} appender that writes diff --git a/src/main/java/net/logstash/logback/appender/AbstractLogstashUdpSocketAppender.java b/src/main/java/net/logstash/logback/appender/AbstractLogstashUdpSocketAppender.java index 498d6186..621978d9 100644 --- a/src/main/java/net/logstash/logback/appender/AbstractLogstashUdpSocketAppender.java +++ b/src/main/java/net/logstash/logback/appender/AbstractLogstashUdpSocketAppender.java @@ -22,11 +22,12 @@ import java.util.List; import java.util.Objects; +import net.logstash.logback.appender.listener.AppenderListener; + import ch.qos.logback.core.Layout; import ch.qos.logback.core.net.SyslogAppenderBase; import ch.qos.logback.core.net.SyslogOutputStream; import ch.qos.logback.core.spi.DeferredProcessingAware; -import net.logstash.logback.appender.listener.AppenderListener; /** * An appender that sends events over UDP using a custom {@link Layout}. diff --git a/src/main/java/net/logstash/logback/appender/AccessEventAsyncDisruptorAppender.java b/src/main/java/net/logstash/logback/appender/AccessEventAsyncDisruptorAppender.java index c76dd14d..14b3a4b9 100644 --- a/src/main/java/net/logstash/logback/appender/AccessEventAsyncDisruptorAppender.java +++ b/src/main/java/net/logstash/logback/appender/AccessEventAsyncDisruptorAppender.java @@ -16,6 +16,7 @@ package net.logstash.logback.appender; import net.logstash.logback.appender.listener.AppenderListener; + import ch.qos.logback.access.spi.IAccessEvent; /** diff --git a/src/main/java/net/logstash/logback/appender/AsyncDisruptorAppender.java b/src/main/java/net/logstash/logback/appender/AsyncDisruptorAppender.java index a4a5730b..b718fa73 100644 --- a/src/main/java/net/logstash/logback/appender/AsyncDisruptorAppender.java +++ b/src/main/java/net/logstash/logback/appender/AsyncDisruptorAppender.java @@ -27,16 +27,16 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import ch.qos.logback.core.status.OnConsoleStatusListener; -import ch.qos.logback.core.status.Status; import net.logstash.logback.appender.listener.AppenderListener; +import net.logstash.logback.status.LevelFilteringStatusListener; + import ch.qos.logback.access.spi.IAccessEvent; import ch.qos.logback.classic.AsyncAppender; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.UnsynchronizedAppenderBase; import ch.qos.logback.core.spi.DeferredProcessingAware; -import net.logstash.logback.status.LevelFilteringStatusListener; - +import ch.qos.logback.core.status.OnConsoleStatusListener; +import ch.qos.logback.core.status.Status; import com.lmax.disruptor.BlockingWaitStrategy; import com.lmax.disruptor.EventFactory; import com.lmax.disruptor.EventHandler; diff --git a/src/main/java/net/logstash/logback/appender/DelegatingAsyncDisruptorAppender.java b/src/main/java/net/logstash/logback/appender/DelegatingAsyncDisruptorAppender.java index 3e5629aa..f5d9b52d 100644 --- a/src/main/java/net/logstash/logback/appender/DelegatingAsyncDisruptorAppender.java +++ b/src/main/java/net/logstash/logback/appender/DelegatingAsyncDisruptorAppender.java @@ -21,8 +21,7 @@ import java.util.Iterator; import java.util.concurrent.BlockingQueue; -import com.lmax.disruptor.EventHandler; -import com.lmax.disruptor.RingBuffer; +import net.logstash.logback.appender.listener.AppenderListener; import ch.qos.logback.access.spi.IAccessEvent; import ch.qos.logback.classic.spi.ILoggingEvent; @@ -32,7 +31,8 @@ import ch.qos.logback.core.spi.AppenderAttachable; import ch.qos.logback.core.spi.AppenderAttachableImpl; import ch.qos.logback.core.spi.DeferredProcessingAware; -import net.logstash.logback.appender.listener.AppenderListener; +import com.lmax.disruptor.EventHandler; +import com.lmax.disruptor.RingBuffer; /** * An {@link AsyncDisruptorAppender} that delegates appending of an event diff --git a/src/main/java/net/logstash/logback/appender/LoggingEventAsyncDisruptorAppender.java b/src/main/java/net/logstash/logback/appender/LoggingEventAsyncDisruptorAppender.java index 9d45eac3..ba1586b1 100644 --- a/src/main/java/net/logstash/logback/appender/LoggingEventAsyncDisruptorAppender.java +++ b/src/main/java/net/logstash/logback/appender/LoggingEventAsyncDisruptorAppender.java @@ -16,8 +16,8 @@ package net.logstash.logback.appender; import net.logstash.logback.appender.listener.AppenderListener; -import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.classic.spi.ILoggingEvent; import com.lmax.disruptor.RingBuffer; /** diff --git a/src/main/java/net/logstash/logback/appender/LogstashAccessTcpSocketAppender.java b/src/main/java/net/logstash/logback/appender/LogstashAccessTcpSocketAppender.java index 8b17833d..6e10a195 100644 --- a/src/main/java/net/logstash/logback/appender/LogstashAccessTcpSocketAppender.java +++ b/src/main/java/net/logstash/logback/appender/LogstashAccessTcpSocketAppender.java @@ -16,6 +16,7 @@ package net.logstash.logback.appender; import net.logstash.logback.appender.listener.TcpAppenderListener; + import ch.qos.logback.access.spi.IAccessEvent; /** diff --git a/src/main/java/net/logstash/logback/appender/LogstashTcpSocketAppender.java b/src/main/java/net/logstash/logback/appender/LogstashTcpSocketAppender.java index c99c2ff3..5cb82309 100644 --- a/src/main/java/net/logstash/logback/appender/LogstashTcpSocketAppender.java +++ b/src/main/java/net/logstash/logback/appender/LogstashTcpSocketAppender.java @@ -16,8 +16,8 @@ package net.logstash.logback.appender; import net.logstash.logback.appender.listener.TcpAppenderListener; -import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.classic.spi.ILoggingEvent; import com.lmax.disruptor.RingBuffer; /** diff --git a/src/main/java/net/logstash/logback/appender/listener/FailureSummaryLoggingAppenderListener.java b/src/main/java/net/logstash/logback/appender/listener/FailureSummaryLoggingAppenderListener.java index 5486625a..16d83c9f 100644 --- a/src/main/java/net/logstash/logback/appender/listener/FailureSummaryLoggingAppenderListener.java +++ b/src/main/java/net/logstash/logback/appender/listener/FailureSummaryLoggingAppenderListener.java @@ -21,8 +21,9 @@ import java.util.Objects; import java.util.TimeZone; -import ch.qos.logback.core.spi.DeferredProcessingAware; import net.logstash.logback.argument.StructuredArguments; + +import ch.qos.logback.core.spi.DeferredProcessingAware; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/net/logstash/logback/argument/DeferredStructuredArgument.java b/src/main/java/net/logstash/logback/argument/DeferredStructuredArgument.java index 8d312d4f..57568a46 100644 --- a/src/main/java/net/logstash/logback/argument/DeferredStructuredArgument.java +++ b/src/main/java/net/logstash/logback/argument/DeferredStructuredArgument.java @@ -19,11 +19,11 @@ import java.util.Objects; import java.util.function.Supplier; -import ch.qos.logback.classic.spi.LoggingEvent; import net.logstash.logback.marker.EmptyLogstashMarker; -import org.slf4j.Logger; +import ch.qos.logback.classic.spi.LoggingEvent; import com.fasterxml.jackson.core.JsonGenerator; +import org.slf4j.Logger; /** * A {@link StructuredArgument} that defers the creation of another {@link StructuredArgument} until diff --git a/src/main/java/net/logstash/logback/argument/StructuredArgument.java b/src/main/java/net/logstash/logback/argument/StructuredArgument.java index b2b674c6..f5bbb79a 100644 --- a/src/main/java/net/logstash/logback/argument/StructuredArgument.java +++ b/src/main/java/net/logstash/logback/argument/StructuredArgument.java @@ -17,11 +17,10 @@ import java.io.IOException; -import org.slf4j.Logger; - import net.logstash.logback.composite.loggingevent.ArgumentsJsonProvider; import com.fasterxml.jackson.core.JsonGenerator; +import org.slf4j.Logger; /** * A wrapper for an argument passed to a log method (e.g. {@link Logger#info(String, Object...)}) diff --git a/src/main/java/net/logstash/logback/argument/StructuredArguments.java b/src/main/java/net/logstash/logback/argument/StructuredArguments.java index b5a56b75..06fa5bbc 100644 --- a/src/main/java/net/logstash/logback/argument/StructuredArguments.java +++ b/src/main/java/net/logstash/logback/argument/StructuredArguments.java @@ -19,13 +19,14 @@ import java.util.Map; import java.util.function.Supplier; -import ch.qos.logback.core.Context; -import ch.qos.logback.core.status.StatusManager; -import ch.qos.logback.core.status.WarnStatus; import net.logstash.logback.marker.MapEntriesAppendingMarker; import net.logstash.logback.marker.ObjectAppendingMarker; import net.logstash.logback.marker.ObjectFieldsAppendingMarker; import net.logstash.logback.marker.RawJsonAppendingMarker; + +import ch.qos.logback.core.Context; +import ch.qos.logback.core.status.StatusManager; +import ch.qos.logback.core.status.WarnStatus; import org.slf4j.ILoggerFactory; import org.slf4j.LoggerFactory; diff --git a/src/main/java/net/logstash/logback/composite/AbstractNestedJsonProvider.java b/src/main/java/net/logstash/logback/composite/AbstractNestedJsonProvider.java index 81681b2d..7c4a8d82 100644 --- a/src/main/java/net/logstash/logback/composite/AbstractNestedJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/AbstractNestedJsonProvider.java @@ -17,12 +17,11 @@ import java.io.IOException; -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.core.JsonGenerator; - import ch.qos.logback.access.spi.IAccessEvent; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.spi.DeferredProcessingAware; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonGenerator; /** * A {@link JsonProvider} that nests other providers within a subobject. diff --git a/src/main/java/net/logstash/logback/composite/AbstractPatternJsonProvider.java b/src/main/java/net/logstash/logback/composite/AbstractPatternJsonProvider.java index 067533e8..175187c7 100644 --- a/src/main/java/net/logstash/logback/composite/AbstractPatternJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/AbstractPatternJsonProvider.java @@ -19,10 +19,10 @@ import net.logstash.logback.pattern.AbstractJsonPatternParser; import net.logstash.logback.pattern.NodeWriter; + import ch.qos.logback.access.spi.IAccessEvent; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.spi.DeferredProcessingAware; - import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; diff --git a/src/main/java/net/logstash/logback/composite/CompositeJsonFormatter.java b/src/main/java/net/logstash/logback/composite/CompositeJsonFormatter.java index d5850715..ac7a3c53 100644 --- a/src/main/java/net/logstash/logback/composite/CompositeJsonFormatter.java +++ b/src/main/java/net/logstash/logback/composite/CompositeJsonFormatter.java @@ -25,18 +25,17 @@ import net.logstash.logback.decorate.NullJsonFactoryDecorator; import net.logstash.logback.decorate.NullJsonGeneratorDecorator; -import com.fasterxml.jackson.core.JsonEncoding; -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; - import ch.qos.logback.access.spi.IAccessEvent; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.spi.ContextAware; import ch.qos.logback.core.spi.ContextAwareBase; import ch.qos.logback.core.spi.DeferredProcessingAware; import ch.qos.logback.core.spi.LifeCycle; +import com.fasterxml.jackson.core.JsonEncoding; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; /** * Formats logstash Events as JSON using {@link JsonProvider}s. diff --git a/src/main/java/net/logstash/logback/composite/ContextJsonProvider.java b/src/main/java/net/logstash/logback/composite/ContextJsonProvider.java index f85912e0..794c3239 100644 --- a/src/main/java/net/logstash/logback/composite/ContextJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/ContextJsonProvider.java @@ -19,11 +19,11 @@ import net.logstash.logback.fieldnames.LogstashCommonFieldNames; import net.logstash.logback.fieldnames.LogstashFieldNames; + import ch.qos.logback.access.spi.IAccessEvent; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.Context; import ch.qos.logback.core.spi.DeferredProcessingAware; - import com.fasterxml.jackson.core.JsonGenerator; /** diff --git a/src/main/java/net/logstash/logback/composite/FormattedTimestampJsonProvider.java b/src/main/java/net/logstash/logback/composite/FormattedTimestampJsonProvider.java index e853d15e..83b7db52 100644 --- a/src/main/java/net/logstash/logback/composite/FormattedTimestampJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/FormattedTimestampJsonProvider.java @@ -22,9 +22,9 @@ import java.time.format.DateTimeFormatter; import java.util.TimeZone; -import ch.qos.logback.core.spi.DeferredProcessingAware; import net.logstash.logback.fieldnames.LogstashCommonFieldNames; +import ch.qos.logback.core.spi.DeferredProcessingAware; import com.fasterxml.jackson.core.JsonGenerator; /** diff --git a/src/main/java/net/logstash/logback/composite/GlobalCustomFieldsJsonProvider.java b/src/main/java/net/logstash/logback/composite/GlobalCustomFieldsJsonProvider.java index 577c1525..ccb9dad9 100644 --- a/src/main/java/net/logstash/logback/composite/GlobalCustomFieldsJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/GlobalCustomFieldsJsonProvider.java @@ -20,7 +20,6 @@ import java.util.Map.Entry; import ch.qos.logback.core.spi.DeferredProcessingAware; - import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonNode; diff --git a/src/main/java/net/logstash/logback/composite/JsonProvider.java b/src/main/java/net/logstash/logback/composite/JsonProvider.java index 2240ded2..93718098 100644 --- a/src/main/java/net/logstash/logback/composite/JsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/JsonProvider.java @@ -22,7 +22,6 @@ import ch.qos.logback.core.spi.ContextAware; import ch.qos.logback.core.spi.DeferredProcessingAware; import ch.qos.logback.core.spi.LifeCycle; - import com.fasterxml.jackson.core.JsonGenerator; /** diff --git a/src/main/java/net/logstash/logback/composite/JsonProviders.java b/src/main/java/net/logstash/logback/composite/JsonProviders.java index 0f9cc8f9..8a35fa39 100644 --- a/src/main/java/net/logstash/logback/composite/JsonProviders.java +++ b/src/main/java/net/logstash/logback/composite/JsonProviders.java @@ -24,7 +24,6 @@ import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.Context; import ch.qos.logback.core.spi.DeferredProcessingAware; - import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; diff --git a/src/main/java/net/logstash/logback/composite/LogstashVersionJsonProvider.java b/src/main/java/net/logstash/logback/composite/LogstashVersionJsonProvider.java index 529a3664..79478034 100644 --- a/src/main/java/net/logstash/logback/composite/LogstashVersionJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/LogstashVersionJsonProvider.java @@ -19,11 +19,10 @@ import net.logstash.logback.fieldnames.LogstashCommonFieldNames; -import com.fasterxml.jackson.core.JsonGenerator; - import ch.qos.logback.access.spi.IAccessEvent; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.spi.DeferredProcessingAware; +import com.fasterxml.jackson.core.JsonGenerator; /** * Writes a version field as a string value (by default) or a numeric value (if {@link #isWriteAsInteger()} is true). diff --git a/src/main/java/net/logstash/logback/composite/accessevent/AccessEventCompositeJsonFormatter.java b/src/main/java/net/logstash/logback/composite/accessevent/AccessEventCompositeJsonFormatter.java index 0ae6ed9c..d2eaffe0 100644 --- a/src/main/java/net/logstash/logback/composite/accessevent/AccessEventCompositeJsonFormatter.java +++ b/src/main/java/net/logstash/logback/composite/accessevent/AccessEventCompositeJsonFormatter.java @@ -17,6 +17,7 @@ import net.logstash.logback.composite.CompositeJsonFormatter; import net.logstash.logback.composite.JsonProviders; + import ch.qos.logback.access.spi.IAccessEvent; import ch.qos.logback.core.joran.spi.DefaultClass; import ch.qos.logback.core.spi.ContextAware; diff --git a/src/main/java/net/logstash/logback/composite/accessevent/AccessEventFormattedTimestampJsonProvider.java b/src/main/java/net/logstash/logback/composite/accessevent/AccessEventFormattedTimestampJsonProvider.java index aef0aaa5..139c934e 100644 --- a/src/main/java/net/logstash/logback/composite/accessevent/AccessEventFormattedTimestampJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/accessevent/AccessEventFormattedTimestampJsonProvider.java @@ -17,6 +17,7 @@ import net.logstash.logback.composite.FormattedTimestampJsonProvider; import net.logstash.logback.fieldnames.LogstashAccessFieldNames; + import ch.qos.logback.access.spi.IAccessEvent; public class AccessEventFormattedTimestampJsonProvider extends FormattedTimestampJsonProvider { diff --git a/src/main/java/net/logstash/logback/composite/accessevent/AccessEventJsonProviders.java b/src/main/java/net/logstash/logback/composite/accessevent/AccessEventJsonProviders.java index 9edd92d4..59e49211 100644 --- a/src/main/java/net/logstash/logback/composite/accessevent/AccessEventJsonProviders.java +++ b/src/main/java/net/logstash/logback/composite/accessevent/AccessEventJsonProviders.java @@ -19,6 +19,7 @@ import net.logstash.logback.composite.GlobalCustomFieldsJsonProvider; import net.logstash.logback.composite.JsonProviders; import net.logstash.logback.composite.LogstashVersionJsonProvider; + import ch.qos.logback.access.spi.IAccessEvent; /** diff --git a/src/main/java/net/logstash/logback/composite/accessevent/AccessEventNestedJsonProvider.java b/src/main/java/net/logstash/logback/composite/accessevent/AccessEventNestedJsonProvider.java index 9d0ace72..31d32a18 100644 --- a/src/main/java/net/logstash/logback/composite/accessevent/AccessEventNestedJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/accessevent/AccessEventNestedJsonProvider.java @@ -17,6 +17,7 @@ import net.logstash.logback.composite.AbstractNestedJsonProvider; import net.logstash.logback.composite.JsonProviders; + import ch.qos.logback.access.spi.IAccessEvent; import ch.qos.logback.core.joran.spi.DefaultClass; diff --git a/src/main/java/net/logstash/logback/composite/accessevent/AccessEventPatternJsonProvider.java b/src/main/java/net/logstash/logback/composite/accessevent/AccessEventPatternJsonProvider.java index 7d4e3425..d28579f6 100644 --- a/src/main/java/net/logstash/logback/composite/accessevent/AccessEventPatternJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/accessevent/AccessEventPatternJsonProvider.java @@ -18,6 +18,7 @@ import net.logstash.logback.composite.AbstractPatternJsonProvider; import net.logstash.logback.pattern.AbstractJsonPatternParser; import net.logstash.logback.pattern.AccessEventJsonPatternParser; + import ch.qos.logback.access.spi.IAccessEvent; /** diff --git a/src/main/java/net/logstash/logback/composite/accessevent/AccessMessageJsonProvider.java b/src/main/java/net/logstash/logback/composite/accessevent/AccessMessageJsonProvider.java index 6d46c8cc..1f946d49 100644 --- a/src/main/java/net/logstash/logback/composite/accessevent/AccessMessageJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/accessevent/AccessMessageJsonProvider.java @@ -20,8 +20,8 @@ import net.logstash.logback.composite.JsonWritingUtils; import net.logstash.logback.composite.loggingevent.MessageJsonProvider; import net.logstash.logback.fieldnames.LogstashAccessFieldNames; -import ch.qos.logback.access.spi.IAccessEvent; +import ch.qos.logback.access.spi.IAccessEvent; import com.fasterxml.jackson.core.JsonGenerator; public class AccessMessageJsonProvider extends AccessEventFormattedTimestampJsonProvider { diff --git a/src/main/java/net/logstash/logback/composite/accessevent/ContentLengthJsonProvider.java b/src/main/java/net/logstash/logback/composite/accessevent/ContentLengthJsonProvider.java index 9ee3586d..07b2f0fa 100644 --- a/src/main/java/net/logstash/logback/composite/accessevent/ContentLengthJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/accessevent/ContentLengthJsonProvider.java @@ -17,14 +17,14 @@ import java.io.IOException; -import com.fasterxml.jackson.core.JsonGenerator; - -import ch.qos.logback.access.spi.IAccessEvent; import net.logstash.logback.composite.AbstractFieldJsonProvider; import net.logstash.logback.composite.FieldNamesAware; import net.logstash.logback.composite.JsonWritingUtils; import net.logstash.logback.fieldnames.LogstashAccessFieldNames; +import ch.qos.logback.access.spi.IAccessEvent; +import com.fasterxml.jackson.core.JsonGenerator; + public class ContentLengthJsonProvider extends AbstractFieldJsonProvider implements FieldNamesAware { public static final String FIELD_CONTENT_LENGTH = "content_length"; diff --git a/src/main/java/net/logstash/logback/composite/accessevent/ElapsedTimeJsonProvider.java b/src/main/java/net/logstash/logback/composite/accessevent/ElapsedTimeJsonProvider.java index 3bea4408..f42940fd 100644 --- a/src/main/java/net/logstash/logback/composite/accessevent/ElapsedTimeJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/accessevent/ElapsedTimeJsonProvider.java @@ -17,14 +17,14 @@ import java.io.IOException; -import com.fasterxml.jackson.core.JsonGenerator; - -import ch.qos.logback.access.spi.IAccessEvent; import net.logstash.logback.composite.AbstractFieldJsonProvider; import net.logstash.logback.composite.FieldNamesAware; import net.logstash.logback.composite.JsonWritingUtils; import net.logstash.logback.fieldnames.LogstashAccessFieldNames; +import ch.qos.logback.access.spi.IAccessEvent; +import com.fasterxml.jackson.core.JsonGenerator; + public class ElapsedTimeJsonProvider extends AbstractFieldJsonProvider implements FieldNamesAware { public static final String FIELD_ELAPSED_TIME = "elapsed_time"; diff --git a/src/main/java/net/logstash/logback/composite/accessevent/MethodJsonProvider.java b/src/main/java/net/logstash/logback/composite/accessevent/MethodJsonProvider.java index 4556ac54..85795a15 100644 --- a/src/main/java/net/logstash/logback/composite/accessevent/MethodJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/accessevent/MethodJsonProvider.java @@ -17,14 +17,14 @@ import java.io.IOException; -import com.fasterxml.jackson.core.JsonGenerator; - -import ch.qos.logback.access.spi.IAccessEvent; import net.logstash.logback.composite.AbstractFieldJsonProvider; import net.logstash.logback.composite.FieldNamesAware; import net.logstash.logback.composite.JsonWritingUtils; import net.logstash.logback.fieldnames.LogstashAccessFieldNames; +import ch.qos.logback.access.spi.IAccessEvent; +import com.fasterxml.jackson.core.JsonGenerator; + public class MethodJsonProvider extends AbstractFieldJsonProvider implements FieldNamesAware { public static final String FIELD_METHOD = "method"; diff --git a/src/main/java/net/logstash/logback/composite/accessevent/ProtocolJsonProvider.java b/src/main/java/net/logstash/logback/composite/accessevent/ProtocolJsonProvider.java index dcb8ee15..c6ef9ef8 100644 --- a/src/main/java/net/logstash/logback/composite/accessevent/ProtocolJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/accessevent/ProtocolJsonProvider.java @@ -17,14 +17,14 @@ import java.io.IOException; -import com.fasterxml.jackson.core.JsonGenerator; - -import ch.qos.logback.access.spi.IAccessEvent; import net.logstash.logback.composite.AbstractFieldJsonProvider; import net.logstash.logback.composite.FieldNamesAware; import net.logstash.logback.composite.JsonWritingUtils; import net.logstash.logback.fieldnames.LogstashAccessFieldNames; +import ch.qos.logback.access.spi.IAccessEvent; +import com.fasterxml.jackson.core.JsonGenerator; + public class ProtocolJsonProvider extends AbstractFieldJsonProvider implements FieldNamesAware { public static final String FIELD_PROTOCOL = "protocol"; diff --git a/src/main/java/net/logstash/logback/composite/accessevent/RemoteHostJsonProvider.java b/src/main/java/net/logstash/logback/composite/accessevent/RemoteHostJsonProvider.java index 441681ed..4ba7682c 100644 --- a/src/main/java/net/logstash/logback/composite/accessevent/RemoteHostJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/accessevent/RemoteHostJsonProvider.java @@ -17,14 +17,14 @@ import java.io.IOException; -import com.fasterxml.jackson.core.JsonGenerator; - -import ch.qos.logback.access.spi.IAccessEvent; import net.logstash.logback.composite.AbstractFieldJsonProvider; import net.logstash.logback.composite.FieldNamesAware; import net.logstash.logback.composite.JsonWritingUtils; import net.logstash.logback.fieldnames.LogstashAccessFieldNames; +import ch.qos.logback.access.spi.IAccessEvent; +import com.fasterxml.jackson.core.JsonGenerator; + public class RemoteHostJsonProvider extends AbstractFieldJsonProvider implements FieldNamesAware { public static final String FIELD_REMOTE_HOST = "remote_host"; diff --git a/src/main/java/net/logstash/logback/composite/accessevent/RemoteUserJsonProvider.java b/src/main/java/net/logstash/logback/composite/accessevent/RemoteUserJsonProvider.java index 06f6fdc3..d3ca43af 100644 --- a/src/main/java/net/logstash/logback/composite/accessevent/RemoteUserJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/accessevent/RemoteUserJsonProvider.java @@ -17,14 +17,14 @@ import java.io.IOException; -import com.fasterxml.jackson.core.JsonGenerator; - -import ch.qos.logback.access.spi.IAccessEvent; import net.logstash.logback.composite.AbstractFieldJsonProvider; import net.logstash.logback.composite.FieldNamesAware; import net.logstash.logback.composite.JsonWritingUtils; import net.logstash.logback.fieldnames.LogstashAccessFieldNames; +import ch.qos.logback.access.spi.IAccessEvent; +import com.fasterxml.jackson.core.JsonGenerator; + public class RemoteUserJsonProvider extends AbstractFieldJsonProvider implements FieldNamesAware { public static final String FIELD_REMOTE_USER = "remote_user"; diff --git a/src/main/java/net/logstash/logback/composite/accessevent/RequestHeadersJsonProvider.java b/src/main/java/net/logstash/logback/composite/accessevent/RequestHeadersJsonProvider.java index 44d1dc43..a1d62a10 100644 --- a/src/main/java/net/logstash/logback/composite/accessevent/RequestHeadersJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/accessevent/RequestHeadersJsonProvider.java @@ -23,9 +23,9 @@ import net.logstash.logback.composite.FieldNamesAware; import net.logstash.logback.composite.JsonWritingUtils; import net.logstash.logback.fieldnames.LogstashAccessFieldNames; + import ch.qos.logback.access.spi.IAccessEvent; import ch.qos.logback.core.joran.spi.DefaultClass; - import com.fasterxml.jackson.core.JsonGenerator; public class RequestHeadersJsonProvider extends AbstractFieldJsonProvider implements FieldNamesAware { diff --git a/src/main/java/net/logstash/logback/composite/accessevent/RequestedUriJsonProvider.java b/src/main/java/net/logstash/logback/composite/accessevent/RequestedUriJsonProvider.java index 593ecd04..7bd55842 100644 --- a/src/main/java/net/logstash/logback/composite/accessevent/RequestedUriJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/accessevent/RequestedUriJsonProvider.java @@ -17,14 +17,14 @@ import java.io.IOException; -import com.fasterxml.jackson.core.JsonGenerator; - -import ch.qos.logback.access.spi.IAccessEvent; import net.logstash.logback.composite.AbstractFieldJsonProvider; import net.logstash.logback.composite.FieldNamesAware; import net.logstash.logback.composite.JsonWritingUtils; import net.logstash.logback.fieldnames.LogstashAccessFieldNames; +import ch.qos.logback.access.spi.IAccessEvent; +import com.fasterxml.jackson.core.JsonGenerator; + public class RequestedUriJsonProvider extends AbstractFieldJsonProvider implements FieldNamesAware { public static final String FIELD_REQUESTED_URI = "requested_uri"; diff --git a/src/main/java/net/logstash/logback/composite/accessevent/RequestedUrlJsonProvider.java b/src/main/java/net/logstash/logback/composite/accessevent/RequestedUrlJsonProvider.java index 2f4a48f5..aede405b 100644 --- a/src/main/java/net/logstash/logback/composite/accessevent/RequestedUrlJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/accessevent/RequestedUrlJsonProvider.java @@ -17,14 +17,14 @@ import java.io.IOException; -import com.fasterxml.jackson.core.JsonGenerator; - -import ch.qos.logback.access.spi.IAccessEvent; import net.logstash.logback.composite.AbstractFieldJsonProvider; import net.logstash.logback.composite.FieldNamesAware; import net.logstash.logback.composite.JsonWritingUtils; import net.logstash.logback.fieldnames.LogstashAccessFieldNames; +import ch.qos.logback.access.spi.IAccessEvent; +import com.fasterxml.jackson.core.JsonGenerator; + public class RequestedUrlJsonProvider extends AbstractFieldJsonProvider implements FieldNamesAware { public static final String FIELD_REQUESTED_URL = "requested_url"; diff --git a/src/main/java/net/logstash/logback/composite/accessevent/ResponseHeadersJsonProvider.java b/src/main/java/net/logstash/logback/composite/accessevent/ResponseHeadersJsonProvider.java index ab6698d1..aa95ebef 100644 --- a/src/main/java/net/logstash/logback/composite/accessevent/ResponseHeadersJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/accessevent/ResponseHeadersJsonProvider.java @@ -23,9 +23,9 @@ import net.logstash.logback.composite.FieldNamesAware; import net.logstash.logback.composite.JsonWritingUtils; import net.logstash.logback.fieldnames.LogstashAccessFieldNames; + import ch.qos.logback.access.spi.IAccessEvent; import ch.qos.logback.core.joran.spi.DefaultClass; - import com.fasterxml.jackson.core.JsonGenerator; public class ResponseHeadersJsonProvider extends AbstractFieldJsonProvider implements FieldNamesAware { diff --git a/src/main/java/net/logstash/logback/composite/accessevent/StatusCodeJsonProvider.java b/src/main/java/net/logstash/logback/composite/accessevent/StatusCodeJsonProvider.java index 0a89c842..e6f32952 100644 --- a/src/main/java/net/logstash/logback/composite/accessevent/StatusCodeJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/accessevent/StatusCodeJsonProvider.java @@ -17,14 +17,14 @@ import java.io.IOException; -import com.fasterxml.jackson.core.JsonGenerator; - -import ch.qos.logback.access.spi.IAccessEvent; import net.logstash.logback.composite.AbstractFieldJsonProvider; import net.logstash.logback.composite.FieldNamesAware; import net.logstash.logback.composite.JsonWritingUtils; import net.logstash.logback.fieldnames.LogstashAccessFieldNames; +import ch.qos.logback.access.spi.IAccessEvent; +import com.fasterxml.jackson.core.JsonGenerator; + public class StatusCodeJsonProvider extends AbstractFieldJsonProvider implements FieldNamesAware { public static final String FIELD_STATUS_CODE = "status_code"; diff --git a/src/main/java/net/logstash/logback/composite/loggingevent/AbstractThrowableClassNameJsonProvider.java b/src/main/java/net/logstash/logback/composite/loggingevent/AbstractThrowableClassNameJsonProvider.java index 2f62f0f9..fc232a7c 100644 --- a/src/main/java/net/logstash/logback/composite/loggingevent/AbstractThrowableClassNameJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/loggingevent/AbstractThrowableClassNameJsonProvider.java @@ -17,13 +17,13 @@ import java.io.IOException; -import com.fasterxml.jackson.core.JsonGenerator; +import net.logstash.logback.composite.AbstractFieldJsonProvider; +import net.logstash.logback.composite.JsonWritingUtils; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.classic.spi.IThrowableProxy; import ch.qos.logback.classic.spi.ThrowableProxy; -import net.logstash.logback.composite.AbstractFieldJsonProvider; -import net.logstash.logback.composite.JsonWritingUtils; +import com.fasterxml.jackson.core.JsonGenerator; public abstract class AbstractThrowableClassNameJsonProvider extends AbstractFieldJsonProvider { static final boolean DEFAULT_USE_SIMPLE_CLASS_NAME = true; diff --git a/src/main/java/net/logstash/logback/composite/loggingevent/ArgumentsJsonProvider.java b/src/main/java/net/logstash/logback/composite/loggingevent/ArgumentsJsonProvider.java index 17f2c651..135dbf61 100644 --- a/src/main/java/net/logstash/logback/composite/loggingevent/ArgumentsJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/loggingevent/ArgumentsJsonProvider.java @@ -21,8 +21,8 @@ import net.logstash.logback.composite.AbstractFieldJsonProvider; import net.logstash.logback.composite.FieldNamesAware; import net.logstash.logback.fieldnames.LogstashFieldNames; -import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.classic.spi.ILoggingEvent; import com.fasterxml.jackson.core.JsonGenerator; /** diff --git a/src/main/java/net/logstash/logback/composite/loggingevent/CallerDataJsonProvider.java b/src/main/java/net/logstash/logback/composite/loggingevent/CallerDataJsonProvider.java index 0a32aed8..8ba176f8 100644 --- a/src/main/java/net/logstash/logback/composite/loggingevent/CallerDataJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/loggingevent/CallerDataJsonProvider.java @@ -21,8 +21,8 @@ import net.logstash.logback.composite.FieldNamesAware; import net.logstash.logback.composite.JsonWritingUtils; import net.logstash.logback.fieldnames.LogstashFieldNames; -import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.classic.spi.ILoggingEvent; import com.fasterxml.jackson.core.JsonGenerator; public class CallerDataJsonProvider extends AbstractFieldJsonProvider implements FieldNamesAware { diff --git a/src/main/java/net/logstash/logback/composite/loggingevent/ContextNameJsonProvider.java b/src/main/java/net/logstash/logback/composite/loggingevent/ContextNameJsonProvider.java index 5b89681b..b1752351 100644 --- a/src/main/java/net/logstash/logback/composite/loggingevent/ContextNameJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/loggingevent/ContextNameJsonProvider.java @@ -19,8 +19,8 @@ import net.logstash.logback.composite.AbstractFieldJsonProvider; import net.logstash.logback.composite.JsonWritingUtils; -import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.classic.spi.ILoggingEvent; import com.fasterxml.jackson.core.JsonGenerator; public class ContextNameJsonProvider extends AbstractFieldJsonProvider { diff --git a/src/main/java/net/logstash/logback/composite/loggingevent/LogLevelJsonProvider.java b/src/main/java/net/logstash/logback/composite/loggingevent/LogLevelJsonProvider.java index 193194f0..38f02a92 100644 --- a/src/main/java/net/logstash/logback/composite/loggingevent/LogLevelJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/loggingevent/LogLevelJsonProvider.java @@ -17,15 +17,14 @@ import java.io.IOException; -import ch.qos.logback.classic.spi.ILoggingEvent; - -import com.fasterxml.jackson.core.JsonGenerator; - import net.logstash.logback.composite.AbstractFieldJsonProvider; import net.logstash.logback.composite.FieldNamesAware; import net.logstash.logback.composite.JsonWritingUtils; import net.logstash.logback.fieldnames.LogstashFieldNames; +import ch.qos.logback.classic.spi.ILoggingEvent; +import com.fasterxml.jackson.core.JsonGenerator; + public class LogLevelJsonProvider extends AbstractFieldJsonProvider implements FieldNamesAware { public static final String FIELD_LEVEL = "level"; diff --git a/src/main/java/net/logstash/logback/composite/loggingevent/LogLevelValueJsonProvider.java b/src/main/java/net/logstash/logback/composite/loggingevent/LogLevelValueJsonProvider.java index 7fded87f..f6c2786c 100644 --- a/src/main/java/net/logstash/logback/composite/loggingevent/LogLevelValueJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/loggingevent/LogLevelValueJsonProvider.java @@ -17,15 +17,14 @@ import java.io.IOException; -import ch.qos.logback.classic.spi.ILoggingEvent; - -import com.fasterxml.jackson.core.JsonGenerator; - import net.logstash.logback.composite.AbstractFieldJsonProvider; import net.logstash.logback.composite.FieldNamesAware; import net.logstash.logback.composite.JsonWritingUtils; import net.logstash.logback.fieldnames.LogstashFieldNames; +import ch.qos.logback.classic.spi.ILoggingEvent; +import com.fasterxml.jackson.core.JsonGenerator; + public class LogLevelValueJsonProvider extends AbstractFieldJsonProvider implements FieldNamesAware { public static final String FIELD_LEVEL_VALUE = "level_value"; diff --git a/src/main/java/net/logstash/logback/composite/loggingevent/LoggerNameJsonProvider.java b/src/main/java/net/logstash/logback/composite/loggingevent/LoggerNameJsonProvider.java index b9552b58..6191a864 100644 --- a/src/main/java/net/logstash/logback/composite/loggingevent/LoggerNameJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/loggingevent/LoggerNameJsonProvider.java @@ -23,10 +23,10 @@ import net.logstash.logback.composite.FieldNamesAware; import net.logstash.logback.composite.JsonWritingUtils; import net.logstash.logback.fieldnames.LogstashFieldNames; + import ch.qos.logback.classic.pattern.Abbreviator; import ch.qos.logback.classic.pattern.TargetLengthBasedClassNameAbbreviator; import ch.qos.logback.classic.spi.ILoggingEvent; - import com.fasterxml.jackson.core.JsonGenerator; public class LoggerNameJsonProvider extends AbstractFieldJsonProvider implements FieldNamesAware { diff --git a/src/main/java/net/logstash/logback/composite/loggingevent/LoggingEventCompositeJsonFormatter.java b/src/main/java/net/logstash/logback/composite/loggingevent/LoggingEventCompositeJsonFormatter.java index 57412c6f..f94b7d63 100644 --- a/src/main/java/net/logstash/logback/composite/loggingevent/LoggingEventCompositeJsonFormatter.java +++ b/src/main/java/net/logstash/logback/composite/loggingevent/LoggingEventCompositeJsonFormatter.java @@ -17,6 +17,7 @@ import net.logstash.logback.composite.CompositeJsonFormatter; import net.logstash.logback.composite.JsonProviders; + import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.joran.spi.DefaultClass; import ch.qos.logback.core.spi.ContextAware; diff --git a/src/main/java/net/logstash/logback/composite/loggingevent/LoggingEventFormattedTimestampJsonProvider.java b/src/main/java/net/logstash/logback/composite/loggingevent/LoggingEventFormattedTimestampJsonProvider.java index b337576b..d830eb4a 100644 --- a/src/main/java/net/logstash/logback/composite/loggingevent/LoggingEventFormattedTimestampJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/loggingevent/LoggingEventFormattedTimestampJsonProvider.java @@ -17,6 +17,7 @@ import net.logstash.logback.composite.FormattedTimestampJsonProvider; import net.logstash.logback.fieldnames.LogstashFieldNames; + import ch.qos.logback.classic.spi.ILoggingEvent; public class LoggingEventFormattedTimestampJsonProvider extends FormattedTimestampJsonProvider { diff --git a/src/main/java/net/logstash/logback/composite/loggingevent/LoggingEventJsonProviders.java b/src/main/java/net/logstash/logback/composite/loggingevent/LoggingEventJsonProviders.java index 202e8785..1b30d437 100644 --- a/src/main/java/net/logstash/logback/composite/loggingevent/LoggingEventJsonProviders.java +++ b/src/main/java/net/logstash/logback/composite/loggingevent/LoggingEventJsonProviders.java @@ -15,12 +15,13 @@ */ package net.logstash.logback.composite.loggingevent; -import ch.qos.logback.classic.spi.ILoggingEvent; import net.logstash.logback.composite.ContextJsonProvider; import net.logstash.logback.composite.GlobalCustomFieldsJsonProvider; import net.logstash.logback.composite.JsonProviders; import net.logstash.logback.composite.LogstashVersionJsonProvider; +import ch.qos.logback.classic.spi.ILoggingEvent; + /** * Used to make it make it more convenient to create well-known * {@link JsonProviders} via xml configuration. diff --git a/src/main/java/net/logstash/logback/composite/loggingevent/LoggingEventNestedJsonProvider.java b/src/main/java/net/logstash/logback/composite/loggingevent/LoggingEventNestedJsonProvider.java index bc2d697b..da84096b 100644 --- a/src/main/java/net/logstash/logback/composite/loggingevent/LoggingEventNestedJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/loggingevent/LoggingEventNestedJsonProvider.java @@ -17,6 +17,7 @@ import net.logstash.logback.composite.AbstractNestedJsonProvider; import net.logstash.logback.composite.JsonProviders; + import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.joran.spi.DefaultClass; diff --git a/src/main/java/net/logstash/logback/composite/loggingevent/LoggingEventPatternJsonProvider.java b/src/main/java/net/logstash/logback/composite/loggingevent/LoggingEventPatternJsonProvider.java index e635c452..3119350c 100644 --- a/src/main/java/net/logstash/logback/composite/loggingevent/LoggingEventPatternJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/loggingevent/LoggingEventPatternJsonProvider.java @@ -18,6 +18,7 @@ import net.logstash.logback.composite.AbstractPatternJsonProvider; import net.logstash.logback.pattern.AbstractJsonPatternParser; import net.logstash.logback.pattern.LoggingEventJsonPatternParser; + import ch.qos.logback.classic.spi.ILoggingEvent; /** diff --git a/src/main/java/net/logstash/logback/composite/loggingevent/LogstashMarkersJsonProvider.java b/src/main/java/net/logstash/logback/composite/loggingevent/LogstashMarkersJsonProvider.java index f58ef705..cd57a070 100644 --- a/src/main/java/net/logstash/logback/composite/loggingevent/LogstashMarkersJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/loggingevent/LogstashMarkersJsonProvider.java @@ -23,11 +23,9 @@ import net.logstash.logback.marker.LogstashMarker; import net.logstash.logback.marker.Markers; -import org.slf4j.Marker; - import ch.qos.logback.classic.spi.ILoggingEvent; - import com.fasterxml.jackson.core.JsonGenerator; +import org.slf4j.Marker; /** * A {@link JsonProvider} that processes {@link LogstashMarker}s diff --git a/src/main/java/net/logstash/logback/composite/loggingevent/MdcJsonProvider.java b/src/main/java/net/logstash/logback/composite/loggingevent/MdcJsonProvider.java index 7651f289..d2f2fcbe 100644 --- a/src/main/java/net/logstash/logback/composite/loggingevent/MdcJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/loggingevent/MdcJsonProvider.java @@ -22,14 +22,13 @@ import java.util.List; import java.util.Map; -import org.slf4j.MDC; - import net.logstash.logback.composite.AbstractFieldJsonProvider; import net.logstash.logback.composite.FieldNamesAware; import net.logstash.logback.fieldnames.LogstashFieldNames; -import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.classic.spi.ILoggingEvent; import com.fasterxml.jackson.core.JsonGenerator; +import org.slf4j.MDC; /** * Includes {@link MDC} properties in the JSON output according to diff --git a/src/main/java/net/logstash/logback/composite/loggingevent/MessageJsonProvider.java b/src/main/java/net/logstash/logback/composite/loggingevent/MessageJsonProvider.java index 3b5c1bf0..5b00cb05 100644 --- a/src/main/java/net/logstash/logback/composite/loggingevent/MessageJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/loggingevent/MessageJsonProvider.java @@ -23,8 +23,8 @@ import net.logstash.logback.composite.JsonWritingUtils; import net.logstash.logback.encoder.SeparatorParser; import net.logstash.logback.fieldnames.LogstashFieldNames; -import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.classic.spi.ILoggingEvent; import com.fasterxml.jackson.core.JsonGenerator; public class MessageJsonProvider extends AbstractFieldJsonProvider implements FieldNamesAware { diff --git a/src/main/java/net/logstash/logback/composite/loggingevent/RawMessageJsonProvider.java b/src/main/java/net/logstash/logback/composite/loggingevent/RawMessageJsonProvider.java index aabdbee4..5ef32e51 100644 --- a/src/main/java/net/logstash/logback/composite/loggingevent/RawMessageJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/loggingevent/RawMessageJsonProvider.java @@ -19,8 +19,8 @@ import net.logstash.logback.composite.AbstractFieldJsonProvider; import net.logstash.logback.composite.JsonWritingUtils; -import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.classic.spi.ILoggingEvent; import com.fasterxml.jackson.core.JsonGenerator; public class RawMessageJsonProvider extends AbstractFieldJsonProvider { diff --git a/src/main/java/net/logstash/logback/composite/loggingevent/RootStackTraceElementJsonProvider.java b/src/main/java/net/logstash/logback/composite/loggingevent/RootStackTraceElementJsonProvider.java index 3daf4d7b..d8bf3d24 100644 --- a/src/main/java/net/logstash/logback/composite/loggingevent/RootStackTraceElementJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/loggingevent/RootStackTraceElementJsonProvider.java @@ -15,16 +15,17 @@ */ package net.logstash.logback.composite.loggingevent; -import ch.qos.logback.classic.spi.ILoggingEvent; -import ch.qos.logback.classic.spi.IThrowableProxy; -import ch.qos.logback.classic.spi.ThrowableProxy; -import com.fasterxml.jackson.core.JsonGenerator; +import java.io.IOException; + import net.logstash.logback.composite.AbstractFieldJsonProvider; import net.logstash.logback.composite.FieldNamesAware; import net.logstash.logback.composite.JsonWritingUtils; import net.logstash.logback.fieldnames.LogstashFieldNames; -import java.io.IOException; +import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.classic.spi.IThrowableProxy; +import ch.qos.logback.classic.spi.ThrowableProxy; +import com.fasterxml.jackson.core.JsonGenerator; /** * A JSON provider that, for any log event with a stack trace, diff --git a/src/main/java/net/logstash/logback/composite/loggingevent/SequenceJsonProvider.java b/src/main/java/net/logstash/logback/composite/loggingevent/SequenceJsonProvider.java index 0e97eedd..3c3e1948 100644 --- a/src/main/java/net/logstash/logback/composite/loggingevent/SequenceJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/loggingevent/SequenceJsonProvider.java @@ -15,13 +15,14 @@ */ package net.logstash.logback.composite.loggingevent; -import ch.qos.logback.classic.spi.ILoggingEvent; -import com.fasterxml.jackson.core.JsonGenerator; +import java.io.IOException; +import java.util.concurrent.atomic.AtomicLong; + import net.logstash.logback.composite.AbstractFieldJsonProvider; import net.logstash.logback.composite.JsonWritingUtils; -import java.io.IOException; -import java.util.concurrent.atomic.AtomicLong; +import ch.qos.logback.classic.spi.ILoggingEvent; +import com.fasterxml.jackson.core.JsonGenerator; /** * Outputs an incrementing sequence number. diff --git a/src/main/java/net/logstash/logback/composite/loggingevent/StackHashJsonProvider.java b/src/main/java/net/logstash/logback/composite/loggingevent/StackHashJsonProvider.java index 76a0f254..3fde1fb2 100644 --- a/src/main/java/net/logstash/logback/composite/loggingevent/StackHashJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/loggingevent/StackHashJsonProvider.java @@ -15,21 +15,22 @@ */ package net.logstash.logback.composite.loggingevent; -import ch.qos.logback.classic.spi.ILoggingEvent; -import ch.qos.logback.classic.spi.IThrowableProxy; -import ch.qos.logback.classic.spi.ThrowableProxy; -import com.fasterxml.jackson.core.JsonGenerator; -import net.logstash.logback.composite.AbstractFieldJsonProvider; -import net.logstash.logback.composite.JsonWritingUtils; -import net.logstash.logback.stacktrace.StackElementFilter; -import net.logstash.logback.stacktrace.StackHasher; - import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.regex.Pattern; +import net.logstash.logback.composite.AbstractFieldJsonProvider; +import net.logstash.logback.composite.JsonWritingUtils; +import net.logstash.logback.stacktrace.StackElementFilter; +import net.logstash.logback.stacktrace.StackHasher; + +import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.classic.spi.IThrowableProxy; +import ch.qos.logback.classic.spi.ThrowableProxy; +import com.fasterxml.jackson.core.JsonGenerator; + /** * A JSON provider that adds a {@code stack_hash} Json field on a log with a stack trace *

diff --git a/src/main/java/net/logstash/logback/composite/loggingevent/StackTraceJsonProvider.java b/src/main/java/net/logstash/logback/composite/loggingevent/StackTraceJsonProvider.java index 6b704687..50b44789 100644 --- a/src/main/java/net/logstash/logback/composite/loggingevent/StackTraceJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/loggingevent/StackTraceJsonProvider.java @@ -17,16 +17,16 @@ import java.io.IOException; -import com.fasterxml.jackson.core.JsonGenerator; +import net.logstash.logback.composite.AbstractFieldJsonProvider; +import net.logstash.logback.composite.FieldNamesAware; +import net.logstash.logback.composite.JsonWritingUtils; +import net.logstash.logback.fieldnames.LogstashFieldNames; import ch.qos.logback.classic.pattern.ExtendedThrowableProxyConverter; import ch.qos.logback.classic.pattern.ThrowableHandlingConverter; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.classic.spi.IThrowableProxy; -import net.logstash.logback.composite.AbstractFieldJsonProvider; -import net.logstash.logback.composite.FieldNamesAware; -import net.logstash.logback.composite.JsonWritingUtils; -import net.logstash.logback.fieldnames.LogstashFieldNames; +import com.fasterxml.jackson.core.JsonGenerator; public class StackTraceJsonProvider extends AbstractFieldJsonProvider implements FieldNamesAware { diff --git a/src/main/java/net/logstash/logback/composite/loggingevent/TagsJsonProvider.java b/src/main/java/net/logstash/logback/composite/loggingevent/TagsJsonProvider.java index 4dde64db..1db19700 100644 --- a/src/main/java/net/logstash/logback/composite/loggingevent/TagsJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/loggingevent/TagsJsonProvider.java @@ -23,11 +23,9 @@ import net.logstash.logback.fieldnames.LogstashFieldNames; import net.logstash.logback.marker.LogstashMarker; -import org.slf4j.Marker; - import ch.qos.logback.classic.spi.ILoggingEvent; - import com.fasterxml.jackson.core.JsonGenerator; +import org.slf4j.Marker; /** * Writes {@link Marker} names as an array to the 'tags' field. diff --git a/src/main/java/net/logstash/logback/composite/loggingevent/ThreadNameJsonProvider.java b/src/main/java/net/logstash/logback/composite/loggingevent/ThreadNameJsonProvider.java index 99d2a98b..a2e38e36 100644 --- a/src/main/java/net/logstash/logback/composite/loggingevent/ThreadNameJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/loggingevent/ThreadNameJsonProvider.java @@ -21,8 +21,8 @@ import net.logstash.logback.composite.FieldNamesAware; import net.logstash.logback.composite.JsonWritingUtils; import net.logstash.logback.fieldnames.LogstashFieldNames; -import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.classic.spi.ILoggingEvent; import com.fasterxml.jackson.core.JsonGenerator; public class ThreadNameJsonProvider extends AbstractFieldJsonProvider implements FieldNamesAware { diff --git a/src/main/java/net/logstash/logback/composite/loggingevent/UuidProvider.java b/src/main/java/net/logstash/logback/composite/loggingevent/UuidProvider.java index 18c334bc..d9f4d706 100644 --- a/src/main/java/net/logstash/logback/composite/loggingevent/UuidProvider.java +++ b/src/main/java/net/logstash/logback/composite/loggingevent/UuidProvider.java @@ -19,8 +19,8 @@ import net.logstash.logback.composite.AbstractFieldJsonProvider; import net.logstash.logback.composite.JsonWritingUtils; -import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.classic.spi.ILoggingEvent; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.uuid.EthernetAddress; import com.fasterxml.uuid.Generators; diff --git a/src/main/java/net/logstash/logback/encoder/AccessEventCompositeJsonEncoder.java b/src/main/java/net/logstash/logback/encoder/AccessEventCompositeJsonEncoder.java index 72cad5fa..f64f25fc 100644 --- a/src/main/java/net/logstash/logback/encoder/AccessEventCompositeJsonEncoder.java +++ b/src/main/java/net/logstash/logback/encoder/AccessEventCompositeJsonEncoder.java @@ -17,8 +17,9 @@ import net.logstash.logback.composite.CompositeJsonFormatter; import net.logstash.logback.composite.JsonProviders; -import net.logstash.logback.composite.accessevent.AccessEventJsonProviders; import net.logstash.logback.composite.accessevent.AccessEventCompositeJsonFormatter; +import net.logstash.logback.composite.accessevent.AccessEventJsonProviders; + import ch.qos.logback.access.spi.IAccessEvent; import ch.qos.logback.core.joran.spi.DefaultClass; diff --git a/src/main/java/net/logstash/logback/encoder/LoggingEventCompositeJsonEncoder.java b/src/main/java/net/logstash/logback/encoder/LoggingEventCompositeJsonEncoder.java index b2095c84..ebd934b7 100644 --- a/src/main/java/net/logstash/logback/encoder/LoggingEventCompositeJsonEncoder.java +++ b/src/main/java/net/logstash/logback/encoder/LoggingEventCompositeJsonEncoder.java @@ -19,6 +19,7 @@ import net.logstash.logback.composite.JsonProviders; import net.logstash.logback.composite.loggingevent.LoggingEventCompositeJsonFormatter; import net.logstash.logback.composite.loggingevent.LoggingEventJsonProviders; + import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.joran.spi.DefaultClass; diff --git a/src/main/java/net/logstash/logback/encoder/LogstashAccessEncoder.java b/src/main/java/net/logstash/logback/encoder/LogstashAccessEncoder.java index 167669c5..94691c89 100644 --- a/src/main/java/net/logstash/logback/encoder/LogstashAccessEncoder.java +++ b/src/main/java/net/logstash/logback/encoder/LogstashAccessEncoder.java @@ -21,6 +21,7 @@ import net.logstash.logback.composite.accessevent.HeaderFilter; import net.logstash.logback.composite.accessevent.IncludeExcludeHeaderFilter; import net.logstash.logback.fieldnames.LogstashAccessFieldNames; + import ch.qos.logback.access.spi.IAccessEvent; import ch.qos.logback.core.joran.spi.DefaultClass; diff --git a/src/main/java/net/logstash/logback/encoder/LogstashEncoder.java b/src/main/java/net/logstash/logback/encoder/LogstashEncoder.java index 80a2760b..3b204d5b 100644 --- a/src/main/java/net/logstash/logback/encoder/LogstashEncoder.java +++ b/src/main/java/net/logstash/logback/encoder/LogstashEncoder.java @@ -16,13 +16,12 @@ package net.logstash.logback.encoder; import java.util.List; -import java.util.Map; import net.logstash.logback.LogstashFormatter; import net.logstash.logback.composite.CompositeJsonFormatter; import net.logstash.logback.composite.JsonProvider; import net.logstash.logback.fieldnames.LogstashFieldNames; -import net.logstash.logback.marker.Markers; + import ch.qos.logback.classic.pattern.ThrowableHandlingConverter; import ch.qos.logback.classic.spi.ILoggingEvent; diff --git a/src/main/java/net/logstash/logback/encoder/StreamingEncoder.java b/src/main/java/net/logstash/logback/encoder/StreamingEncoder.java index c483d893..f3dae53e 100644 --- a/src/main/java/net/logstash/logback/encoder/StreamingEncoder.java +++ b/src/main/java/net/logstash/logback/encoder/StreamingEncoder.java @@ -18,6 +18,8 @@ import java.io.IOException; import java.io.OutputStream; +import ch.qos.logback.core.encoder.Encoder; + /** * Interface implemented by {@link Encoder} that supports writing directly into a {@link OutputStream} * instead of returning a byte array. diff --git a/src/main/java/net/logstash/logback/layout/AccessEventCompositeJsonLayout.java b/src/main/java/net/logstash/logback/layout/AccessEventCompositeJsonLayout.java index 8b54a212..5fd76e7d 100644 --- a/src/main/java/net/logstash/logback/layout/AccessEventCompositeJsonLayout.java +++ b/src/main/java/net/logstash/logback/layout/AccessEventCompositeJsonLayout.java @@ -17,8 +17,9 @@ import net.logstash.logback.composite.CompositeJsonFormatter; import net.logstash.logback.composite.JsonProviders; -import net.logstash.logback.composite.accessevent.AccessEventJsonProviders; import net.logstash.logback.composite.accessevent.AccessEventCompositeJsonFormatter; +import net.logstash.logback.composite.accessevent.AccessEventJsonProviders; + import ch.qos.logback.access.spi.IAccessEvent; import ch.qos.logback.core.joran.spi.DefaultClass; diff --git a/src/main/java/net/logstash/logback/layout/LoggingEventCompositeJsonLayout.java b/src/main/java/net/logstash/logback/layout/LoggingEventCompositeJsonLayout.java index 76b52ab8..df1dd93b 100644 --- a/src/main/java/net/logstash/logback/layout/LoggingEventCompositeJsonLayout.java +++ b/src/main/java/net/logstash/logback/layout/LoggingEventCompositeJsonLayout.java @@ -19,6 +19,7 @@ import net.logstash.logback.composite.JsonProviders; import net.logstash.logback.composite.loggingevent.LoggingEventCompositeJsonFormatter; import net.logstash.logback.composite.loggingevent.LoggingEventJsonProviders; + import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.joran.spi.DefaultClass; diff --git a/src/main/java/net/logstash/logback/layout/LogstashAccessLayout.java b/src/main/java/net/logstash/logback/layout/LogstashAccessLayout.java index 3abcdc12..b7b8cf32 100644 --- a/src/main/java/net/logstash/logback/layout/LogstashAccessLayout.java +++ b/src/main/java/net/logstash/logback/layout/LogstashAccessLayout.java @@ -21,6 +21,7 @@ import net.logstash.logback.composite.accessevent.HeaderFilter; import net.logstash.logback.composite.accessevent.IncludeExcludeHeaderFilter; import net.logstash.logback.fieldnames.LogstashAccessFieldNames; + import ch.qos.logback.access.spi.IAccessEvent; import ch.qos.logback.core.joran.spi.DefaultClass; diff --git a/src/main/java/net/logstash/logback/layout/LogstashLayout.java b/src/main/java/net/logstash/logback/layout/LogstashLayout.java index abf41d03..876c89f7 100644 --- a/src/main/java/net/logstash/logback/layout/LogstashLayout.java +++ b/src/main/java/net/logstash/logback/layout/LogstashLayout.java @@ -21,6 +21,7 @@ import net.logstash.logback.composite.CompositeJsonFormatter; import net.logstash.logback.composite.JsonProvider; import net.logstash.logback.fieldnames.LogstashFieldNames; + import ch.qos.logback.classic.pattern.ThrowableHandlingConverter; import ch.qos.logback.classic.spi.ILoggingEvent; diff --git a/src/main/java/net/logstash/logback/marker/DeferredLogstashMarker.java b/src/main/java/net/logstash/logback/marker/DeferredLogstashMarker.java index a75b7eb0..2187342d 100644 --- a/src/main/java/net/logstash/logback/marker/DeferredLogstashMarker.java +++ b/src/main/java/net/logstash/logback/marker/DeferredLogstashMarker.java @@ -18,14 +18,13 @@ import java.io.IOException; import java.util.Iterator; import java.util.Objects; -import java.util.Optional; import java.util.function.Supplier; -import ch.qos.logback.classic.AsyncAppender; import net.logstash.logback.appender.AsyncDisruptorAppender; -import org.slf4j.Marker; +import ch.qos.logback.classic.AsyncAppender; import com.fasterxml.jackson.core.JsonGenerator; +import org.slf4j.Marker; /** * A {@link LogstashMarker} that defers the creation of another {@link LogstashMarker} until diff --git a/src/main/java/net/logstash/logback/marker/EmptyLogstashMarker.java b/src/main/java/net/logstash/logback/marker/EmptyLogstashMarker.java index d73baad9..fadc24a5 100644 --- a/src/main/java/net/logstash/logback/marker/EmptyLogstashMarker.java +++ b/src/main/java/net/logstash/logback/marker/EmptyLogstashMarker.java @@ -18,9 +18,9 @@ import java.io.IOException; import net.logstash.logback.argument.StructuredArgument; -import org.slf4j.Marker; import com.fasterxml.jackson.core.JsonGenerator; +import org.slf4j.Marker; /** * An empty marker that does nothing itself, but can be used as a base marker when you want to conditionally chain other markers with {@link #and(Marker)}. diff --git a/src/main/java/net/logstash/logback/marker/LogstashBasicMarker.java b/src/main/java/net/logstash/logback/marker/LogstashBasicMarker.java index 664664a3..5575c089 100755 --- a/src/main/java/net/logstash/logback/marker/LogstashBasicMarker.java +++ b/src/main/java/net/logstash/logback/marker/LogstashBasicMarker.java @@ -15,13 +15,13 @@ */ package net.logstash.logback.marker; -import org.slf4j.Marker; - import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.Vector; +import org.slf4j.Marker; + /* Copy of {@link org.slf4j.helpers.BasicMarker} from slf4j-api v1.7.12, with minor changes: * 1. make the constructor public so that it can be extended in other packages * 2. add getReferences() method diff --git a/src/main/java/net/logstash/logback/marker/LogstashMarker.java b/src/main/java/net/logstash/logback/marker/LogstashMarker.java index f6986ea5..69e14da5 100755 --- a/src/main/java/net/logstash/logback/marker/LogstashMarker.java +++ b/src/main/java/net/logstash/logback/marker/LogstashMarker.java @@ -18,9 +18,8 @@ import java.io.IOException; import java.util.Objects; -import org.slf4j.Marker; - import com.fasterxml.jackson.core.JsonGenerator; +import org.slf4j.Marker; /** * A {@link Marker} that is known and understood by the logstash logback encoder. diff --git a/src/main/java/net/logstash/logback/marker/MapEntriesAppendingMarker.java b/src/main/java/net/logstash/logback/marker/MapEntriesAppendingMarker.java index 6c2111d2..402aa7b5 100755 --- a/src/main/java/net/logstash/logback/marker/MapEntriesAppendingMarker.java +++ b/src/main/java/net/logstash/logback/marker/MapEntriesAppendingMarker.java @@ -23,10 +23,9 @@ import net.logstash.logback.composite.loggingevent.ArgumentsJsonProvider; import net.logstash.logback.composite.loggingevent.LogstashMarkersJsonProvider; -import org.slf4j.Marker; - import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.ObjectMapper; +import org.slf4j.Marker; /** * A {@link Marker} OR {@link StructuredArgument} that appends entries diff --git a/src/main/java/net/logstash/logback/marker/ObjectAppendingMarker.java b/src/main/java/net/logstash/logback/marker/ObjectAppendingMarker.java index 4d2095da..e6bae32b 100755 --- a/src/main/java/net/logstash/logback/marker/ObjectAppendingMarker.java +++ b/src/main/java/net/logstash/logback/marker/ObjectAppendingMarker.java @@ -23,10 +23,9 @@ import net.logstash.logback.composite.loggingevent.ArgumentsJsonProvider; import net.logstash.logback.composite.loggingevent.LogstashMarkersJsonProvider; -import org.slf4j.Marker; - import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.ObjectMapper; +import org.slf4j.Marker; /** * A {@link Marker} OR {@link StructuredArgument} that diff --git a/src/main/java/net/logstash/logback/marker/ObjectFieldsAppendingMarker.java b/src/main/java/net/logstash/logback/marker/ObjectFieldsAppendingMarker.java index 2e343f09..e97d89c2 100755 --- a/src/main/java/net/logstash/logback/marker/ObjectFieldsAppendingMarker.java +++ b/src/main/java/net/logstash/logback/marker/ObjectFieldsAppendingMarker.java @@ -24,8 +24,6 @@ import net.logstash.logback.composite.loggingevent.ArgumentsJsonProvider; import net.logstash.logback.composite.loggingevent.LogstashMarkersJsonProvider; -import org.slf4j.Marker; - import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.JsonSerializer; @@ -35,6 +33,7 @@ import com.fasterxml.jackson.databind.ser.DefaultSerializerProvider; import com.fasterxml.jackson.databind.ser.ResolvableSerializer; import com.fasterxml.jackson.databind.util.NameTransformer; +import org.slf4j.Marker; /** * A {@link Marker} OR {@link StructuredArgument} that diff --git a/src/main/java/net/logstash/logback/marker/RawJsonAppendingMarker.java b/src/main/java/net/logstash/logback/marker/RawJsonAppendingMarker.java index 2fd58d61..298c4371 100755 --- a/src/main/java/net/logstash/logback/marker/RawJsonAppendingMarker.java +++ b/src/main/java/net/logstash/logback/marker/RawJsonAppendingMarker.java @@ -22,9 +22,8 @@ import net.logstash.logback.composite.loggingevent.ArgumentsJsonProvider; import net.logstash.logback.composite.loggingevent.LogstashMarkersJsonProvider; -import org.slf4j.Marker; - import com.fasterxml.jackson.core.JsonGenerator; +import org.slf4j.Marker; /** * A {@link Marker} OR {@link StructuredArgument} that diff --git a/src/main/java/net/logstash/logback/marker/SingleFieldAppendingMarker.java b/src/main/java/net/logstash/logback/marker/SingleFieldAppendingMarker.java index d21cdd8b..2c1c2b52 100755 --- a/src/main/java/net/logstash/logback/marker/SingleFieldAppendingMarker.java +++ b/src/main/java/net/logstash/logback/marker/SingleFieldAppendingMarker.java @@ -23,9 +23,8 @@ import net.logstash.logback.composite.loggingevent.ArgumentsJsonProvider; import net.logstash.logback.composite.loggingevent.LogstashMarkersJsonProvider; -import org.slf4j.Marker; - import com.fasterxml.jackson.core.JsonGenerator; +import org.slf4j.Marker; /** * A {@link Marker} OR {@link StructuredArgument} that appends diff --git a/src/main/java/net/logstash/logback/mask/MaskingJsonGeneratorDecorator.java b/src/main/java/net/logstash/logback/mask/MaskingJsonGeneratorDecorator.java index ed194640..eef81329 100644 --- a/src/main/java/net/logstash/logback/mask/MaskingJsonGeneratorDecorator.java +++ b/src/main/java/net/logstash/logback/mask/MaskingJsonGeneratorDecorator.java @@ -28,11 +28,9 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import ch.qos.logback.core.spi.ContextAware; -import ch.qos.logback.core.spi.ContextAwareBase; -import ch.qos.logback.core.spi.LifeCycle; import net.logstash.logback.decorate.JsonGeneratorDecorator; +import ch.qos.logback.core.spi.LifeCycle; import com.fasterxml.jackson.core.JsonGenerator; /** diff --git a/src/main/java/net/logstash/logback/pattern/AbstractJsonPatternParser.java b/src/main/java/net/logstash/logback/pattern/AbstractJsonPatternParser.java index 4c47fddf..e5491cb5 100644 --- a/src/main/java/net/logstash/logback/pattern/AbstractJsonPatternParser.java +++ b/src/main/java/net/logstash/logback/pattern/AbstractJsonPatternParser.java @@ -27,7 +27,6 @@ import ch.qos.logback.core.pattern.PatternLayoutBase; import ch.qos.logback.core.spi.ContextAware; - import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParseException; diff --git a/src/main/java/net/logstash/logback/pattern/AccessEventJsonPatternParser.java b/src/main/java/net/logstash/logback/pattern/AccessEventJsonPatternParser.java index 53000fc8..8a74beae 100644 --- a/src/main/java/net/logstash/logback/pattern/AccessEventJsonPatternParser.java +++ b/src/main/java/net/logstash/logback/pattern/AccessEventJsonPatternParser.java @@ -19,7 +19,6 @@ import ch.qos.logback.access.spi.IAccessEvent; import ch.qos.logback.core.pattern.PatternLayoutBase; import ch.qos.logback.core.spi.ContextAware; - import com.fasterxml.jackson.core.JsonFactory; /** diff --git a/src/main/java/net/logstash/logback/pattern/LoggingEventJsonPatternParser.java b/src/main/java/net/logstash/logback/pattern/LoggingEventJsonPatternParser.java index 81ad0878..a8d8e437 100644 --- a/src/main/java/net/logstash/logback/pattern/LoggingEventJsonPatternParser.java +++ b/src/main/java/net/logstash/logback/pattern/LoggingEventJsonPatternParser.java @@ -15,12 +15,11 @@ */ package net.logstash.logback.pattern; -import com.fasterxml.jackson.core.JsonFactory; - import ch.qos.logback.classic.PatternLayout; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.pattern.PatternLayoutBase; import ch.qos.logback.core.spi.ContextAware; +import com.fasterxml.jackson.core.JsonFactory; /** * @author Dmitry Andrianov diff --git a/src/main/java/net/logstash/logback/pattern/NodeWriter.java b/src/main/java/net/logstash/logback/pattern/NodeWriter.java index ebe410d9..8145b16a 100644 --- a/src/main/java/net/logstash/logback/pattern/NodeWriter.java +++ b/src/main/java/net/logstash/logback/pattern/NodeWriter.java @@ -15,10 +15,10 @@ */ package net.logstash.logback.pattern; -import com.fasterxml.jackson.core.JsonGenerator; - import java.io.IOException; +import com.fasterxml.jackson.core.JsonGenerator; + /** * Writes a JSON pattern node into JSON generator supplied. * diff --git a/src/main/java/net/logstash/logback/stacktrace/ShortenedThrowableConverter.java b/src/main/java/net/logstash/logback/stacktrace/ShortenedThrowableConverter.java index 0bbbe5e7..c2a4b119 100644 --- a/src/main/java/net/logstash/logback/stacktrace/ShortenedThrowableConverter.java +++ b/src/main/java/net/logstash/logback/stacktrace/ShortenedThrowableConverter.java @@ -23,6 +23,9 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.regex.Pattern; +import net.logstash.logback.CachingAbbreviator; +import net.logstash.logback.NullAbbreviator; + import ch.qos.logback.access.PatternLayout; import ch.qos.logback.classic.pattern.Abbreviator; import ch.qos.logback.classic.pattern.TargetLengthBasedClassNameAbbreviator; @@ -37,8 +40,6 @@ import ch.qos.logback.core.boolex.EvaluationException; import ch.qos.logback.core.boolex.EventEvaluator; import ch.qos.logback.core.status.ErrorStatus; -import net.logstash.logback.CachingAbbreviator; -import net.logstash.logback.NullAbbreviator; /** * A {@link ThrowableHandlingConverter} (similar to logback's {@link ThrowableProxyConverter}) diff --git a/src/test/java/net/logstash/logback/ConfigurationTest.java b/src/test/java/net/logstash/logback/ConfigurationTest.java index e6b297e6..61b20213 100644 --- a/src/test/java/net/logstash/logback/ConfigurationTest.java +++ b/src/test/java/net/logstash/logback/ConfigurationTest.java @@ -21,12 +21,6 @@ import java.util.List; import java.util.Map; -import ch.qos.logback.classic.Logger; -import ch.qos.logback.classic.spi.ILoggingEvent; -import ch.qos.logback.core.Appender; -import ch.qos.logback.core.OutputStreamAppender; -import ch.qos.logback.core.encoder.Encoder; -import ch.qos.logback.core.read.ListAppender; import net.logstash.logback.appender.AsyncDisruptorAppender; import net.logstash.logback.appender.LoggingEventAsyncDisruptorAppender; import net.logstash.logback.appender.listener.AppenderListener; @@ -56,14 +50,20 @@ import net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder; import net.logstash.logback.marker.Markers; import net.logstash.logback.stacktrace.ShortenedThrowableConverter; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.slf4j.LoggerFactory; +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.core.Appender; +import ch.qos.logback.core.OutputStreamAppender; +import ch.qos.logback.core.encoder.Encoder; +import ch.qos.logback.core.read.ListAppender; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.MappingJsonFactory; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.slf4j.LoggerFactory; public class ConfigurationTest { diff --git a/src/test/java/net/logstash/logback/TestJsonProvider.java b/src/test/java/net/logstash/logback/TestJsonProvider.java index a3d34c4e..32e3279b 100644 --- a/src/test/java/net/logstash/logback/TestJsonProvider.java +++ b/src/test/java/net/logstash/logback/TestJsonProvider.java @@ -17,10 +17,10 @@ import java.io.IOException; -import com.fasterxml.jackson.core.JsonGenerator; - import net.logstash.logback.composite.AbstractJsonProvider; + import ch.qos.logback.classic.spi.ILoggingEvent; +import com.fasterxml.jackson.core.JsonGenerator; public class TestJsonProvider extends AbstractJsonProvider { diff --git a/src/test/java/net/logstash/logback/appender/AsyncDisruptorAppenderTest.java b/src/test/java/net/logstash/logback/appender/AsyncDisruptorAppenderTest.java index af92ceb4..a060caf9 100644 --- a/src/test/java/net/logstash/logback/appender/AsyncDisruptorAppenderTest.java +++ b/src/test/java/net/logstash/logback/appender/AsyncDisruptorAppenderTest.java @@ -33,6 +33,11 @@ import net.logstash.logback.appender.AsyncDisruptorAppender.LogEvent; import net.logstash.logback.appender.listener.AppenderListener; +import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.core.Context; +import ch.qos.logback.core.status.Status; +import ch.qos.logback.core.status.StatusManager; +import com.lmax.disruptor.EventHandler; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; @@ -45,20 +50,13 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.mockito.stubbing.Answer; -import ch.qos.logback.classic.spi.ILoggingEvent; -import ch.qos.logback.core.Context; -import ch.qos.logback.core.status.Status; -import ch.qos.logback.core.status.StatusManager; - -import com.lmax.disruptor.EventHandler; - @ExtendWith(MockitoExtension.class) public class AsyncDisruptorAppenderTest { private static final int VERIFICATION_TIMEOUT = 1000 * 30; @InjectMocks - private AsyncDisruptorAppender> appender = new AsyncDisruptorAppender>() {}; + private AsyncDisruptorAppender> appender = new AsyncDisruptorAppender>() { }; @Mock private EventHandler> eventHandler; diff --git a/src/test/java/net/logstash/logback/appender/CachingAbbreviatorTest.java b/src/test/java/net/logstash/logback/appender/CachingAbbreviatorTest.java index 0068a143..2885bdf2 100644 --- a/src/test/java/net/logstash/logback/appender/CachingAbbreviatorTest.java +++ b/src/test/java/net/logstash/logback/appender/CachingAbbreviatorTest.java @@ -19,8 +19,9 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import ch.qos.logback.classic.pattern.Abbreviator; import net.logstash.logback.CachingAbbreviator; + +import ch.qos.logback.classic.pattern.Abbreviator; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/net/logstash/logback/appender/DelegatingAsyncDisruptorAppenderTest.java b/src/test/java/net/logstash/logback/appender/DelegatingAsyncDisruptorAppenderTest.java index 67375b8a..ab9d554b 100644 --- a/src/test/java/net/logstash/logback/appender/DelegatingAsyncDisruptorAppenderTest.java +++ b/src/test/java/net/logstash/logback/appender/DelegatingAsyncDisruptorAppenderTest.java @@ -30,14 +30,7 @@ import java.io.IOException; import java.io.OutputStream; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.InOrder; -import org.mockito.Mock; -import org.mockito.Spy; -import org.mockito.junit.jupiter.MockitoExtension; +import net.logstash.logback.appender.listener.AppenderListener; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.spi.ILoggingEvent; @@ -46,7 +39,14 @@ import ch.qos.logback.core.LogbackException; import ch.qos.logback.core.OutputStreamAppender; import ch.qos.logback.core.encoder.EchoEncoder; -import net.logstash.logback.appender.listener.AppenderListener; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InOrder; +import org.mockito.Mock; +import org.mockito.Spy; +import org.mockito.junit.jupiter.MockitoExtension; @ExtendWith(MockitoExtension.class) public class DelegatingAsyncDisruptorAppenderTest { diff --git a/src/test/java/net/logstash/logback/appender/LogstashTcpSocketAppenderTest.java b/src/test/java/net/logstash/logback/appender/LogstashTcpSocketAppenderTest.java index ec4ddf12..bc03d5a3 100644 --- a/src/test/java/net/logstash/logback/appender/LogstashTcpSocketAppenderTest.java +++ b/src/test/java/net/logstash/logback/appender/LogstashTcpSocketAppenderTest.java @@ -46,17 +46,19 @@ import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Future; + import javax.net.SocketFactory; +import net.logstash.logback.appender.destination.RandomDestinationConnectionStrategy; +import net.logstash.logback.appender.destination.RoundRobinDestinationConnectionStrategy; +import net.logstash.logback.appender.listener.TcpAppenderListener; +import net.logstash.logback.encoder.SeparatorParser; + import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.Context; import ch.qos.logback.core.encoder.Encoder; import ch.qos.logback.core.status.StatusManager; import ch.qos.logback.core.util.Duration; -import net.logstash.logback.appender.destination.RandomDestinationConnectionStrategy; -import net.logstash.logback.appender.destination.RoundRobinDestinationConnectionStrategy; -import net.logstash.logback.appender.listener.TcpAppenderListener; -import net.logstash.logback.encoder.SeparatorParser; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/net/logstash/logback/appender/WaitStrategyFactoryTest.java b/src/test/java/net/logstash/logback/appender/WaitStrategyFactoryTest.java index 2881d93e..2ed8182b 100644 --- a/src/test/java/net/logstash/logback/appender/WaitStrategyFactoryTest.java +++ b/src/test/java/net/logstash/logback/appender/WaitStrategyFactoryTest.java @@ -21,8 +21,6 @@ import java.lang.reflect.Field; import java.util.concurrent.TimeUnit; -import org.junit.jupiter.api.Test; - import com.lmax.disruptor.BlockingWaitStrategy; import com.lmax.disruptor.BusySpinWaitStrategy; import com.lmax.disruptor.LiteBlockingWaitStrategy; @@ -32,6 +30,7 @@ import com.lmax.disruptor.TimeoutBlockingWaitStrategy; import com.lmax.disruptor.WaitStrategy; import com.lmax.disruptor.YieldingWaitStrategy; +import org.junit.jupiter.api.Test; public class WaitStrategyFactoryTest { diff --git a/src/test/java/net/logstash/logback/appender/destination/DestinationParserTest.java b/src/test/java/net/logstash/logback/appender/destination/DestinationParserTest.java index c9db8caf..9bd42637 100644 --- a/src/test/java/net/logstash/logback/appender/destination/DestinationParserTest.java +++ b/src/test/java/net/logstash/logback/appender/destination/DestinationParserTest.java @@ -21,11 +21,8 @@ import java.net.InetSocketAddress; import java.util.List; -import net.logstash.logback.appender.destination.DestinationParser; - -import org.junit.jupiter.api.Test; - import ch.qos.logback.core.CoreConstants; +import org.junit.jupiter.api.Test; public class DestinationParserTest { diff --git a/src/test/java/net/logstash/logback/appender/destination/PreferPrimaryDestinationConnectionStrategyTest.java b/src/test/java/net/logstash/logback/appender/destination/PreferPrimaryDestinationConnectionStrategyTest.java index c9c6bc45..fe3022b5 100644 --- a/src/test/java/net/logstash/logback/appender/destination/PreferPrimaryDestinationConnectionStrategyTest.java +++ b/src/test/java/net/logstash/logback/appender/destination/PreferPrimaryDestinationConnectionStrategyTest.java @@ -17,9 +17,8 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.jupiter.api.Test; - import ch.qos.logback.core.util.Duration; +import org.junit.jupiter.api.Test; public class PreferPrimaryDestinationConnectionStrategyTest { diff --git a/src/test/java/net/logstash/logback/appender/destination/RandomDestinationConnectionStrategyTest.java b/src/test/java/net/logstash/logback/appender/destination/RandomDestinationConnectionStrategyTest.java index 16a8a2c2..52726745 100644 --- a/src/test/java/net/logstash/logback/appender/destination/RandomDestinationConnectionStrategyTest.java +++ b/src/test/java/net/logstash/logback/appender/destination/RandomDestinationConnectionStrategyTest.java @@ -22,14 +22,13 @@ import java.util.Random; +import ch.qos.logback.core.util.Duration; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import ch.qos.logback.core.util.Duration; - @ExtendWith(MockitoExtension.class) public class RandomDestinationConnectionStrategyTest { diff --git a/src/test/java/net/logstash/logback/appender/destination/RoundRobinDestinationConnectionStrategyTest.java b/src/test/java/net/logstash/logback/appender/destination/RoundRobinDestinationConnectionStrategyTest.java index 610f9f00..3324783a 100644 --- a/src/test/java/net/logstash/logback/appender/destination/RoundRobinDestinationConnectionStrategyTest.java +++ b/src/test/java/net/logstash/logback/appender/destination/RoundRobinDestinationConnectionStrategyTest.java @@ -17,9 +17,8 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.jupiter.api.Test; - import ch.qos.logback.core.util.Duration; +import org.junit.jupiter.api.Test; public class RoundRobinDestinationConnectionStrategyTest { diff --git a/src/test/java/net/logstash/logback/argument/DeferredStructuredArgumentTest.java b/src/test/java/net/logstash/logback/argument/DeferredStructuredArgumentTest.java index 2049f1c7..0664759d 100644 --- a/src/test/java/net/logstash/logback/argument/DeferredStructuredArgumentTest.java +++ b/src/test/java/net/logstash/logback/argument/DeferredStructuredArgumentTest.java @@ -25,11 +25,10 @@ import java.io.StringWriter; import java.util.function.Supplier; -import org.junit.jupiter.api.Test; - import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.MappingJsonFactory; +import org.junit.jupiter.api.Test; public class DeferredStructuredArgumentTest { diff --git a/src/test/java/net/logstash/logback/composite/AbstractPatternJsonProviderTest.java b/src/test/java/net/logstash/logback/composite/AbstractPatternJsonProviderTest.java index ba7a61f5..8dcb2b48 100644 --- a/src/test/java/net/logstash/logback/composite/AbstractPatternJsonProviderTest.java +++ b/src/test/java/net/logstash/logback/composite/AbstractPatternJsonProviderTest.java @@ -26,17 +26,15 @@ import net.logstash.logback.pattern.AbstractJsonPatternParser; import net.logstash.logback.pattern.NodeWriter; +import ch.qos.logback.core.spi.DeferredProcessingAware; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonGenerator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import ch.qos.logback.core.spi.DeferredProcessingAware; - -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.core.JsonGenerator; - /** * This test just verifies that AbstractPatternJsonProvider delegates all the work to Parser. * diff --git a/src/test/java/net/logstash/logback/composite/GlobalCustomFieldsJsonProviderTest.java b/src/test/java/net/logstash/logback/composite/GlobalCustomFieldsJsonProviderTest.java index b417b61a..636ae24b 100644 --- a/src/test/java/net/logstash/logback/composite/GlobalCustomFieldsJsonProviderTest.java +++ b/src/test/java/net/logstash/logback/composite/GlobalCustomFieldsJsonProviderTest.java @@ -21,16 +21,15 @@ import java.io.StringWriter; import ch.qos.logback.classic.spi.ILoggingEvent; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.MappingJsonFactory; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.MappingJsonFactory; - @ExtendWith(MockitoExtension.class) public class GlobalCustomFieldsJsonProviderTest { diff --git a/src/test/java/net/logstash/logback/composite/LogstashVersionJsonProviderTest.java b/src/test/java/net/logstash/logback/composite/LogstashVersionJsonProviderTest.java index 430f3d99..a65f045d 100644 --- a/src/test/java/net/logstash/logback/composite/LogstashVersionJsonProviderTest.java +++ b/src/test/java/net/logstash/logback/composite/LogstashVersionJsonProviderTest.java @@ -19,15 +19,15 @@ import java.io.IOException; -import ch.qos.logback.classic.spi.ILoggingEvent; import net.logstash.logback.fieldnames.LogstashFieldNames; + +import ch.qos.logback.classic.spi.ILoggingEvent; +import com.fasterxml.jackson.core.JsonGenerator; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.fasterxml.jackson.core.JsonGenerator; - @ExtendWith(MockitoExtension.class) public class LogstashVersionJsonProviderTest { diff --git a/src/test/java/net/logstash/logback/composite/accessevent/AccessEventNestedJsonProviderTest.java b/src/test/java/net/logstash/logback/composite/accessevent/AccessEventNestedJsonProviderTest.java index b755ae67..42171e17 100644 --- a/src/test/java/net/logstash/logback/composite/accessevent/AccessEventNestedJsonProviderTest.java +++ b/src/test/java/net/logstash/logback/composite/accessevent/AccessEventNestedJsonProviderTest.java @@ -20,6 +20,7 @@ import java.io.IOException; import ch.qos.logback.access.spi.IAccessEvent; +import com.fasterxml.jackson.core.JsonGenerator; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InOrder; @@ -27,8 +28,6 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.fasterxml.jackson.core.JsonGenerator; - @ExtendWith(MockitoExtension.class) public class AccessEventNestedJsonProviderTest { diff --git a/src/test/java/net/logstash/logback/composite/accessevent/AccessEventPatternJsonProviderTest.java b/src/test/java/net/logstash/logback/composite/accessevent/AccessEventPatternJsonProviderTest.java index 547fe8a7..3f210cff 100644 --- a/src/test/java/net/logstash/logback/composite/accessevent/AccessEventPatternJsonProviderTest.java +++ b/src/test/java/net/logstash/logback/composite/accessevent/AccessEventPatternJsonProviderTest.java @@ -18,6 +18,7 @@ import net.logstash.logback.composite.AbstractPatternJsonProvider; import net.logstash.logback.composite.AbstractPatternJsonProviderTest; import net.logstash.logback.pattern.AbstractJsonPatternParser; + import ch.qos.logback.access.spi.IAccessEvent; /** diff --git a/src/test/java/net/logstash/logback/composite/accessevent/RequestHeadersJsonProviderTest.java b/src/test/java/net/logstash/logback/composite/accessevent/RequestHeadersJsonProviderTest.java index 39a31964..ca9dac59 100644 --- a/src/test/java/net/logstash/logback/composite/accessevent/RequestHeadersJsonProviderTest.java +++ b/src/test/java/net/logstash/logback/composite/accessevent/RequestHeadersJsonProviderTest.java @@ -23,6 +23,8 @@ import java.util.LinkedHashMap; import java.util.Map; +import ch.qos.logback.access.spi.IAccessEvent; +import com.fasterxml.jackson.core.JsonGenerator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -30,10 +32,6 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import ch.qos.logback.access.spi.IAccessEvent; - -import com.fasterxml.jackson.core.JsonGenerator; - @ExtendWith(MockitoExtension.class) public class RequestHeadersJsonProviderTest { diff --git a/src/test/java/net/logstash/logback/composite/accessevent/ResponseHeadersJsonProviderTest.java b/src/test/java/net/logstash/logback/composite/accessevent/ResponseHeadersJsonProviderTest.java index a942f647..80536408 100644 --- a/src/test/java/net/logstash/logback/composite/accessevent/ResponseHeadersJsonProviderTest.java +++ b/src/test/java/net/logstash/logback/composite/accessevent/ResponseHeadersJsonProviderTest.java @@ -23,6 +23,8 @@ import java.util.LinkedHashMap; import java.util.Map; +import ch.qos.logback.access.spi.IAccessEvent; +import com.fasterxml.jackson.core.JsonGenerator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -30,10 +32,6 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import ch.qos.logback.access.spi.IAccessEvent; - -import com.fasterxml.jackson.core.JsonGenerator; - @ExtendWith(MockitoExtension.class) public class ResponseHeadersJsonProviderTest { diff --git a/src/test/java/net/logstash/logback/composite/loggingevent/ArgumentsJsonProviderTest.java b/src/test/java/net/logstash/logback/composite/loggingevent/ArgumentsJsonProviderTest.java index fe521b74..9df6bcb1 100644 --- a/src/test/java/net/logstash/logback/composite/loggingevent/ArgumentsJsonProviderTest.java +++ b/src/test/java/net/logstash/logback/composite/loggingevent/ArgumentsJsonProviderTest.java @@ -23,18 +23,18 @@ import java.util.LinkedHashMap; import java.util.Map; -import ch.qos.logback.classic.spi.ILoggingEvent; import net.logstash.logback.argument.StructuredArguments; + +import ch.qos.logback.classic.spi.ILoggingEvent; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.MappingJsonFactory; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.MappingJsonFactory; - @ExtendWith(MockitoExtension.class) public class ArgumentsJsonProviderTest { diff --git a/src/test/java/net/logstash/logback/composite/loggingevent/CallerDataJsonProviderTest.java b/src/test/java/net/logstash/logback/composite/loggingevent/CallerDataJsonProviderTest.java index 5bfef817..a1ec3ba6 100644 --- a/src/test/java/net/logstash/logback/composite/loggingevent/CallerDataJsonProviderTest.java +++ b/src/test/java/net/logstash/logback/composite/loggingevent/CallerDataJsonProviderTest.java @@ -23,16 +23,16 @@ import java.io.IOException; -import ch.qos.logback.classic.spi.ILoggingEvent; import net.logstash.logback.fieldnames.LogstashFieldNames; + +import ch.qos.logback.classic.spi.ILoggingEvent; +import com.fasterxml.jackson.core.JsonGenerator; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InOrder; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.fasterxml.jackson.core.JsonGenerator; - @ExtendWith(MockitoExtension.class) public class CallerDataJsonProviderTest { diff --git a/src/test/java/net/logstash/logback/composite/loggingevent/ContextNameJsonProviderTest.java b/src/test/java/net/logstash/logback/composite/loggingevent/ContextNameJsonProviderTest.java index 30b1c77f..a3d8e675 100644 --- a/src/test/java/net/logstash/logback/composite/loggingevent/ContextNameJsonProviderTest.java +++ b/src/test/java/net/logstash/logback/composite/loggingevent/ContextNameJsonProviderTest.java @@ -22,13 +22,12 @@ import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.classic.spi.LoggerContextVO; +import com.fasterxml.jackson.core.JsonGenerator; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.fasterxml.jackson.core.JsonGenerator; - @ExtendWith(MockitoExtension.class) public class ContextNameJsonProviderTest { diff --git a/src/test/java/net/logstash/logback/composite/loggingevent/LogLevelJsonProviderTest.java b/src/test/java/net/logstash/logback/composite/loggingevent/LogLevelJsonProviderTest.java index 6b703ec8..dc485bea 100644 --- a/src/test/java/net/logstash/logback/composite/loggingevent/LogLevelJsonProviderTest.java +++ b/src/test/java/net/logstash/logback/composite/loggingevent/LogLevelJsonProviderTest.java @@ -20,16 +20,16 @@ import java.io.IOException; +import net.logstash.logback.fieldnames.LogstashFieldNames; + import ch.qos.logback.classic.Level; import ch.qos.logback.classic.spi.ILoggingEvent; -import net.logstash.logback.fieldnames.LogstashFieldNames; +import com.fasterxml.jackson.core.JsonGenerator; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.fasterxml.jackson.core.JsonGenerator; - @ExtendWith(MockitoExtension.class) public class LogLevelJsonProviderTest { diff --git a/src/test/java/net/logstash/logback/composite/loggingevent/LogLevelValueJsonProviderTest.java b/src/test/java/net/logstash/logback/composite/loggingevent/LogLevelValueJsonProviderTest.java index 32611118..4de56b5b 100644 --- a/src/test/java/net/logstash/logback/composite/loggingevent/LogLevelValueJsonProviderTest.java +++ b/src/test/java/net/logstash/logback/composite/loggingevent/LogLevelValueJsonProviderTest.java @@ -20,16 +20,16 @@ import java.io.IOException; +import net.logstash.logback.fieldnames.LogstashFieldNames; + import ch.qos.logback.classic.Level; import ch.qos.logback.classic.spi.ILoggingEvent; -import net.logstash.logback.fieldnames.LogstashFieldNames; +import com.fasterxml.jackson.core.JsonGenerator; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.fasterxml.jackson.core.JsonGenerator; - @ExtendWith(MockitoExtension.class) public class LogLevelValueJsonProviderTest { diff --git a/src/test/java/net/logstash/logback/composite/loggingevent/LoggerNameJsonProviderTest.java b/src/test/java/net/logstash/logback/composite/loggingevent/LoggerNameJsonProviderTest.java index 060aa5f2..441d7d76 100644 --- a/src/test/java/net/logstash/logback/composite/loggingevent/LoggerNameJsonProviderTest.java +++ b/src/test/java/net/logstash/logback/composite/loggingevent/LoggerNameJsonProviderTest.java @@ -20,15 +20,15 @@ import java.io.IOException; -import ch.qos.logback.classic.spi.ILoggingEvent; import net.logstash.logback.fieldnames.LogstashFieldNames; + +import ch.qos.logback.classic.spi.ILoggingEvent; +import com.fasterxml.jackson.core.JsonGenerator; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.fasterxml.jackson.core.JsonGenerator; - @ExtendWith(MockitoExtension.class) public class LoggerNameJsonProviderTest { diff --git a/src/test/java/net/logstash/logback/composite/loggingevent/LoggingEventCompositeJsonFormatterTest.java b/src/test/java/net/logstash/logback/composite/loggingevent/LoggingEventCompositeJsonFormatterTest.java index 1f9ed39d..4ef4b987 100644 --- a/src/test/java/net/logstash/logback/composite/loggingevent/LoggingEventCompositeJsonFormatterTest.java +++ b/src/test/java/net/logstash/logback/composite/loggingevent/LoggingEventCompositeJsonFormatterTest.java @@ -24,13 +24,12 @@ import net.logstash.logback.argument.StructuredArguments; import net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder; +import ch.qos.logback.classic.spi.ILoggingEvent; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import ch.qos.logback.classic.spi.ILoggingEvent; - @ExtendWith(MockitoExtension.class) public class LoggingEventCompositeJsonFormatterTest { diff --git a/src/test/java/net/logstash/logback/composite/loggingevent/LoggingEventFormattedTimestampJsonProviderTest.java b/src/test/java/net/logstash/logback/composite/loggingevent/LoggingEventFormattedTimestampJsonProviderTest.java index 46d0a44b..c490dcbb 100644 --- a/src/test/java/net/logstash/logback/composite/loggingevent/LoggingEventFormattedTimestampJsonProviderTest.java +++ b/src/test/java/net/logstash/logback/composite/loggingevent/LoggingEventFormattedTimestampJsonProviderTest.java @@ -25,15 +25,15 @@ import java.time.format.DateTimeFormatter; import java.util.TimeZone; -import ch.qos.logback.classic.spi.ILoggingEvent; import net.logstash.logback.composite.FormattedTimestampJsonProvider; + +import ch.qos.logback.classic.spi.ILoggingEvent; +import com.fasterxml.jackson.core.JsonGenerator; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.fasterxml.jackson.core.JsonGenerator; - @ExtendWith(MockitoExtension.class) public class LoggingEventFormattedTimestampJsonProviderTest { diff --git a/src/test/java/net/logstash/logback/composite/loggingevent/LoggingEventNestedJsonProviderTest.java b/src/test/java/net/logstash/logback/composite/loggingevent/LoggingEventNestedJsonProviderTest.java index 3d3375ef..e98bb5bb 100644 --- a/src/test/java/net/logstash/logback/composite/loggingevent/LoggingEventNestedJsonProviderTest.java +++ b/src/test/java/net/logstash/logback/composite/loggingevent/LoggingEventNestedJsonProviderTest.java @@ -20,6 +20,7 @@ import java.io.IOException; import ch.qos.logback.classic.spi.ILoggingEvent; +import com.fasterxml.jackson.core.JsonGenerator; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InOrder; @@ -27,8 +28,6 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.fasterxml.jackson.core.JsonGenerator; - @ExtendWith(MockitoExtension.class) public class LoggingEventNestedJsonProviderTest { diff --git a/src/test/java/net/logstash/logback/composite/loggingevent/LoggingEventPatternJsonProviderTest.java b/src/test/java/net/logstash/logback/composite/loggingevent/LoggingEventPatternJsonProviderTest.java index e785322e..25ffd9d0 100644 --- a/src/test/java/net/logstash/logback/composite/loggingevent/LoggingEventPatternJsonProviderTest.java +++ b/src/test/java/net/logstash/logback/composite/loggingevent/LoggingEventPatternJsonProviderTest.java @@ -18,6 +18,7 @@ import net.logstash.logback.composite.AbstractPatternJsonProvider; import net.logstash.logback.composite.AbstractPatternJsonProviderTest; import net.logstash.logback.pattern.AbstractJsonPatternParser; + import ch.qos.logback.classic.spi.ILoggingEvent; /** diff --git a/src/test/java/net/logstash/logback/composite/loggingevent/LogstashMarkersJsonProviderTest.java b/src/test/java/net/logstash/logback/composite/loggingevent/LogstashMarkersJsonProviderTest.java index 494c8a3e..50b34971 100644 --- a/src/test/java/net/logstash/logback/composite/loggingevent/LogstashMarkersJsonProviderTest.java +++ b/src/test/java/net/logstash/logback/composite/loggingevent/LogstashMarkersJsonProviderTest.java @@ -21,16 +21,16 @@ import java.io.IOException; import java.util.Collections; -import ch.qos.logback.classic.spi.ILoggingEvent; import net.logstash.logback.marker.LogstashMarker; + +import ch.qos.logback.classic.spi.ILoggingEvent; +import com.fasterxml.jackson.core.JsonGenerator; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import org.slf4j.Marker; -import com.fasterxml.jackson.core.JsonGenerator; - @ExtendWith(MockitoExtension.class) public class LogstashMarkersJsonProviderTest { diff --git a/src/test/java/net/logstash/logback/composite/loggingevent/MdcJsonProviderTest.java b/src/test/java/net/logstash/logback/composite/loggingevent/MdcJsonProviderTest.java index 2d41db0f..9cb8a4cc 100644 --- a/src/test/java/net/logstash/logback/composite/loggingevent/MdcJsonProviderTest.java +++ b/src/test/java/net/logstash/logback/composite/loggingevent/MdcJsonProviderTest.java @@ -25,8 +25,10 @@ import java.util.LinkedHashMap; import java.util.Map; -import ch.qos.logback.classic.spi.ILoggingEvent; import net.logstash.logback.fieldnames.LogstashFieldNames; + +import ch.qos.logback.classic.spi.ILoggingEvent; +import com.fasterxml.jackson.core.JsonGenerator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -34,8 +36,6 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.fasterxml.jackson.core.JsonGenerator; - @ExtendWith(MockitoExtension.class) public class MdcJsonProviderTest { diff --git a/src/test/java/net/logstash/logback/composite/loggingevent/MessageJsonProviderTest.java b/src/test/java/net/logstash/logback/composite/loggingevent/MessageJsonProviderTest.java index b6d9cc36..e9d8a90a 100644 --- a/src/test/java/net/logstash/logback/composite/loggingevent/MessageJsonProviderTest.java +++ b/src/test/java/net/logstash/logback/composite/loggingevent/MessageJsonProviderTest.java @@ -23,15 +23,15 @@ import java.io.IOException; -import ch.qos.logback.classic.spi.ILoggingEvent; import net.logstash.logback.fieldnames.LogstashFieldNames; + +import ch.qos.logback.classic.spi.ILoggingEvent; +import com.fasterxml.jackson.core.JsonGenerator; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.fasterxml.jackson.core.JsonGenerator; - @ExtendWith(MockitoExtension.class) public class MessageJsonProviderTest { diff --git a/src/test/java/net/logstash/logback/composite/loggingevent/RawMessageJsonProviderTest.java b/src/test/java/net/logstash/logback/composite/loggingevent/RawMessageJsonProviderTest.java index 652117b1..07a42e73 100644 --- a/src/test/java/net/logstash/logback/composite/loggingevent/RawMessageJsonProviderTest.java +++ b/src/test/java/net/logstash/logback/composite/loggingevent/RawMessageJsonProviderTest.java @@ -21,13 +21,12 @@ import java.io.IOException; import ch.qos.logback.classic.spi.ILoggingEvent; +import com.fasterxml.jackson.core.JsonGenerator; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.fasterxml.jackson.core.JsonGenerator; - @ExtendWith(MockitoExtension.class) public class RawMessageJsonProviderTest { diff --git a/src/test/java/net/logstash/logback/composite/loggingevent/RootStackTraceElementJsonProviderTest.java b/src/test/java/net/logstash/logback/composite/loggingevent/RootStackTraceElementJsonProviderTest.java index 29a4824b..2cd24713 100644 --- a/src/test/java/net/logstash/logback/composite/loggingevent/RootStackTraceElementJsonProviderTest.java +++ b/src/test/java/net/logstash/logback/composite/loggingevent/RootStackTraceElementJsonProviderTest.java @@ -20,18 +20,18 @@ import java.io.IOException; +import net.logstash.logback.fieldnames.ShortenedFieldNames; + import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.classic.spi.StackTraceElementProxy; import ch.qos.logback.classic.spi.ThrowableProxy; -import net.logstash.logback.fieldnames.ShortenedFieldNames; +import com.fasterxml.jackson.core.JsonGenerator; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InOrder; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.fasterxml.jackson.core.JsonGenerator; - @ExtendWith(MockitoExtension.class) public class RootStackTraceElementJsonProviderTest { diff --git a/src/test/java/net/logstash/logback/composite/loggingevent/SequenceJsonProviderTest.java b/src/test/java/net/logstash/logback/composite/loggingevent/SequenceJsonProviderTest.java index 6649cc98..5f640213 100644 --- a/src/test/java/net/logstash/logback/composite/loggingevent/SequenceJsonProviderTest.java +++ b/src/test/java/net/logstash/logback/composite/loggingevent/SequenceJsonProviderTest.java @@ -20,13 +20,12 @@ import java.io.IOException; import ch.qos.logback.classic.spi.ILoggingEvent; +import com.fasterxml.jackson.core.JsonGenerator; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.fasterxml.jackson.core.JsonGenerator; - @ExtendWith(MockitoExtension.class) public class SequenceJsonProviderTest { diff --git a/src/test/java/net/logstash/logback/composite/loggingevent/StackHashJsonProviderTest.java b/src/test/java/net/logstash/logback/composite/loggingevent/StackHashJsonProviderTest.java index f68e9889..bb221f21 100644 --- a/src/test/java/net/logstash/logback/composite/loggingevent/StackHashJsonProviderTest.java +++ b/src/test/java/net/logstash/logback/composite/loggingevent/StackHashJsonProviderTest.java @@ -24,6 +24,7 @@ import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.classic.spi.ThrowableProxy; +import com.fasterxml.jackson.core.JsonGenerator; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -31,8 +32,6 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.fasterxml.jackson.core.JsonGenerator; - @ExtendWith(MockitoExtension.class) public class StackHashJsonProviderTest { diff --git a/src/test/java/net/logstash/logback/composite/loggingevent/StackTraceJsonProviderTest.java b/src/test/java/net/logstash/logback/composite/loggingevent/StackTraceJsonProviderTest.java index 54b511c9..d06373d1 100644 --- a/src/test/java/net/logstash/logback/composite/loggingevent/StackTraceJsonProviderTest.java +++ b/src/test/java/net/logstash/logback/composite/loggingevent/StackTraceJsonProviderTest.java @@ -20,18 +20,18 @@ import java.io.IOException; +import net.logstash.logback.fieldnames.LogstashFieldNames; + import ch.qos.logback.classic.pattern.ThrowableHandlingConverter; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.classic.spi.IThrowableProxy; -import net.logstash.logback.fieldnames.LogstashFieldNames; +import com.fasterxml.jackson.core.JsonGenerator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.fasterxml.jackson.core.JsonGenerator; - @ExtendWith(MockitoExtension.class) public class StackTraceJsonProviderTest { diff --git a/src/test/java/net/logstash/logback/composite/loggingevent/TagsJsonProviderTest.java b/src/test/java/net/logstash/logback/composite/loggingevent/TagsJsonProviderTest.java index 4a57e91b..023097f0 100644 --- a/src/test/java/net/logstash/logback/composite/loggingevent/TagsJsonProviderTest.java +++ b/src/test/java/net/logstash/logback/composite/loggingevent/TagsJsonProviderTest.java @@ -21,9 +21,11 @@ import java.io.IOException; import java.util.Collections; -import ch.qos.logback.classic.spi.ILoggingEvent; import net.logstash.logback.fieldnames.LogstashFieldNames; import net.logstash.logback.marker.LogstashMarker; + +import ch.qos.logback.classic.spi.ILoggingEvent; +import com.fasterxml.jackson.core.JsonGenerator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -32,8 +34,6 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.slf4j.Marker; -import com.fasterxml.jackson.core.JsonGenerator; - @ExtendWith(MockitoExtension.class) public class TagsJsonProviderTest { diff --git a/src/test/java/net/logstash/logback/composite/loggingevent/ThreadNameJsonProviderTest.java b/src/test/java/net/logstash/logback/composite/loggingevent/ThreadNameJsonProviderTest.java index 3302a541..4af8c8e2 100644 --- a/src/test/java/net/logstash/logback/composite/loggingevent/ThreadNameJsonProviderTest.java +++ b/src/test/java/net/logstash/logback/composite/loggingevent/ThreadNameJsonProviderTest.java @@ -20,15 +20,15 @@ import java.io.IOException; -import ch.qos.logback.classic.spi.ILoggingEvent; import net.logstash.logback.fieldnames.LogstashFieldNames; + +import ch.qos.logback.classic.spi.ILoggingEvent; +import com.fasterxml.jackson.core.JsonGenerator; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.fasterxml.jackson.core.JsonGenerator; - @ExtendWith(MockitoExtension.class) public class ThreadNameJsonProviderTest { diff --git a/src/test/java/net/logstash/logback/composite/loggingevent/ThrowableClassNameJsonProviderTest.java b/src/test/java/net/logstash/logback/composite/loggingevent/ThrowableClassNameJsonProviderTest.java index 88c8b7bc..669ef8e6 100644 --- a/src/test/java/net/logstash/logback/composite/loggingevent/ThrowableClassNameJsonProviderTest.java +++ b/src/test/java/net/logstash/logback/composite/loggingevent/ThrowableClassNameJsonProviderTest.java @@ -15,7 +15,7 @@ */ package net.logstash.logback.composite.loggingevent; -import static org.mockito.Mockito.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -24,13 +24,12 @@ import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.classic.spi.ThrowableProxy; +import com.fasterxml.jackson.core.JsonGenerator; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.fasterxml.jackson.core.JsonGenerator; - @ExtendWith(MockitoExtension.class) public class ThrowableClassNameJsonProviderTest { diff --git a/src/test/java/net/logstash/logback/composite/loggingevent/ThrowableRootCauseClassNameJsonProviderTest.java b/src/test/java/net/logstash/logback/composite/loggingevent/ThrowableRootCauseClassNameJsonProviderTest.java index 58a7da46..92fee16e 100644 --- a/src/test/java/net/logstash/logback/composite/loggingevent/ThrowableRootCauseClassNameJsonProviderTest.java +++ b/src/test/java/net/logstash/logback/composite/loggingevent/ThrowableRootCauseClassNameJsonProviderTest.java @@ -15,7 +15,7 @@ */ package net.logstash.logback.composite.loggingevent; -import static org.mockito.Mockito.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -24,13 +24,12 @@ import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.classic.spi.ThrowableProxy; +import com.fasterxml.jackson.core.JsonGenerator; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.fasterxml.jackson.core.JsonGenerator; - @ExtendWith(MockitoExtension.class) public class ThrowableRootCauseClassNameJsonProviderTest { diff --git a/src/test/java/net/logstash/logback/composite/loggingevent/UuidProviderTest.java b/src/test/java/net/logstash/logback/composite/loggingevent/UuidProviderTest.java index 8a9962ff..4b4c4202 100644 --- a/src/test/java/net/logstash/logback/composite/loggingevent/UuidProviderTest.java +++ b/src/test/java/net/logstash/logback/composite/loggingevent/UuidProviderTest.java @@ -22,13 +22,12 @@ import java.io.IOException; import ch.qos.logback.classic.spi.ILoggingEvent; +import com.fasterxml.jackson.core.JsonGenerator; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.fasterxml.jackson.core.JsonGenerator; - @ExtendWith(MockitoExtension.class) public class UuidProviderTest { public static final String UUID = "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"; diff --git a/src/test/java/net/logstash/logback/decorate/CharacterEscapesJsonFactoryDecoratorTest.java b/src/test/java/net/logstash/logback/decorate/CharacterEscapesJsonFactoryDecoratorTest.java index 44a38d42..e5344c82 100644 --- a/src/test/java/net/logstash/logback/decorate/CharacterEscapesJsonFactoryDecoratorTest.java +++ b/src/test/java/net/logstash/logback/decorate/CharacterEscapesJsonFactoryDecoratorTest.java @@ -19,11 +19,10 @@ import java.io.StringWriter; -import org.junit.jupiter.api.Test; - import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.MappingJsonFactory; +import org.junit.jupiter.api.Test; public class CharacterEscapesJsonFactoryDecoratorTest { diff --git a/src/test/java/net/logstash/logback/decorate/FeatureJsonFactoryDecoratorTest.java b/src/test/java/net/logstash/logback/decorate/FeatureJsonFactoryDecoratorTest.java index 04daad2b..4718c35b 100644 --- a/src/test/java/net/logstash/logback/decorate/FeatureJsonFactoryDecoratorTest.java +++ b/src/test/java/net/logstash/logback/decorate/FeatureJsonFactoryDecoratorTest.java @@ -20,13 +20,12 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import com.fasterxml.jackson.core.JsonFactory; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.fasterxml.jackson.core.JsonFactory; - @ExtendWith(MockitoExtension.class) public class FeatureJsonFactoryDecoratorTest { diff --git a/src/test/java/net/logstash/logback/encoder/CompositeJsonEncoderTest.java b/src/test/java/net/logstash/logback/encoder/CompositeJsonEncoderTest.java index 711d24a1..9d30f625 100644 --- a/src/test/java/net/logstash/logback/encoder/CompositeJsonEncoderTest.java +++ b/src/test/java/net/logstash/logback/encoder/CompositeJsonEncoderTest.java @@ -37,15 +37,6 @@ import net.logstash.logback.TestJsonProvider; import net.logstash.logback.composite.CompositeJsonFormatter; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.junit.jupiter.MockitoExtension; - -import com.fasterxml.jackson.core.JsonEncoding; - import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.Context; import ch.qos.logback.core.encoder.Encoder; @@ -53,6 +44,13 @@ import ch.qos.logback.core.encoder.LayoutWrappingEncoder; import ch.qos.logback.core.status.StatusManager; import ch.qos.logback.core.status.WarnStatus; +import com.fasterxml.jackson.core.JsonEncoding; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; @SuppressWarnings("unchecked") @ExtendWith(MockitoExtension.class) diff --git a/src/test/java/net/logstash/logback/encoder/LogstashAccessEncoderTest.java b/src/test/java/net/logstash/logback/encoder/LogstashAccessEncoderTest.java index cb92bb01..c11d030e 100644 --- a/src/test/java/net/logstash/logback/encoder/LogstashAccessEncoderTest.java +++ b/src/test/java/net/logstash/logback/encoder/LogstashAccessEncoderTest.java @@ -25,13 +25,13 @@ import java.util.Map; import java.util.TimeZone; -import ch.qos.logback.access.spi.IAccessEvent; -import ch.qos.logback.core.Context; import net.logstash.logback.composite.FormattedTimestampJsonProvider; -import org.junit.jupiter.api.Test; +import ch.qos.logback.access.spi.IAccessEvent; +import ch.qos.logback.core.Context; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.jupiter.api.Test; public class LogstashAccessEncoderTest { diff --git a/src/test/java/net/logstash/logback/encoder/LogstashEncoderTest.java b/src/test/java/net/logstash/logback/encoder/LogstashEncoderTest.java index 1fb655a0..22860737 100644 --- a/src/test/java/net/logstash/logback/encoder/LogstashEncoderTest.java +++ b/src/test/java/net/logstash/logback/encoder/LogstashEncoderTest.java @@ -39,6 +39,12 @@ import java.util.Map; import java.util.TimeZone; +import net.logstash.logback.composite.FormattedTimestampJsonProvider; +import net.logstash.logback.decorate.JsonFactoryDecorator; +import net.logstash.logback.decorate.JsonGeneratorDecorator; +import net.logstash.logback.fieldnames.LogstashCommonFieldNames; +import net.logstash.logback.fieldnames.ShortenedFieldNames; + import ch.qos.logback.classic.Level; import ch.qos.logback.classic.pattern.TargetLengthBasedClassNameAbbreviator; import ch.qos.logback.classic.spi.ILoggingEvent; @@ -46,12 +52,11 @@ import ch.qos.logback.classic.spi.ThrowableProxy; import ch.qos.logback.classic.spi.ThrowableProxyUtil; import ch.qos.logback.core.Context; -import net.logstash.logback.composite.FormattedTimestampJsonProvider; -import net.logstash.logback.decorate.JsonFactoryDecorator; -import net.logstash.logback.decorate.JsonGeneratorDecorator; -import net.logstash.logback.fieldnames.LogstashCommonFieldNames; -import net.logstash.logback.fieldnames.ShortenedFieldNames; - +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.MappingJsonFactory; +import com.fasterxml.jackson.databind.ObjectMapper; import org.assertj.core.util.Files; import org.junit.jupiter.api.Test; import org.slf4j.Logger; @@ -60,12 +65,6 @@ import org.slf4j.Marker; import org.slf4j.MarkerFactory; -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.MappingJsonFactory; -import com.fasterxml.jackson.databind.ObjectMapper; - public class LogstashEncoderTest { private static final Logger LOG = LoggerFactory.getLogger(LogstashEncoderTest.class); diff --git a/src/test/java/net/logstash/logback/layout/CompositeJsonLayoutTest.java b/src/test/java/net/logstash/logback/layout/CompositeJsonLayoutTest.java index 88f986c2..6e7992b9 100644 --- a/src/test/java/net/logstash/logback/layout/CompositeJsonLayoutTest.java +++ b/src/test/java/net/logstash/logback/layout/CompositeJsonLayoutTest.java @@ -23,17 +23,15 @@ import net.logstash.logback.composite.AbstractJsonProvider; import net.logstash.logback.composite.CompositeJsonFormatter; +import ch.qos.logback.core.Layout; +import ch.qos.logback.core.LayoutBase; +import ch.qos.logback.core.spi.DeferredProcessingAware; +import com.fasterxml.jackson.core.JsonGenerator; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.fasterxml.jackson.core.JsonGenerator; - -import ch.qos.logback.core.Layout; -import ch.qos.logback.core.LayoutBase; -import ch.qos.logback.core.spi.DeferredProcessingAware; - @ExtendWith(MockitoExtension.class) public class CompositeJsonLayoutTest { diff --git a/src/test/java/net/logstash/logback/marker/DeferredLogstashMarkerTest.java b/src/test/java/net/logstash/logback/marker/DeferredLogstashMarkerTest.java index 78289676..86f81d0f 100644 --- a/src/test/java/net/logstash/logback/marker/DeferredLogstashMarkerTest.java +++ b/src/test/java/net/logstash/logback/marker/DeferredLogstashMarkerTest.java @@ -25,11 +25,10 @@ import java.io.StringWriter; import java.util.function.Supplier; -import org.junit.jupiter.api.Test; - import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.MappingJsonFactory; +import org.junit.jupiter.api.Test; public class DeferredLogstashMarkerTest { diff --git a/src/test/java/net/logstash/logback/marker/MapEntriesAppendingMarkerTest.java b/src/test/java/net/logstash/logback/marker/MapEntriesAppendingMarkerTest.java index 403c9748..dea4caec 100755 --- a/src/test/java/net/logstash/logback/marker/MapEntriesAppendingMarkerTest.java +++ b/src/test/java/net/logstash/logback/marker/MapEntriesAppendingMarkerTest.java @@ -22,11 +22,10 @@ import java.util.HashMap; import java.util.Map; -import org.junit.jupiter.api.Test; - import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.MappingJsonFactory; +import org.junit.jupiter.api.Test; public class MapEntriesAppendingMarkerTest { diff --git a/src/test/java/net/logstash/logback/marker/ObjectAppendingMarkerTest.java b/src/test/java/net/logstash/logback/marker/ObjectAppendingMarkerTest.java index 24ac9745..e46051a7 100755 --- a/src/test/java/net/logstash/logback/marker/ObjectAppendingMarkerTest.java +++ b/src/test/java/net/logstash/logback/marker/ObjectAppendingMarkerTest.java @@ -20,11 +20,10 @@ import java.io.IOException; import java.io.StringWriter; -import org.junit.jupiter.api.Test; - import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.MappingJsonFactory; +import org.junit.jupiter.api.Test; public class ObjectAppendingMarkerTest { diff --git a/src/test/java/net/logstash/logback/marker/ObjectFieldsAppendingMarkerTest.java b/src/test/java/net/logstash/logback/marker/ObjectFieldsAppendingMarkerTest.java index c320d1ed..4124127a 100755 --- a/src/test/java/net/logstash/logback/marker/ObjectFieldsAppendingMarkerTest.java +++ b/src/test/java/net/logstash/logback/marker/ObjectFieldsAppendingMarkerTest.java @@ -20,11 +20,10 @@ import java.io.IOException; import java.io.StringWriter; -import org.junit.jupiter.api.Test; - import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.MappingJsonFactory; +import org.junit.jupiter.api.Test; public class ObjectFieldsAppendingMarkerTest { diff --git a/src/test/java/net/logstash/logback/marker/RawJsonAppendingMarkerTest.java b/src/test/java/net/logstash/logback/marker/RawJsonAppendingMarkerTest.java index cb0303de..ddbabce2 100755 --- a/src/test/java/net/logstash/logback/marker/RawJsonAppendingMarkerTest.java +++ b/src/test/java/net/logstash/logback/marker/RawJsonAppendingMarkerTest.java @@ -20,11 +20,10 @@ import java.io.IOException; import java.io.StringWriter; -import org.junit.jupiter.api.Test; - import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.MappingJsonFactory; +import org.junit.jupiter.api.Test; public class RawJsonAppendingMarkerTest { diff --git a/src/test/java/net/logstash/logback/mask/MaskingJsonGeneratorDecoratorTest.java b/src/test/java/net/logstash/logback/mask/MaskingJsonGeneratorDecoratorTest.java index 7c9b8a3c..b26af047 100644 --- a/src/test/java/net/logstash/logback/mask/MaskingJsonGeneratorDecoratorTest.java +++ b/src/test/java/net/logstash/logback/mask/MaskingJsonGeneratorDecoratorTest.java @@ -23,6 +23,9 @@ import java.io.StringWriter; import java.util.Arrays; +import net.logstash.logback.decorate.JsonGeneratorDecorator; +import net.logstash.logback.encoder.CompositeJsonEncoder; + import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.joran.JoranConfigurator; @@ -30,15 +33,12 @@ import ch.qos.logback.core.ConsoleAppender; import ch.qos.logback.core.joran.spi.JoranException; import ch.qos.logback.core.spi.LifeCycle; -import net.logstash.logback.decorate.JsonGeneratorDecorator; -import net.logstash.logback.encoder.CompositeJsonEncoder; -import org.junit.jupiter.api.Test; - import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonStreamContext; import com.fasterxml.jackson.databind.MappingJsonFactory; +import org.junit.jupiter.api.Test; public class MaskingJsonGeneratorDecoratorTest { diff --git a/src/test/java/net/logstash/logback/mask/RegexValueMaskerTest.java b/src/test/java/net/logstash/logback/mask/RegexValueMaskerTest.java index df81931b..6471cb51 100644 --- a/src/test/java/net/logstash/logback/mask/RegexValueMaskerTest.java +++ b/src/test/java/net/logstash/logback/mask/RegexValueMaskerTest.java @@ -17,9 +17,8 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.jupiter.api.Test; - import com.fasterxml.jackson.databind.node.NullNode; +import org.junit.jupiter.api.Test; class RegexValueMaskerTest { diff --git a/src/test/java/net/logstash/logback/pattern/AbstractJsonPatternParserTest.java b/src/test/java/net/logstash/logback/pattern/AbstractJsonPatternParserTest.java index 35f41f00..7e61e26a 100644 --- a/src/test/java/net/logstash/logback/pattern/AbstractJsonPatternParserTest.java +++ b/src/test/java/net/logstash/logback/pattern/AbstractJsonPatternParserTest.java @@ -15,27 +15,25 @@ */ package net.logstash.logback.pattern; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.BDDMockito.given; + +import java.io.IOException; +import java.io.StringWriter; +import java.util.Map; + import ch.qos.logback.core.Context; import ch.qos.logback.core.spi.ContextAware; - import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.MappingJsonFactory; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import java.io.IOException; -import java.io.StringWriter; -import java.util.Map; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.BDDMockito.given; - /** * @author Dmitry Andrianov */ diff --git a/src/test/java/net/logstash/logback/pattern/AccessEventJsonPatternParserTest.java b/src/test/java/net/logstash/logback/pattern/AccessEventJsonPatternParserTest.java index cc1af179..01b60748 100644 --- a/src/test/java/net/logstash/logback/pattern/AccessEventJsonPatternParserTest.java +++ b/src/test/java/net/logstash/logback/pattern/AccessEventJsonPatternParserTest.java @@ -15,16 +15,16 @@ */ package net.logstash.logback.pattern; +import static org.mockito.BDDMockito.given; + +import java.io.IOException; + import ch.qos.logback.access.spi.IAccessEvent; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import java.io.IOException; - -import static org.mockito.BDDMockito.given; - /** * @author Dmitry Andrianov */ diff --git a/src/test/java/net/logstash/logback/pattern/LoggingEventJsonPatternParserTest.java b/src/test/java/net/logstash/logback/pattern/LoggingEventJsonPatternParserTest.java index 850a3f70..e45965b3 100644 --- a/src/test/java/net/logstash/logback/pattern/LoggingEventJsonPatternParserTest.java +++ b/src/test/java/net/logstash/logback/pattern/LoggingEventJsonPatternParserTest.java @@ -15,6 +15,12 @@ */ package net.logstash.logback.pattern; +import static org.mockito.BDDMockito.given; + +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + import ch.qos.logback.classic.Level; import ch.qos.logback.classic.spi.ILoggingEvent; import org.junit.jupiter.api.Test; @@ -22,12 +28,6 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - -import static org.mockito.BDDMockito.given; - /** * @author Dmitry Andrianov */