Enable checkstyle on test sources

pom.xml

@@ -422,6 +422,7 @@
                     <version>${maven-checkstyle-plugin.version}</version>
                     <configuration>
                         <configLocation>src/checkstyle/checkstyle.xml</configLocation>
+                        <includeTestSourceDirectory>true</includeTestSourceDirectory>
                     </configuration>
                     <dependencies>
                         <dependency>

src/checkstyle/checkstyle.xml

@@ -36,7 +36,15 @@
         <module name="AvoidStarImport"/>
         <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
         <module name="RedundantImport"/>
-
+        <module name="UnusedImports"/>
+        <module name="ImportOrder">
+            <property name="groups" value="java,javax,net.logstash"/>
+            <property name="ordered" value="true"/>
+            <property name="separated" value="true"/>
+            <property name="option" value="top"/>
+            <property name="sortStaticImportsAlphabetically" value="true"/>
+        </module>
+
         <!-- Checks for whitespace                             -->
         <!-- See https://checkstyle.org/config_whitespace.html -->
         <module name="EmptyForIteratorPad"/>
@@ -86,5 +94,6 @@
     </module>
     <module name="RegexpHeader">
         <property name="header" value="^/\*\n^ \* Copyright .* the original author or authors\.\n^ *\n^ \* Licensed under the Apache License, Version 2\.0 \(the &quot;License&quot;\);"/>
+        <property name="fileExtensions" value="java"/>
     </module>
 </module>

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;

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

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

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}.

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;
 
 /**

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;

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

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 

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

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...)})

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;
 

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.

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;
 

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.

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;
 
 /**

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;
 
 /**

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;

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;
 
 /**

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;
 

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).

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;

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<IAccessEvent, LogstashAccessFieldNames> {

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;
 
 /**

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;
 

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;
 
 /**

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 {