Skip to content

checkstyle rule for java import statements #561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 10, 2021
Merged

checkstyle rule for java import statements #561

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b27a65
Add checkstyle rule for java import statements
brenuart Jul 7, 2021
fbe6162
Fix import ordering + ban unused imports
brenuart Jul 7, 2021
06415e8
Limit the check for a valid license header to .java source files only
brenuart Jul 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add checkstyle rule for java import statements 
Related issue: #556
  • Loading branch information
@brenuart
brenuart committed Jul 7, 2021
commit 0b27a65c2aeb30974c7a82831c85f35e061f5941
9 changes: 8 additions & 1 deletion src/checkstyle/checkstyle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,14 @@
<module name="AvoidStarImport"/>
<module name="IllegalImport"/> <!-- defaults to sun.* packages -->
<module name="RedundantImport"/>

<module name="ImportOrder">
<property name="groups" value="java,javax,net.logstash"/>
Copy link
Collaborator

@philsttr philsttr Jul 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove javax

I think one group for java and javax without a separator between is sufficient.

Copy link
Collaborator Author

@brenuart brenuart Jul 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmmm... I can have checkstyle putting both java.* and javax.* in the same group with a regular expression - but IDE like Eclipse doesn't like it :-(

The project isn't using any javax.* stuff anyway so, either:

  • I remove the javax group and let them fall into the "other" category
  • I keep it asis with possibly two "java" groups at the top - "just in case..." (project is not using any javax stuff anyway)

Copy link
Collaborator

@philsttr philsttr Jul 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's remove javax.

A lot of that namespace is slowly being replaced with jakarta anyway.

Copy link
Collaborator Author

@brenuart brenuart Jul 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was wrong... we have a few javax.net.ssl.* stuff... removing the javax group gives something like this:

import java.io.BufferedOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.SocketTimeoutException;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Formatter;
import java.util.List;
import java.util.Optional;

import net.logstash.logback.appender.destination.DelegateDestinationConnectionStrategy;
import net.logstash.logback.appender.listener.TcpAppenderListener;
import net.logstash.logback.encoder.SeparatorParser;
import net.logstash.logback.encoder.StreamingEncoder;

import ch.qos.logback.core.net.ssl.ConfigurableSSLSocketFactory;
import ch.qos.logback.core.net.ssl.SSLConfigurableSocket;
import com.lmax.disruptor.EventHandler;
import com.lmax.disruptor.LifecycleAware;
import com.lmax.disruptor.RingBuffer;
import javax.net.SocketFactory;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSocketFactory;

Do you still like it? Personally I'm more in favour of a javax group at the top below java.. matter of taste ;-)
Up to you...

Copy link
Collaborator

@philsttr philsttr Jul 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok. I was thinking it was prefix based, and that java would match java and javax. But since that's not the case, we can keep it.

<property name="ordered" value="true"/>
<property name="separated" value="true"/>
<property name="option" value="above"/>
<property name="sortStaticImportsAlphabetically" value="true"/>
</module>

<!-- Checks for whitespace -->
<!-- See https://checkstyle.org/config_whitespace.html -->
<module name="EmptyForIteratorPad"/>
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/net/logstash/logback/LogstashAccessFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/net/logstash/logback/LogstashFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/net/logstash/logback/appender/AbstractLogstashTcpSocketAppender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/net/logstash/logback/appender/AbstractLogstashUdpSocketAppender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}.
Expand Down
1 change: 1 addition & 0 deletions src/main/java/net/logstash/logback/appender/AccessEventAsyncDisruptorAppender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
package net.logstash.logback.appender;

import net.logstash.logback.appender.listener.AppenderListener;

import ch.qos.logback.access.spi.IAccessEvent;

/**
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/net/logstash/logback/appender/AsyncDisruptorAppender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/net/logstash/logback/appender/DelegatingAsyncDisruptorAppender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/logstash/logback/appender/LoggingEventAsyncDisruptorAppender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
1 change: 1 addition & 0 deletions src/main/java/net/logstash/logback/appender/LogstashAccessTcpSocketAppender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
package net.logstash.logback.appender;

import net.logstash.logback.appender.listener.TcpAppenderListener;

import ch.qos.logback.access.spi.IAccessEvent;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/logstash/logback/appender/LogstashTcpSocketAppender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
3 changes: 2 additions & 1 deletion ...in/java/net/logstash/logback/appender/listener/FailureSummaryLoggingAppenderListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/logstash/logback/argument/DeferredStructuredArgument.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/net/logstash/logback/argument/StructuredArgument.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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...)})
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/net/logstash/logback/argument/StructuredArguments.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
5 changes: 2 additions & 3 deletions src/main/java/net/logstash/logback/composite/AbstractNestedJsonProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/logstash/logback/composite/AbstractPatternJsonProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
11 changes: 5 additions & 6 deletions src/main/java/net/logstash/logback/composite/CompositeJsonFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/logstash/logback/composite/ContextJsonProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/logstash/logback/composite/FormattedTimestampJsonProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
1 change: 0 additions & 1 deletion src/main/java/net/logstash/logback/composite/GlobalCustomFieldsJsonProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion src/main/java/net/logstash/logback/composite/JsonProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
1 change: 0 additions & 1 deletion src/main/java/net/logstash/logback/composite/JsonProviders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
3 changes: 1 addition & 2 deletions src/main/java/net/logstash/logback/composite/LogstashVersionJsonProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
1 change: 1 addition & 0 deletions ...in/java/net/logstash/logback/composite/accessevent/AccessEventCompositeJsonFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions ...net/logstash/logback/composite/accessevent/AccessEventFormattedTimestampJsonProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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> {
Expand Down
1 change: 1 addition & 0 deletions src/main/java/net/logstash/logback/composite/accessevent/AccessEventJsonProviders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
1 change: 1 addition & 0 deletions src/main/java/net/logstash/logback/composite/accessevent/AccessEventNestedJsonProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 1 addition & 0 deletions src/main/java/net/logstash/logback/composite/accessevent/AccessEventPatternJsonProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/logstash/logback/composite/accessevent/AccessMessageJsonProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/net/logstash/logback/composite/accessevent/ContentLengthJsonProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<IAccessEvent> implements FieldNamesAware<LogstashAccessFieldNames> {

public static final String FIELD_CONTENT_LENGTH = "content_length";
Expand Down
Loading