From 86bb6847c53690fcf290b5ef39225cbb19f79f78 Mon Sep 17 00:00:00 2001 From: argha-c <007.argha@gmail.com> Date: Wed, 8 May 2024 10:21:40 -0700 Subject: [PATCH] reorder static imports --- .../zuul/message/HeadersBenchmark.java | 11 ++- .../config/PatternListStringProperty.java | 5 +- .../AbstrHttpConnectionExpiryHandler.java | 3 +- .../common/CategorizedThreadFactory.java | 1 - .../LeastConnsEventLoopChooserFactory.java | 5 +- .../netty/common/SslExceptionsHandler.java | 3 +- .../accesslog/AccessLogChannelHandler.java | 3 +- .../common/accesslog/AccessLogPublisher.java | 5 +- .../common/metrics/EventLoopGroupMetrics.java | 5 +- .../common/metrics/EventLoopMetrics.java | 1 - .../HttpBodySizeRecordingChannelHandler.java | 1 - .../metrics/HttpMetricsChannelHandler.java | 1 - .../InstrumentedResourceLeakDetector.java | 1 - .../StripUntrustedProxyHeadersHandler.java | 1 - .../netty/common/ssl/ServerSslConfig.java | 5 +- .../netty/common/ssl/SslHandshakeInfo.java | 1 - .../common/status/ServerStatusManager.java | 1 - .../MaxInboundConnectionsHandler.java | 3 +- .../src/main/java/com/netflix/zuul/Attrs.java | 3 +- .../zuul/BasicFilterUsageNotifier.java | 1 - .../zuul/BasicRequestCompleteHandler.java | 1 - .../com/netflix/zuul/DynamicFilterLoader.java | 9 ++- .../main/java/com/netflix/zuul/Filter.java | 1 - .../com/netflix/zuul/FilterFileManager.java | 9 ++- .../java/com/netflix/zuul/FilterLoader.java | 1 - .../com/netflix/zuul/StaticFilterLoader.java | 9 ++- .../zuul/context/CommonContextKeys.java | 3 +- .../java/com/netflix/zuul/context/Debug.java | 7 +- .../netflix/zuul/context/SessionContext.java | 5 +- .../context/ZuulSessionContextDecorator.java | 1 - .../netflix/zuul/filters/FilterRegistry.java | 2 +- .../zuul/filters/MutableFilterRegistry.java | 4 +- .../zuul/filters/endpoint/ProxyEndpoint.java | 7 +- .../com/netflix/zuul/message/Headers.java | 3 +- .../com/netflix/zuul/message/ZuulMessage.java | 1 - .../netflix/zuul/message/ZuulMessageImpl.java | 1 - .../netflix/zuul/message/http/Cookies.java | 1 - .../message/http/HttpHeaderNamesCache.java | 1 - .../zuul/message/http/HttpQueryParams.java | 1 - .../zuul/message/http/HttpRequestInfo.java | 1 - .../message/http/HttpRequestMessageImpl.java | 5 +- .../zuul/message/util/HttpRequestBuilder.java | 1 - .../netflix/zuul/monitoring/ConnCounter.java | 5 +- .../netflix/zuul/monitoring/ConnTimer.java | 3 +- .../netty/NettyRequestAttemptFactory.java | 3 +- .../connectionpool/BasicRequestStat.java | 1 - .../connectionpool/ClientChannelManager.java | 1 - .../connectionpool/ClientTimeoutHandler.java | 3 +- .../ConnectionPoolConfigImpl.java | 1 - .../connectionpool/ConnectionPoolHandler.java | 6 +- .../DefaultClientChannelManager.java | 7 +- .../netty/connectionpool/IConnectionPool.java | 1 - .../NettyClientConnectionFactory.java | 1 - .../PerServerConnectionPool.java | 7 +- .../connectionpool/PooledConnection.java | 5 +- .../netty/filter/BaseZuulFilterRunner.java | 11 ++- .../zuul/netty/filter/ZuulEndPointRunner.java | 5 +- .../netty/filter/ZuulFilterChainHandler.java | 5 +- .../netty/filter/ZuulFilterChainRunner.java | 3 +- .../insights/PassportStateOriginHandler.java | 1 - .../NullChannelHandlerProvider.java | 1 - .../zuul/netty/server/BaseServerStartup.java | 9 ++- .../server/BaseZuulChannelInitializer.java | 1 - .../server/ClientConnectionsShutdown.java | 3 +- .../netty/server/ClientRequestReceiver.java | 13 ++-- .../netty/server/ClientResponseWriter.java | 6 +- .../netty/server/DefaultEventLoopConfig.java | 1 - .../netty/server/DirectMemoryMonitor.java | 9 ++- .../Http1MutualSslChannelInitializer.java | 1 - .../zuul/netty/server/NamedSocketAddress.java | 2 +- .../netty/server/OriginResponseReceiver.java | 9 ++- .../com/netflix/zuul/netty/server/Server.java | 7 +- .../netty/server/SocketAddressProperty.java | 3 +- .../zuul/netty/server/ZuulDependencyKeys.java | 1 - .../server/http2/Http2Configuration.java | 1 - .../Http2ContentLengthEnforcingHandler.java | 1 - .../server/http2/Http2OrHttpHandler.java | 1 - .../netty/server/push/PushAuthHandler.java | 3 +- .../server/push/PushConnectionRegistry.java | 6 +- .../netty/server/push/PushMessageSender.java | 3 +- .../server/push/PushRegistrationHandler.java | 5 +- .../server/ssl/SslHandshakeInfoHandler.java | 9 ++- .../zuul/netty/ssl/BaseSslContextFactory.java | 5 +- .../zuul/netty/ssl/SslContextFactory.java | 1 - .../netty/timeouts/OriginTimeoutManager.java | 3 +- .../com/netflix/zuul/niws/RequestAttempt.java | 3 +- .../netflix/zuul/niws/RequestAttempts.java | 7 +- .../zuul/origins/BasicNettyOrigin.java | 1 - .../zuul/origins/BasicNettyOriginManager.java | 3 +- .../com/netflix/zuul/origins/NettyOrigin.java | 1 - .../com/netflix/zuul/origins/OriginName.java | 1 - .../origins/OriginThrottledException.java | 1 - .../zuul/passport/CurrentPassport.java | 5 +- .../java/com/netflix/zuul/plugins/Tracer.java | 1 - .../netflix/zuul/stats/ErrorStatsData.java | 1 - .../netflix/zuul/stats/ErrorStatsManager.java | 1 - .../zuul/stats/NamedCountingMonitor.java | 1 - .../zuul/stats/RouteStatusCodeMonitor.java | 3 +- .../com/netflix/zuul/stats/StatsManager.java | 5 +- .../stats/status/StatusCategoryUtils.java | 1 - .../java/com/netflix/zuul/util/Gzipper.java | 1 - .../java/com/netflix/zuul/util/HttpUtils.java | 3 +- .../com/netflix/zuul/util/JsonUtility.java | 5 +- .../com/netflix/zuul/util/ProxyUtils.java | 1 - .../common/CloseOnIdleStateHandlerTest.java | 4 +- .../SourceAddressChannelHandlerTest.java | 13 ++-- .../InstrumentedResourceLeakDetectorTest.java | 4 +- .../ElbProxyProtocolChannelHandlerTest.java | 71 +++++++++---------- .../HAProxyMessageChannelHandlerTest.java | 4 +- ...StripUntrustedProxyHeadersHandlerTest.java | 14 ++-- .../MaxInboundConnectionsHandlerTest.java | 6 +- .../test/java/com/netflix/zuul/AttrsTest.java | 8 +-- .../netflix/zuul/DynamicFilterLoaderTest.java | 17 +++-- .../netflix/zuul/FilterFileManagerTest.java | 17 +++-- .../netflix/zuul/StaticFilterLoaderTest.java | 3 +- .../netty/server/push/PushConnectionTest.java | 6 +- .../com/netflix/zuul/context/DebugTest.java | 25 ++++--- .../zuul/context/SessionContextTest.java | 8 +-- .../netflix/zuul/filters/BaseFilterTest.java | 1 + .../common/GZipResponseFilterTest.java | 17 +++-- .../filters/endpoint/ProxyEndpointTest.java | 10 +-- .../com/netflix/zuul/message/HeadersTest.java | 13 ++-- .../zuul/message/ZuulMessageImplTest.java | 8 +-- .../message/http/HttpQueryParamsTest.java | 9 ++- .../http/HttpRequestMessageImplTest.java | 29 ++++---- .../http/HttpResponseMessageImplTest.java | 11 ++- .../zuul/monitoring/ConnCounterTest.java | 6 +- .../zuul/monitoring/ConnTimerTest.java | 6 +- .../DefaultClientChannelManagerTest.java | 27 ++++--- .../PerServerConnectionPoolTest.java | 37 +++++----- .../netty/filter/ZuulEndPointRunnerTest.java | 18 ++--- .../filter/ZuulFilterChainRunnerTest.java | 20 +++--- .../insights/ServerStateHandlerTest.java | 4 +- .../BaseZuulChannelInitializerTest.java | 4 +- .../server/ClientConnectionsShutdownTest.java | 29 ++++---- .../server/ClientRequestReceiverTest.java | 21 +++--- .../server/ClientResponseWriterTest.java | 14 ++-- .../zuul/netty/server/IoUringTest.java | 27 ++++--- .../netflix/zuul/netty/server/ServerTest.java | 25 ++++--- .../server/SocketAddressPropertyTest.java | 13 ++-- .../Http2ConnectionErrorHandlerTest.java | 14 ++-- ...ttp2ContentLengthEnforcingHandlerTest.java | 4 +- .../server/http2/Http2OrHttpHandlerTest.java | 12 ++-- .../server/push/PushAuthHandlerTest.java | 6 +- .../push/PushConnectionRegistryTest.java | 9 ++- .../PushMessageSenderInitializerTest.java | 6 +- .../push/PushRegistrationHandlerTest.java | 33 +++++---- .../ssl/SslHandshakeInfoHandlerTest.java | 13 ++-- .../netty/ssl/BaseSslContextFactoryTest.java | 4 +- .../ssl/ClientSslContextFactoryTest.java | 11 ++- .../netflix/zuul/netty/ssl/OpenSslTest.java | 6 +- .../timeouts/OriginTimeoutManagerTest.java | 11 ++- .../netflix/zuul/niws/RequestAttemptTest.java | 37 +++++----- .../netflix/zuul/origins/OriginNameTest.java | 4 +- .../zuul/passport/CurrentPassportTest.java | 7 +- .../zuul/stats/ErrorStatsDataTest.java | 6 +- .../zuul/stats/ErrorStatsManagerTest.java | 9 ++- .../stats/RouteStatusCodeMonitorTest.java | 4 +- .../netflix/zuul/stats/StatsManagerTest.java | 15 ++-- .../com/netflix/zuul/util/HttpUtilsTest.java | 12 ++-- .../netflix/zuul/util/JsonUtilityTest.java | 5 +- .../com/netflix/zuul/util/VipUtilsTest.java | 4 +- .../zuul/discovery/DiscoveryResult.java | 6 +- .../zuul/discovery/DynamicServerResolver.java | 9 ++- .../zuul/discovery/NonDiscoveryServer.java | 1 - .../zuul/discovery/DiscoveryResultTest.java | 9 ++- .../discovery/DynamicServerResolverTest.java | 3 +- .../netflix/zuul/groovy/GroovyCompiler.java | 7 +- .../zuul/scriptManager/FilterInfo.java | 12 +--- .../zuul/groovy/GroovyCompilerTest.java | 8 +-- .../zuul/groovy/GroovyFileFilterTest.java | 7 +- .../scriptManager/FilterVerifierTest.java | 8 +-- .../zuul/guice/GuiceFilterFactory.java | 1 - .../netflix/zuul/init/ZuulFiltersModule.java | 7 +- .../guice/GuiceFilterFactoryIntegTest.java | 6 +- .../guice/TestGuiceConstructorFilter.java | 3 +- .../zuul/guice/TestGuiceFieldFilter.java | 3 +- .../com/netflix/zuul/init/InitTestModule.java | 3 +- .../zuul/init/ZuulFiltersModuleIntegTest.java | 7 +- .../zuul/init/ZuulFiltersModuleTest.java | 10 +-- .../common/metrics/CustomLeakDetector.java | 4 +- .../zuul/integration/IntegrationTest.java | 59 ++++++++------- .../zuul/integration/server/Bootstrap.java | 3 +- .../server/FilterLoaderProvider.java | 1 - .../integration/server/OriginServerList.java | 1 - .../zuul/integration/server/ServerModule.java | 7 +- .../integration/server/ServerStartup.java | 37 +++++----- .../zuul/integration/server/TestUtil.java | 3 +- .../server/filters/RequestHeaderFilter.java | 3 +- .../filters/processor/FilterProcessor.java | 23 +++--- .../processor/FilterProcessorTest.java | 3 +- .../inbound/SampleServiceFilter.groovy | 3 +- .../outbound/ZuulResponseFilter.groovy | 11 ++- .../com/netflix/zuul/sample/Bootstrap.java | 5 +- .../zuul/sample/SampleServerStartup.java | 39 +++++----- .../netflix/zuul/sample/SampleService.java | 7 +- .../netflix/zuul/sample/ZuulSampleModule.java | 9 ++- .../sample/push/SamplePushMessageSender.java | 9 ++- .../SamplePushMessageSenderInitializer.java | 9 ++- 199 files changed, 659 insertions(+), 820 deletions(-) diff --git a/zuul-core/src/jmh/java/com/netflix/zuul/message/HeadersBenchmark.java b/zuul-core/src/jmh/java/com/netflix/zuul/message/HeadersBenchmark.java index 51a7b78525..3161cb0a44 100644 --- a/zuul-core/src/jmh/java/com/netflix/zuul/message/HeadersBenchmark.java +++ b/zuul-core/src/jmh/java/com/netflix/zuul/message/HeadersBenchmark.java @@ -15,6 +15,10 @@ */ package com.netflix.zuul.message; +import java.util.List; +import java.util.UUID; +import java.util.concurrent.ThreadLocalRandom; +import java.util.concurrent.TimeUnit; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Mode; @@ -25,11 +29,6 @@ import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.infra.Blackhole; -import java.util.List; -import java.util.UUID; -import java.util.concurrent.ThreadLocalRandom; -import java.util.concurrent.TimeUnit; - @State(Scope.Thread) public class HeadersBenchmark { @@ -163,4 +162,4 @@ public void entries(Blackhole blackhole) { public Headers newHeaders() { return new Headers(); } -} \ No newline at end of file +} diff --git a/zuul-core/src/main/java/com/netflix/config/PatternListStringProperty.java b/zuul-core/src/main/java/com/netflix/config/PatternListStringProperty.java index 1bdda424a4..8924af8f0d 100644 --- a/zuul-core/src/main/java/com/netflix/config/PatternListStringProperty.java +++ b/zuul-core/src/main/java/com/netflix/config/PatternListStringProperty.java @@ -16,12 +16,11 @@ package com.netflix.config; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.util.ArrayList; import java.util.List; import java.util.regex.Pattern; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * User: michaels@netflix.com diff --git a/zuul-core/src/main/java/com/netflix/netty/common/AbstrHttpConnectionExpiryHandler.java b/zuul-core/src/main/java/com/netflix/netty/common/AbstrHttpConnectionExpiryHandler.java index 0838f88a94..48ec0c96d9 100644 --- a/zuul-core/src/main/java/com/netflix/netty/common/AbstrHttpConnectionExpiryHandler.java +++ b/zuul-core/src/main/java/com/netflix/netty/common/AbstrHttpConnectionExpiryHandler.java @@ -23,11 +23,10 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelOutboundHandlerAdapter; import io.netty.channel.ChannelPromise; +import java.util.concurrent.ThreadLocalRandom; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.concurrent.ThreadLocalRandom; - /** * User: michaels@netflix.com * Date: 7/17/17 diff --git a/zuul-core/src/main/java/com/netflix/netty/common/CategorizedThreadFactory.java b/zuul-core/src/main/java/com/netflix/netty/common/CategorizedThreadFactory.java index fb761b7c26..ad0cb956a8 100644 --- a/zuul-core/src/main/java/com/netflix/netty/common/CategorizedThreadFactory.java +++ b/zuul-core/src/main/java/com/netflix/netty/common/CategorizedThreadFactory.java @@ -17,7 +17,6 @@ package com.netflix.netty.common; import io.netty.util.concurrent.FastThreadLocalThread; - import java.util.concurrent.ThreadFactory; /** diff --git a/zuul-core/src/main/java/com/netflix/netty/common/LeastConnsEventLoopChooserFactory.java b/zuul-core/src/main/java/com/netflix/netty/common/LeastConnsEventLoopChooserFactory.java index 9d19860cea..310efbd9ee 100644 --- a/zuul-core/src/main/java/com/netflix/netty/common/LeastConnsEventLoopChooserFactory.java +++ b/zuul-core/src/main/java/com/netflix/netty/common/LeastConnsEventLoopChooserFactory.java @@ -19,14 +19,13 @@ import com.netflix.netty.common.metrics.EventLoopGroupMetrics; import io.netty.util.concurrent.EventExecutor; import io.netty.util.concurrent.EventExecutorChooserFactory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Map; import java.util.concurrent.ThreadLocalRandom; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * User: michaels@netflix.com diff --git a/zuul-core/src/main/java/com/netflix/netty/common/SslExceptionsHandler.java b/zuul-core/src/main/java/com/netflix/netty/common/SslExceptionsHandler.java index ee492783b0..9471ae01c7 100644 --- a/zuul-core/src/main/java/com/netflix/netty/common/SslExceptionsHandler.java +++ b/zuul-core/src/main/java/com/netflix/netty/common/SslExceptionsHandler.java @@ -20,11 +20,10 @@ import io.netty.channel.ChannelHandler.Sharable; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; +import javax.net.ssl.SSLHandshakeException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.net.ssl.SSLHandshakeException; - /** * Swallow specific SSL related exceptions to avoid propagating deep stack traces up the pipeline. * diff --git a/zuul-core/src/main/java/com/netflix/netty/common/accesslog/AccessLogChannelHandler.java b/zuul-core/src/main/java/com/netflix/netty/common/accesslog/AccessLogChannelHandler.java index 4d71d6eb70..2cd90672f8 100644 --- a/zuul-core/src/main/java/com/netflix/netty/common/accesslog/AccessLogChannelHandler.java +++ b/zuul-core/src/main/java/com/netflix/netty/common/accesslog/AccessLogChannelHandler.java @@ -26,11 +26,10 @@ import io.netty.handler.codec.http.HttpRequest; import io.netty.handler.codec.http.HttpResponse; import io.netty.util.AttributeKey; +import java.time.LocalDateTime; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.time.LocalDateTime; - /** * User: michaels@netflix.com * Date: 4/14/16 diff --git a/zuul-core/src/main/java/com/netflix/netty/common/accesslog/AccessLogPublisher.java b/zuul-core/src/main/java/com/netflix/netty/common/accesslog/AccessLogPublisher.java index 66ab47921c..b333fb0da3 100644 --- a/zuul-core/src/main/java/com/netflix/netty/common/accesslog/AccessLogPublisher.java +++ b/zuul-core/src/main/java/com/netflix/netty/common/accesslog/AccessLogPublisher.java @@ -22,13 +22,12 @@ import io.netty.handler.codec.http.HttpHeaders; import io.netty.handler.codec.http.HttpRequest; import io.netty.handler.codec.http.HttpResponse; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.List; import java.util.function.BiFunction; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class AccessLogPublisher { private static final char DELIM = '\t'; diff --git a/zuul-core/src/main/java/com/netflix/netty/common/metrics/EventLoopGroupMetrics.java b/zuul-core/src/main/java/com/netflix/netty/common/metrics/EventLoopGroupMetrics.java index b62bd2d805..3b74e4a8f8 100644 --- a/zuul-core/src/main/java/com/netflix/netty/common/metrics/EventLoopGroupMetrics.java +++ b/zuul-core/src/main/java/com/netflix/netty/common/metrics/EventLoopGroupMetrics.java @@ -17,11 +17,10 @@ package com.netflix.netty.common.metrics; import com.netflix.spectator.api.Registry; - -import javax.inject.Inject; -import javax.inject.Singleton; import java.util.HashMap; import java.util.Map; +import javax.inject.Inject; +import javax.inject.Singleton; /** * User: michaels@netflix.com diff --git a/zuul-core/src/main/java/com/netflix/netty/common/metrics/EventLoopMetrics.java b/zuul-core/src/main/java/com/netflix/netty/common/metrics/EventLoopMetrics.java index 76527c0414..18ef95b56f 100644 --- a/zuul-core/src/main/java/com/netflix/netty/common/metrics/EventLoopMetrics.java +++ b/zuul-core/src/main/java/com/netflix/netty/common/metrics/EventLoopMetrics.java @@ -18,7 +18,6 @@ import com.netflix.spectator.api.Id; import com.netflix.spectator.api.Registry; - import java.util.concurrent.atomic.AtomicInteger; /** diff --git a/zuul-core/src/main/java/com/netflix/netty/common/metrics/HttpBodySizeRecordingChannelHandler.java b/zuul-core/src/main/java/com/netflix/netty/common/metrics/HttpBodySizeRecordingChannelHandler.java index a36a18dd77..ef827ef941 100644 --- a/zuul-core/src/main/java/com/netflix/netty/common/metrics/HttpBodySizeRecordingChannelHandler.java +++ b/zuul-core/src/main/java/com/netflix/netty/common/metrics/HttpBodySizeRecordingChannelHandler.java @@ -25,7 +25,6 @@ import io.netty.handler.codec.http.HttpContent; import io.netty.handler.codec.http.HttpRequest; import io.netty.util.AttributeKey; - import javax.inject.Provider; /** diff --git a/zuul-core/src/main/java/com/netflix/netty/common/metrics/HttpMetricsChannelHandler.java b/zuul-core/src/main/java/com/netflix/netty/common/metrics/HttpMetricsChannelHandler.java index e66f17db97..19025827f5 100644 --- a/zuul-core/src/main/java/com/netflix/netty/common/metrics/HttpMetricsChannelHandler.java +++ b/zuul-core/src/main/java/com/netflix/netty/common/metrics/HttpMetricsChannelHandler.java @@ -27,7 +27,6 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.util.AttributeKey; - import java.util.concurrent.atomic.AtomicInteger; /** diff --git a/zuul-core/src/main/java/com/netflix/netty/common/metrics/InstrumentedResourceLeakDetector.java b/zuul-core/src/main/java/com/netflix/netty/common/metrics/InstrumentedResourceLeakDetector.java index 906250080e..f87c1eac23 100644 --- a/zuul-core/src/main/java/com/netflix/netty/common/metrics/InstrumentedResourceLeakDetector.java +++ b/zuul-core/src/main/java/com/netflix/netty/common/metrics/InstrumentedResourceLeakDetector.java @@ -19,7 +19,6 @@ import com.google.common.annotations.VisibleForTesting; import com.netflix.zuul.netty.SpectatorUtils; import io.netty.util.ResourceLeakDetector; - import java.lang.reflect.Field; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; diff --git a/zuul-core/src/main/java/com/netflix/netty/common/proxyprotocol/StripUntrustedProxyHeadersHandler.java b/zuul-core/src/main/java/com/netflix/netty/common/proxyprotocol/StripUntrustedProxyHeadersHandler.java index 357be2c2a3..eb6c682e9e 100644 --- a/zuul-core/src/main/java/com/netflix/netty/common/proxyprotocol/StripUntrustedProxyHeadersHandler.java +++ b/zuul-core/src/main/java/com/netflix/netty/common/proxyprotocol/StripUntrustedProxyHeadersHandler.java @@ -30,7 +30,6 @@ import io.netty.handler.codec.http.HttpRequest; import io.netty.handler.ssl.ClientAuth; import io.netty.util.AsciiString; - import java.util.Collection; import java.util.List; diff --git a/zuul-core/src/main/java/com/netflix/netty/common/ssl/ServerSslConfig.java b/zuul-core/src/main/java/com/netflix/netty/common/ssl/ServerSslConfig.java index 89d8f2c8f3..3e9d9cb350 100644 --- a/zuul-core/src/main/java/com/netflix/netty/common/ssl/ServerSslConfig.java +++ b/zuul-core/src/main/java/com/netflix/netty/common/ssl/ServerSslConfig.java @@ -18,13 +18,12 @@ import com.netflix.config.DynamicLongProperty; import io.netty.handler.ssl.ClientAuth; - -import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLSocketFactory; import java.io.File; import java.security.NoSuchAlgorithmException; import java.util.Arrays; import java.util.List; +import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLSocketFactory; /** * User: michaels@netflix.com diff --git a/zuul-core/src/main/java/com/netflix/netty/common/ssl/SslHandshakeInfo.java b/zuul-core/src/main/java/com/netflix/netty/common/ssl/SslHandshakeInfo.java index 139ca47d29..16cfd2342e 100644 --- a/zuul-core/src/main/java/com/netflix/netty/common/ssl/SslHandshakeInfo.java +++ b/zuul-core/src/main/java/com/netflix/netty/common/ssl/SslHandshakeInfo.java @@ -17,7 +17,6 @@ package com.netflix.netty.common.ssl; import io.netty.handler.ssl.ClientAuth; - import java.security.cert.Certificate; import java.security.cert.X509Certificate; diff --git a/zuul-core/src/main/java/com/netflix/netty/common/status/ServerStatusManager.java b/zuul-core/src/main/java/com/netflix/netty/common/status/ServerStatusManager.java index af34b863f9..7e79d8fa7f 100644 --- a/zuul-core/src/main/java/com/netflix/netty/common/status/ServerStatusManager.java +++ b/zuul-core/src/main/java/com/netflix/netty/common/status/ServerStatusManager.java @@ -18,7 +18,6 @@ import com.netflix.appinfo.ApplicationInfoManager; import com.netflix.appinfo.InstanceInfo; - import javax.inject.Inject; import javax.inject.Singleton; diff --git a/zuul-core/src/main/java/com/netflix/netty/common/throttle/MaxInboundConnectionsHandler.java b/zuul-core/src/main/java/com/netflix/netty/common/throttle/MaxInboundConnectionsHandler.java index 7dfce8b858..2f64e93b01 100644 --- a/zuul-core/src/main/java/com/netflix/netty/common/throttle/MaxInboundConnectionsHandler.java +++ b/zuul-core/src/main/java/com/netflix/netty/common/throttle/MaxInboundConnectionsHandler.java @@ -26,11 +26,10 @@ import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.util.AttributeKey; import io.netty.util.ReferenceCountUtil; +import java.util.concurrent.atomic.AtomicInteger; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.concurrent.atomic.AtomicInteger; - /** * Closes any incoming new connections if current count is above a configured threshold. * diff --git a/zuul-core/src/main/java/com/netflix/zuul/Attrs.java b/zuul-core/src/main/java/com/netflix/zuul/Attrs.java index 2eb30ec922..ab66ea89f9 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/Attrs.java +++ b/zuul-core/src/main/java/com/netflix/zuul/Attrs.java @@ -17,8 +17,6 @@ package com.netflix.zuul; import com.google.common.annotations.VisibleForTesting; - -import javax.annotation.Nullable; import java.util.Collections; import java.util.IdentityHashMap; import java.util.LinkedHashSet; @@ -26,6 +24,7 @@ import java.util.Objects; import java.util.Set; import java.util.function.BiConsumer; +import javax.annotation.Nullable; /** * A heterogeneous map of attributes. diff --git a/zuul-core/src/main/java/com/netflix/zuul/BasicFilterUsageNotifier.java b/zuul-core/src/main/java/com/netflix/zuul/BasicFilterUsageNotifier.java index c0c6f3678e..8b4b01ac51 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/BasicFilterUsageNotifier.java +++ b/zuul-core/src/main/java/com/netflix/zuul/BasicFilterUsageNotifier.java @@ -18,7 +18,6 @@ import com.netflix.spectator.api.Registry; import com.netflix.zuul.filters.ZuulFilter; - import javax.inject.Inject; /** diff --git a/zuul-core/src/main/java/com/netflix/zuul/BasicRequestCompleteHandler.java b/zuul-core/src/main/java/com/netflix/zuul/BasicRequestCompleteHandler.java index b5dbad6076..4ad4e1d417 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/BasicRequestCompleteHandler.java +++ b/zuul-core/src/main/java/com/netflix/zuul/BasicRequestCompleteHandler.java @@ -20,7 +20,6 @@ import com.netflix.zuul.message.http.HttpRequestInfo; import com.netflix.zuul.message.http.HttpResponseMessage; import com.netflix.zuul.stats.RequestMetricsPublisher; - import javax.annotation.Nullable; import javax.inject.Inject; diff --git a/zuul-core/src/main/java/com/netflix/zuul/DynamicFilterLoader.java b/zuul-core/src/main/java/com/netflix/zuul/DynamicFilterLoader.java index 5f6765d438..59dd9ad1c6 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/DynamicFilterLoader.java +++ b/zuul-core/src/main/java/com/netflix/zuul/DynamicFilterLoader.java @@ -19,11 +19,6 @@ import com.netflix.zuul.filters.FilterRegistry; import com.netflix.zuul.filters.FilterType; import com.netflix.zuul.filters.ZuulFilter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.inject.Inject; -import javax.inject.Singleton; import java.io.File; import java.lang.reflect.Modifier; import java.util.ArrayList; @@ -33,6 +28,10 @@ import java.util.TreeSet; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import javax.inject.Inject; +import javax.inject.Singleton; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @Singleton public final class DynamicFilterLoader implements FilterLoader { diff --git a/zuul-core/src/main/java/com/netflix/zuul/Filter.java b/zuul-core/src/main/java/com/netflix/zuul/Filter.java index fa102cf9e4..6ba35eb49c 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/Filter.java +++ b/zuul-core/src/main/java/com/netflix/zuul/Filter.java @@ -19,7 +19,6 @@ import com.netflix.zuul.filters.FilterSyncType; import com.netflix.zuul.filters.FilterType; import com.netflix.zuul.filters.ZuulFilter; - import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/zuul-core/src/main/java/com/netflix/zuul/FilterFileManager.java b/zuul-core/src/main/java/com/netflix/zuul/FilterFileManager.java index 77b9d0babb..afd8838c23 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/FilterFileManager.java +++ b/zuul-core/src/main/java/com/netflix/zuul/FilterFileManager.java @@ -17,11 +17,6 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.netflix.config.DynamicIntProperty; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.inject.Inject; -import javax.inject.Singleton; import java.io.File; import java.io.FilenameFilter; import java.io.IOException; @@ -34,6 +29,10 @@ import java.util.concurrent.Executors; import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; +import javax.inject.Inject; +import javax.inject.Singleton; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This class manages the directory polling for changes and new Groovy filters. diff --git a/zuul-core/src/main/java/com/netflix/zuul/FilterLoader.java b/zuul-core/src/main/java/com/netflix/zuul/FilterLoader.java index f24b6c056d..e665bfd5de 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/FilterLoader.java +++ b/zuul-core/src/main/java/com/netflix/zuul/FilterLoader.java @@ -17,7 +17,6 @@ import com.netflix.zuul.filters.FilterType; import com.netflix.zuul.filters.ZuulFilter; - import java.io.File; import java.util.Comparator; import java.util.List; diff --git a/zuul-core/src/main/java/com/netflix/zuul/StaticFilterLoader.java b/zuul-core/src/main/java/com/netflix/zuul/StaticFilterLoader.java index 1ae1ad7167..a05b4f8769 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/StaticFilterLoader.java +++ b/zuul-core/src/main/java/com/netflix/zuul/StaticFilterLoader.java @@ -19,11 +19,6 @@ import com.google.errorprone.annotations.DoNotCall; import com.netflix.zuul.filters.FilterType; import com.netflix.zuul.filters.ZuulFilter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.annotation.Nullable; -import javax.inject.Inject; import java.io.BufferedReader; import java.io.File; import java.io.IOException; @@ -41,6 +36,10 @@ import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; +import javax.annotation.Nullable; +import javax.inject.Inject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * An immutable static collection of filters. diff --git a/zuul-core/src/main/java/com/netflix/zuul/context/CommonContextKeys.java b/zuul-core/src/main/java/com/netflix/zuul/context/CommonContextKeys.java index 64b0753ed9..5a497f6cc2 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/context/CommonContextKeys.java +++ b/zuul-core/src/main/java/com/netflix/zuul/context/CommonContextKeys.java @@ -25,10 +25,9 @@ import com.netflix.zuul.passport.CurrentPassport; import com.netflix.zuul.stats.status.StatusCategory; import io.netty.channel.Channel; - -import javax.inject.Provider; import java.net.InetAddress; import java.util.Map; +import javax.inject.Provider; /** * Common Context Keys diff --git a/zuul-core/src/main/java/com/netflix/zuul/context/Debug.java b/zuul-core/src/main/java/com/netflix/zuul/context/Debug.java index e8db93f3a5..dc9614f806 100755 --- a/zuul-core/src/main/java/com/netflix/zuul/context/Debug.java +++ b/zuul-core/src/main/java/com/netflix/zuul/context/Debug.java @@ -20,13 +20,12 @@ import com.netflix.zuul.message.http.HttpRequestInfo; import com.netflix.zuul.message.http.HttpResponseInfo; import io.netty.util.ReferenceCounted; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import rx.Observable; - import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import rx.Observable; /** * Simple wrapper class around the RequestContext for setting and managing Request level Debug data. diff --git a/zuul-core/src/main/java/com/netflix/zuul/context/SessionContext.java b/zuul-core/src/main/java/com/netflix/zuul/context/SessionContext.java index ecea037fc8..afca5fb6f9 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/context/SessionContext.java +++ b/zuul-core/src/main/java/com/netflix/zuul/context/SessionContext.java @@ -19,8 +19,6 @@ import com.netflix.config.DynamicPropertyFactory; import com.netflix.zuul.filters.FilterError; import com.netflix.zuul.message.http.HttpResponseMessage; - -import javax.annotation.Nullable; import java.net.URL; import java.util.ArrayList; import java.util.Collections; @@ -31,6 +29,7 @@ import java.util.Map; import java.util.Objects; import java.util.Set; +import javax.annotation.Nullable; /** * Represents the context between client and origin server for the duration of the dedicated connection/session @@ -502,4 +501,4 @@ public boolean isCancelled() { public void cancel() { this.cancelled = true; } -} \ No newline at end of file +} diff --git a/zuul-core/src/main/java/com/netflix/zuul/context/ZuulSessionContextDecorator.java b/zuul-core/src/main/java/com/netflix/zuul/context/ZuulSessionContextDecorator.java index a468472bde..aafd148446 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/context/ZuulSessionContextDecorator.java +++ b/zuul-core/src/main/java/com/netflix/zuul/context/ZuulSessionContextDecorator.java @@ -24,7 +24,6 @@ import com.netflix.zuul.passport.CurrentPassport; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; - import javax.inject.Inject; import javax.inject.Singleton; diff --git a/zuul-core/src/main/java/com/netflix/zuul/filters/FilterRegistry.java b/zuul-core/src/main/java/com/netflix/zuul/filters/FilterRegistry.java index dcec5a1b76..42e706670b 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/filters/FilterRegistry.java +++ b/zuul-core/src/main/java/com/netflix/zuul/filters/FilterRegistry.java @@ -15,8 +15,8 @@ */ package com.netflix.zuul.filters; -import javax.annotation.Nullable; import java.util.Collection; +import javax.annotation.Nullable; public interface FilterRegistry { @Nullable diff --git a/zuul-core/src/main/java/com/netflix/zuul/filters/MutableFilterRegistry.java b/zuul-core/src/main/java/com/netflix/zuul/filters/MutableFilterRegistry.java index c855a71e26..f76188967e 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/filters/MutableFilterRegistry.java +++ b/zuul-core/src/main/java/com/netflix/zuul/filters/MutableFilterRegistry.java @@ -15,13 +15,13 @@ */ package com.netflix.zuul.filters; -import javax.annotation.Nullable; -import javax.inject.Singleton; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; +import javax.annotation.Nullable; +import javax.inject.Singleton; @Singleton public final class MutableFilterRegistry implements FilterRegistry { diff --git a/zuul-core/src/main/java/com/netflix/zuul/filters/endpoint/ProxyEndpoint.java b/zuul-core/src/main/java/com/netflix/zuul/filters/endpoint/ProxyEndpoint.java index c8a792e8f0..790a0f6e88 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/filters/endpoint/ProxyEndpoint.java +++ b/zuul-core/src/main/java/com/netflix/zuul/filters/endpoint/ProxyEndpoint.java @@ -89,10 +89,6 @@ import io.netty.util.concurrent.Promise; import io.perfmark.PerfMark; import io.perfmark.TaskCloseable; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.annotation.Nullable; import java.io.UnsupportedEncodingException; import java.net.InetAddress; import java.net.URLDecoder; @@ -104,6 +100,9 @@ import java.util.Set; import java.util.StringTokenizer; import java.util.concurrent.atomic.AtomicReference; +import javax.annotation.Nullable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Not thread safe! New instance of this class is created per HTTP/1.1 request proxied to the origin but NOT for each diff --git a/zuul-core/src/main/java/com/netflix/zuul/message/Headers.java b/zuul-core/src/main/java/com/netflix/zuul/message/Headers.java index f589178660..75b762b47c 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/message/Headers.java +++ b/zuul-core/src/main/java/com/netflix/zuul/message/Headers.java @@ -19,8 +19,6 @@ import com.netflix.spectator.api.Counter; import com.netflix.spectator.api.Spectator; import com.netflix.zuul.exception.ZuulException; - -import javax.annotation.Nullable; import java.util.AbstractMap.SimpleImmutableEntry; import java.util.ArrayList; import java.util.Collection; @@ -33,6 +31,7 @@ import java.util.Set; import java.util.function.BiConsumer; import java.util.function.Predicate; +import javax.annotation.Nullable; /** * An abstraction over a collection of http headers. Allows multiple headers with same name, and header names are diff --git a/zuul-core/src/main/java/com/netflix/zuul/message/ZuulMessage.java b/zuul-core/src/main/java/com/netflix/zuul/message/ZuulMessage.java index 017cbcfe83..f966ca8459 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/message/ZuulMessage.java +++ b/zuul-core/src/main/java/com/netflix/zuul/message/ZuulMessage.java @@ -20,7 +20,6 @@ import com.netflix.zuul.filters.ZuulFilter; import io.netty.handler.codec.http.HttpContent; import io.netty.handler.codec.http.LastHttpContent; - import javax.annotation.Nullable; /** diff --git a/zuul-core/src/main/java/com/netflix/zuul/message/ZuulMessageImpl.java b/zuul-core/src/main/java/com/netflix/zuul/message/ZuulMessageImpl.java index 818708649b..d72bfaf2e2 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/message/ZuulMessageImpl.java +++ b/zuul-core/src/main/java/com/netflix/zuul/message/ZuulMessageImpl.java @@ -28,7 +28,6 @@ import io.netty.handler.codec.http.DefaultLastHttpContent; import io.netty.handler.codec.http.HttpContent; import io.netty.handler.codec.http.LastHttpContent; - import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/zuul-core/src/main/java/com/netflix/zuul/message/http/Cookies.java b/zuul-core/src/main/java/com/netflix/zuul/message/http/Cookies.java index d1496c0a6f..8ac6b23509 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/message/http/Cookies.java +++ b/zuul-core/src/main/java/com/netflix/zuul/message/http/Cookies.java @@ -17,7 +17,6 @@ package com.netflix.zuul.message.http; import io.netty.handler.codec.http.cookie.Cookie; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/zuul-core/src/main/java/com/netflix/zuul/message/http/HttpHeaderNamesCache.java b/zuul-core/src/main/java/com/netflix/zuul/message/http/HttpHeaderNamesCache.java index 4b10b08087..ccbf2e6b25 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/message/http/HttpHeaderNamesCache.java +++ b/zuul-core/src/main/java/com/netflix/zuul/message/http/HttpHeaderNamesCache.java @@ -17,7 +17,6 @@ package com.netflix.zuul.message.http; import com.netflix.zuul.message.HeaderName; - import java.util.concurrent.ConcurrentHashMap; /** diff --git a/zuul-core/src/main/java/com/netflix/zuul/message/http/HttpQueryParams.java b/zuul-core/src/main/java/com/netflix/zuul/message/http/HttpQueryParams.java index c9291e61f2..dba2492d30 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/message/http/HttpQueryParams.java +++ b/zuul-core/src/main/java/com/netflix/zuul/message/http/HttpQueryParams.java @@ -20,7 +20,6 @@ import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.Iterables; import com.google.common.collect.ListMultimap; - import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.net.URLEncoder; diff --git a/zuul-core/src/main/java/com/netflix/zuul/message/http/HttpRequestInfo.java b/zuul-core/src/main/java/com/netflix/zuul/message/http/HttpRequestInfo.java index 12cfcde83d..d5d4aab37f 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/message/http/HttpRequestInfo.java +++ b/zuul-core/src/main/java/com/netflix/zuul/message/http/HttpRequestInfo.java @@ -18,7 +18,6 @@ import com.netflix.zuul.message.Headers; import com.netflix.zuul.message.ZuulMessage; - import java.util.Optional; /** diff --git a/zuul-core/src/main/java/com/netflix/zuul/message/http/HttpRequestMessageImpl.java b/zuul-core/src/main/java/com/netflix/zuul/message/http/HttpRequestMessageImpl.java index 75a2cce895..8ffd224846 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/message/http/HttpRequestMessageImpl.java +++ b/zuul-core/src/main/java/com/netflix/zuul/message/http/HttpRequestMessageImpl.java @@ -30,9 +30,6 @@ import io.netty.handler.codec.http.HttpContent; import io.netty.handler.codec.http.cookie.Cookie; import io.netty.handler.codec.http.cookie.ServerCookieDecoder; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.net.InetSocketAddress; import java.net.SocketAddress; import java.net.URI; @@ -43,6 +40,8 @@ import java.util.Optional; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * User: michaels diff --git a/zuul-core/src/main/java/com/netflix/zuul/message/util/HttpRequestBuilder.java b/zuul-core/src/main/java/com/netflix/zuul/message/util/HttpRequestBuilder.java index 254c32bf2d..493aecf07c 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/message/util/HttpRequestBuilder.java +++ b/zuul-core/src/main/java/com/netflix/zuul/message/util/HttpRequestBuilder.java @@ -23,7 +23,6 @@ import com.netflix.zuul.message.http.HttpRequestMessageImpl; import io.netty.handler.codec.http.HttpMethod; import io.netty.handler.codec.http.HttpVersion; - import java.util.Objects; /** diff --git a/zuul-core/src/main/java/com/netflix/zuul/monitoring/ConnCounter.java b/zuul-core/src/main/java/com/netflix/zuul/monitoring/ConnCounter.java index 6db7296d3a..1d7c45a96a 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/monitoring/ConnCounter.java +++ b/zuul-core/src/main/java/com/netflix/zuul/monitoring/ConnCounter.java @@ -23,12 +23,11 @@ import com.netflix.zuul.netty.server.Server; import io.netty.channel.Channel; import io.netty.util.AttributeKey; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.util.HashMap; import java.util.Map; import java.util.Objects; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A counter for connection stats. Not thread-safe. diff --git a/zuul-core/src/main/java/com/netflix/zuul/monitoring/ConnTimer.java b/zuul-core/src/main/java/com/netflix/zuul/monitoring/ConnTimer.java index 9e2db678e7..66ef5343a4 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/monitoring/ConnTimer.java +++ b/zuul-core/src/main/java/com/netflix/zuul/monitoring/ConnTimer.java @@ -24,14 +24,13 @@ import com.netflix.zuul.netty.server.Server; import io.netty.channel.Channel; import io.netty.util.AttributeKey; - -import javax.annotation.Nullable; import java.time.Duration; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; import java.util.Objects; import java.util.concurrent.TimeUnit; +import javax.annotation.Nullable; /** * A timer for connection stats. Not thread-safe. diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/NettyRequestAttemptFactory.java b/zuul-core/src/main/java/com/netflix/zuul/netty/NettyRequestAttemptFactory.java index ac6c1c08bf..5e406ccee0 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/NettyRequestAttemptFactory.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/NettyRequestAttemptFactory.java @@ -25,11 +25,10 @@ import com.netflix.zuul.origins.OriginConcurrencyExceededException; import io.netty.channel.unix.Errors; import io.netty.handler.timeout.ReadTimeoutException; +import java.nio.channels.ClosedChannelException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.nio.channels.ClosedChannelException; - public class NettyRequestAttemptFactory { private static final Logger LOG = LoggerFactory.getLogger(NettyRequestAttemptFactory.class); diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/BasicRequestStat.java b/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/BasicRequestStat.java index 2bf347f970..ad9b8aaf32 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/BasicRequestStat.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/BasicRequestStat.java @@ -20,7 +20,6 @@ import com.netflix.zuul.discovery.DiscoveryResult; import com.netflix.zuul.exception.ErrorType; import com.netflix.zuul.exception.OutboundErrorType; - import java.util.concurrent.TimeUnit; /** diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/ClientChannelManager.java b/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/ClientChannelManager.java index 25e9091725..b109776d16 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/ClientChannelManager.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/ClientChannelManager.java @@ -20,7 +20,6 @@ import com.netflix.zuul.passport.CurrentPassport; import io.netty.channel.EventLoop; import io.netty.util.concurrent.Promise; - import java.net.InetAddress; import java.util.concurrent.atomic.AtomicReference; diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/ClientTimeoutHandler.java b/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/ClientTimeoutHandler.java index cef832a0b4..725587efc6 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/ClientTimeoutHandler.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/ClientTimeoutHandler.java @@ -22,11 +22,10 @@ import io.netty.channel.ChannelPromise; import io.netty.handler.codec.http.LastHttpContent; import io.netty.util.AttributeKey; +import java.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.time.Duration; - /** * Client Timeout Handler * diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/ConnectionPoolConfigImpl.java b/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/ConnectionPoolConfigImpl.java index c3cce62180..359b2176bc 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/ConnectionPoolConfigImpl.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/ConnectionPoolConfigImpl.java @@ -22,7 +22,6 @@ import com.netflix.config.CachedDynamicBooleanProperty; import com.netflix.config.CachedDynamicIntProperty; import com.netflix.zuul.origins.OriginName; - import java.util.Objects; /** diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/ConnectionPoolHandler.java b/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/ConnectionPoolHandler.java index 0f75857b78..f344f8cb13 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/ConnectionPoolHandler.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/ConnectionPoolHandler.java @@ -16,6 +16,9 @@ package com.netflix.zuul.netty.connectionpool; +import static com.netflix.netty.common.HttpLifecycleChannelHandler.CompleteEvent; +import static com.netflix.netty.common.HttpLifecycleChannelHandler.CompleteReason; + import com.netflix.spectator.api.Counter; import com.netflix.zuul.netty.ChannelUtils; import com.netflix.zuul.netty.SpectatorUtils; @@ -29,9 +32,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static com.netflix.netty.common.HttpLifecycleChannelHandler.CompleteEvent; -import static com.netflix.netty.common.HttpLifecycleChannelHandler.CompleteReason; - /** * User: michaels@netflix.com * Date: 6/23/16 diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/DefaultClientChannelManager.java b/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/DefaultClientChannelManager.java index a14026060c..2c518b598f 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/DefaultClientChannelManager.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/DefaultClientChannelManager.java @@ -41,10 +41,6 @@ import io.netty.channel.EventLoop; import io.netty.handler.timeout.IdleStateHandler; import io.netty.util.concurrent.Promise; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.annotation.Nullable; import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.SocketAddress; @@ -54,6 +50,9 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; +import javax.annotation.Nullable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * User: michaels@netflix.com diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/IConnectionPool.java b/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/IConnectionPool.java index c63ffa7a3c..53326af7dd 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/IConnectionPool.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/IConnectionPool.java @@ -19,7 +19,6 @@ import com.netflix.zuul.passport.CurrentPassport; import io.netty.channel.EventLoop; import io.netty.util.concurrent.Promise; - import java.net.InetAddress; import java.util.concurrent.atomic.AtomicReference; diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/NettyClientConnectionFactory.java b/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/NettyClientConnectionFactory.java index 8d63a54097..1243272b61 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/NettyClientConnectionFactory.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/NettyClientConnectionFactory.java @@ -25,7 +25,6 @@ import io.netty.channel.ChannelOption; import io.netty.channel.EventLoop; import io.netty.channel.WriteBufferWaterMark; - import java.net.InetSocketAddress; import java.net.SocketAddress; import java.util.Objects; diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/PerServerConnectionPool.java b/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/PerServerConnectionPool.java index 5820e6414e..2ec9f198f7 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/PerServerConnectionPool.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/PerServerConnectionPool.java @@ -28,10 +28,6 @@ import io.netty.handler.codec.DecoderException; import io.netty.util.AttributeKey; import io.netty.util.concurrent.Promise; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.annotation.Nullable; import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.SocketAddress; @@ -41,6 +37,9 @@ import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; +import javax.annotation.Nullable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * User: michaels@netflix.com diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/PooledConnection.java b/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/PooledConnection.java index 06a696b74c..f8f40de822 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/PooledConnection.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/connectionpool/PooledConnection.java @@ -24,11 +24,10 @@ import io.netty.channel.ChannelPipeline; import io.netty.handler.timeout.ReadTimeoutHandler; import io.netty.util.AttributeKey; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.time.Duration; import java.util.concurrent.TimeUnit; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Created by saroskar on 3/15/16. diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/filter/BaseZuulFilterRunner.java b/zuul-core/src/main/java/com/netflix/zuul/netty/filter/BaseZuulFilterRunner.java index 42bb3e1d30..b5bee26d0a 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/filter/BaseZuulFilterRunner.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/filter/BaseZuulFilterRunner.java @@ -42,6 +42,11 @@ import io.perfmark.Link; import io.perfmark.PerfMark; import io.perfmark.TaskCloseable; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicReference; +import javax.annotation.concurrent.ThreadSafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import rx.Observer; @@ -49,12 +54,6 @@ import rx.functions.Action1; import rx.schedulers.Schedulers; -import javax.annotation.concurrent.ThreadSafe; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicReference; - /** * Subclasses of this class are supposed to be thread safe and hence should not have any non final member variables * Created by saroskar on 5/18/17. diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/filter/ZuulEndPointRunner.java b/zuul-core/src/main/java/com/netflix/zuul/netty/filter/ZuulEndPointRunner.java index 6d43104bcb..7a9116c646 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/filter/ZuulEndPointRunner.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/filter/ZuulEndPointRunner.java @@ -40,11 +40,10 @@ import io.netty.util.ReferenceCountUtil; import io.perfmark.PerfMark; import io.perfmark.TaskCloseable; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import javax.annotation.Nullable; import javax.annotation.concurrent.ThreadSafe; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This class is supposed to be thread safe and hence should not have any non final member variables diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/filter/ZuulFilterChainHandler.java b/zuul-core/src/main/java/com/netflix/zuul/netty/filter/ZuulFilterChainHandler.java index 7d6aecb8c1..7a6092c254 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/filter/ZuulFilterChainHandler.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/filter/ZuulFilterChainHandler.java @@ -42,12 +42,11 @@ import io.netty.handler.codec.http.HttpContent; import io.netty.handler.timeout.IdleStateEvent; import io.netty.util.ReferenceCountUtil; +import java.nio.channels.ClosedChannelException; +import javax.net.ssl.SSLException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.net.ssl.SSLException; -import java.nio.channels.ClosedChannelException; - /** * Created by saroskar on 5/18/17. */ diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/filter/ZuulFilterChainRunner.java b/zuul-core/src/main/java/com/netflix/zuul/netty/filter/ZuulFilterChainRunner.java index e331a5692c..43f69f6d42 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/filter/ZuulFilterChainRunner.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/filter/ZuulFilterChainRunner.java @@ -30,9 +30,8 @@ import io.netty.util.ReferenceCountUtil; import io.perfmark.PerfMark; import io.perfmark.TaskCloseable; - -import javax.annotation.concurrent.ThreadSafe; import java.util.concurrent.atomic.AtomicInteger; +import javax.annotation.concurrent.ThreadSafe; /** * This class is supposed to be thread safe and hence should not have any non final member variables diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/insights/PassportStateOriginHandler.java b/zuul-core/src/main/java/com/netflix/zuul/netty/insights/PassportStateOriginHandler.java index 6123657160..bc27cb54d1 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/insights/PassportStateOriginHandler.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/insights/PassportStateOriginHandler.java @@ -22,7 +22,6 @@ import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.channel.ChannelOutboundHandlerAdapter; import io.netty.channel.ChannelPromise; - import java.net.SocketAddress; /** diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/ratelimiting/NullChannelHandlerProvider.java b/zuul-core/src/main/java/com/netflix/zuul/netty/ratelimiting/NullChannelHandlerProvider.java index d753316a1d..046f626c14 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/ratelimiting/NullChannelHandlerProvider.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/ratelimiting/NullChannelHandlerProvider.java @@ -17,7 +17,6 @@ package com.netflix.zuul.netty.ratelimiting; import io.netty.channel.ChannelHandler; - import javax.inject.Provider; import javax.inject.Singleton; diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/server/BaseServerStartup.java b/zuul-core/src/main/java/com/netflix/zuul/netty/server/BaseServerStartup.java index 8a8a973d2a..9d954f76d1 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/server/BaseServerStartup.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/server/BaseServerStartup.java @@ -43,14 +43,13 @@ import io.netty.handler.ssl.SslContext; import io.netty.util.AsyncMapping; import io.netty.util.concurrent.GlobalEventExecutor; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.annotation.Nullable; -import javax.inject.Inject; import java.net.InetSocketAddress; import java.net.SocketAddress; import java.util.Map; +import javax.annotation.Nullable; +import javax.inject.Inject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public abstract class BaseServerStartup { protected static final Logger LOG = LoggerFactory.getLogger(BaseServerStartup.class); diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/server/BaseZuulChannelInitializer.java b/zuul-core/src/main/java/com/netflix/zuul/netty/server/BaseZuulChannelInitializer.java index ada71b1bd7..af645f7f26 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/server/BaseZuulChannelInitializer.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/server/BaseZuulChannelInitializer.java @@ -67,7 +67,6 @@ import io.netty.handler.logging.LoggingHandler; import io.netty.handler.timeout.IdleStateHandler; import io.netty.util.AttributeKey; - import java.util.SortedSet; import java.util.concurrent.TimeUnit; diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/server/ClientConnectionsShutdown.java b/zuul-core/src/main/java/com/netflix/zuul/netty/server/ClientConnectionsShutdown.java index f3b0896a5e..241ed598cb 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/server/ClientConnectionsShutdown.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/server/ClientConnectionsShutdown.java @@ -30,11 +30,10 @@ import io.netty.util.concurrent.EventExecutor; import io.netty.util.concurrent.Promise; import io.netty.util.concurrent.ScheduledFuture; +import java.util.concurrent.TimeUnit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.concurrent.TimeUnit; - /** * TODO: Change this class to be an instance per-port. * So that then the configuration can be different per-port, which is need for the combined FTL/Cloud clusters. diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/server/ClientRequestReceiver.java b/zuul-core/src/main/java/com/netflix/zuul/netty/server/ClientRequestReceiver.java index 8de99b2ee8..d89b423c90 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/server/ClientRequestReceiver.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/server/ClientRequestReceiver.java @@ -16,6 +16,9 @@ package com.netflix.zuul.netty.server; +import static com.netflix.netty.common.HttpLifecycleChannelHandler.CompleteEvent; +import static com.netflix.netty.common.HttpLifecycleChannelHandler.CompleteReason; + import com.netflix.netty.common.SourceAddressChannelHandler; import com.netflix.netty.common.ssl.SslHandshakeInfo; import com.netflix.netty.common.throttle.RejectionUtils; @@ -63,10 +66,6 @@ import io.netty.util.ReferenceCountUtil; import io.perfmark.PerfMark; import io.perfmark.TaskCloseable; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.net.ssl.SSLException; import java.net.InetSocketAddress; import java.net.SocketAddress; import java.util.Iterator; @@ -74,9 +73,9 @@ import java.util.Map.Entry; import java.util.regex.Matcher; import java.util.regex.Pattern; - -import static com.netflix.netty.common.HttpLifecycleChannelHandler.CompleteEvent; -import static com.netflix.netty.common.HttpLifecycleChannelHandler.CompleteReason; +import javax.net.ssl.SSLException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Created by saroskar on 1/6/17. diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/server/ClientResponseWriter.java b/zuul-core/src/main/java/com/netflix/zuul/netty/server/ClientResponseWriter.java index 419ffad404..bc85f569a7 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/server/ClientResponseWriter.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/server/ClientResponseWriter.java @@ -16,6 +16,9 @@ package com.netflix.zuul.netty.server; +import static com.netflix.netty.common.HttpLifecycleChannelHandler.CompleteEvent; +import static com.netflix.netty.common.HttpLifecycleChannelHandler.StartEvent; + import com.google.common.annotations.VisibleForTesting; import com.netflix.netty.common.HttpLifecycleChannelHandler.CompleteReason; import com.netflix.spectator.api.Counter; @@ -54,9 +57,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static com.netflix.netty.common.HttpLifecycleChannelHandler.CompleteEvent; -import static com.netflix.netty.common.HttpLifecycleChannelHandler.StartEvent; - /** * Created by saroskar on 2/26/17. */ diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/server/DefaultEventLoopConfig.java b/zuul-core/src/main/java/com/netflix/zuul/netty/server/DefaultEventLoopConfig.java index 4c7ac835e5..ab091c6660 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/server/DefaultEventLoopConfig.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/server/DefaultEventLoopConfig.java @@ -16,7 +16,6 @@ package com.netflix.zuul.netty.server; import com.netflix.config.DynamicIntProperty; - import javax.inject.Singleton; /** diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/server/DirectMemoryMonitor.java b/zuul-core/src/main/java/com/netflix/zuul/netty/server/DirectMemoryMonitor.java index 8a108b68fd..a8ffaf228c 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/server/DirectMemoryMonitor.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/server/DirectMemoryMonitor.java @@ -21,14 +21,13 @@ import com.netflix.spectator.api.Registry; import com.netflix.spectator.api.patterns.PolledMeter; import io.netty.util.internal.PlatformDependent; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.inject.Inject; -import javax.inject.Singleton; import java.time.Duration; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; +import javax.inject.Inject; +import javax.inject.Singleton; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * User: michaels@netflix.com diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/server/Http1MutualSslChannelInitializer.java b/zuul-core/src/main/java/com/netflix/zuul/netty/server/Http1MutualSslChannelInitializer.java index 02bda83ddc..83b0813f11 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/server/Http1MutualSslChannelInitializer.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/server/Http1MutualSslChannelInitializer.java @@ -24,7 +24,6 @@ import io.netty.channel.group.ChannelGroup; import io.netty.handler.ssl.SslContext; import io.netty.handler.ssl.SslHandler; - import javax.net.ssl.SSLException; /** diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/server/NamedSocketAddress.java b/zuul-core/src/main/java/com/netflix/zuul/netty/server/NamedSocketAddress.java index 44d3851c12..7562c805aa 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/server/NamedSocketAddress.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/server/NamedSocketAddress.java @@ -16,9 +16,9 @@ package com.netflix.zuul.netty.server; -import javax.annotation.CheckReturnValue; import java.net.SocketAddress; import java.util.Objects; +import javax.annotation.CheckReturnValue; public final class NamedSocketAddress extends SocketAddress { diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/server/OriginResponseReceiver.java b/zuul-core/src/main/java/com/netflix/zuul/netty/server/OriginResponseReceiver.java index 349f54e148..ef4e4e9df0 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/server/OriginResponseReceiver.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/server/OriginResponseReceiver.java @@ -16,6 +16,9 @@ package com.netflix.zuul.netty.server; +import static com.netflix.netty.common.HttpLifecycleChannelHandler.CompleteEvent; +import static com.netflix.netty.common.HttpLifecycleChannelHandler.CompleteReason; + import com.netflix.zuul.exception.OutboundErrorType; import com.netflix.zuul.exception.OutboundException; import com.netflix.zuul.exception.ZuulException; @@ -42,14 +45,10 @@ import io.netty.util.ReferenceCountUtil; import io.perfmark.PerfMark; import io.perfmark.TaskCloseable; +import java.io.IOException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; - -import static com.netflix.netty.common.HttpLifecycleChannelHandler.CompleteEvent; -import static com.netflix.netty.common.HttpLifecycleChannelHandler.CompleteReason; - /** * Created by saroskar on 1/18/17. */ diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/server/Server.java b/zuul-core/src/main/java/com/netflix/zuul/netty/server/Server.java index e7d86692e5..939e0eb788 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/server/Server.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/server/Server.java @@ -64,9 +64,6 @@ import io.netty.util.concurrent.EventExecutor; import io.netty.util.concurrent.EventExecutorChooserFactory; import io.netty.util.concurrent.ThreadPerTaskExecutor; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.net.InetSocketAddress; import java.nio.channels.spi.SelectorProvider; import java.util.ArrayList; @@ -81,6 +78,8 @@ import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @@ -544,4 +543,4 @@ private static boolean kqueueIsAvailable() { } return available; } -} \ No newline at end of file +} diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/server/SocketAddressProperty.java b/zuul-core/src/main/java/com/netflix/zuul/netty/server/SocketAddressProperty.java index f559e6dcaf..fe4d147c3e 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/server/SocketAddressProperty.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/server/SocketAddressProperty.java @@ -19,14 +19,13 @@ import com.google.common.annotations.VisibleForTesting; import com.netflix.config.StringDerivedProperty; import io.netty.channel.unix.DomainSocketAddress; - -import javax.annotation.Nullable; import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.SocketAddress; import java.util.Locale; import java.util.concurrent.Callable; import java.util.function.Supplier; +import javax.annotation.Nullable; /** * This class expresses an address that Zuul can bind to. Similar to {@link diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/server/ZuulDependencyKeys.java b/zuul-core/src/main/java/com/netflix/zuul/netty/server/ZuulDependencyKeys.java index 9870054c11..aad7b22648 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/server/ZuulDependencyKeys.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/server/ZuulDependencyKeys.java @@ -30,7 +30,6 @@ import com.netflix.zuul.context.SessionContextDecorator; import com.netflix.zuul.netty.server.push.PushConnectionRegistry; import io.netty.channel.ChannelHandler; - import javax.inject.Provider; /** diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/server/http2/Http2Configuration.java b/zuul-core/src/main/java/com/netflix/zuul/netty/server/http2/Http2Configuration.java index 9fea16f76e..b47dc0d1f2 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/server/http2/Http2Configuration.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/server/http2/Http2Configuration.java @@ -21,7 +21,6 @@ import io.netty.handler.ssl.ApplicationProtocolNames; import io.netty.handler.ssl.SslContext; import io.netty.handler.ssl.SslContextBuilder; - import javax.net.ssl.SSLException; public class Http2Configuration { diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/server/http2/Http2ContentLengthEnforcingHandler.java b/zuul-core/src/main/java/com/netflix/zuul/netty/server/http2/Http2ContentLengthEnforcingHandler.java index ca428caeb4..bfceba0945 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/server/http2/Http2ContentLengthEnforcingHandler.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/server/http2/Http2ContentLengthEnforcingHandler.java @@ -27,7 +27,6 @@ import io.netty.handler.codec.http2.DefaultHttp2ResetFrame; import io.netty.handler.codec.http2.Http2Error; import io.netty.util.ReferenceCountUtil; - import java.util.List; /** diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/server/http2/Http2OrHttpHandler.java b/zuul-core/src/main/java/com/netflix/zuul/netty/server/http2/Http2OrHttpHandler.java index 80b9f98e13..5d8c906669 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/server/http2/Http2OrHttpHandler.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/server/http2/Http2OrHttpHandler.java @@ -34,7 +34,6 @@ import io.netty.handler.ssl.ApplicationProtocolNames; import io.netty.handler.ssl.ApplicationProtocolNegotiationHandler; import io.netty.util.AttributeKey; - import java.util.function.Consumer; /** diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/server/push/PushAuthHandler.java b/zuul-core/src/main/java/com/netflix/zuul/netty/server/push/PushAuthHandler.java index bf8f8bd526..6286b523a5 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/server/push/PushAuthHandler.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/server/push/PushAuthHandler.java @@ -33,11 +33,10 @@ import io.netty.handler.codec.http.HttpVersion; import io.netty.handler.codec.http.cookie.Cookie; import io.netty.handler.codec.http.cookie.ServerCookieDecoder; +import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.List; - /** * Author: Susheel Aroskar * Date: 5/11/18 diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/server/push/PushConnectionRegistry.java b/zuul-core/src/main/java/com/netflix/zuul/netty/server/push/PushConnectionRegistry.java index 6464698e61..da79a75d63 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/server/push/PushConnectionRegistry.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/server/push/PushConnectionRegistry.java @@ -15,15 +15,15 @@ */ package com.netflix.zuul.netty.server.push; -import javax.annotation.Nullable; -import javax.inject.Inject; -import javax.inject.Singleton; import java.security.SecureRandom; import java.util.ArrayList; import java.util.Base64; import java.util.List; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import javax.annotation.Nullable; +import javax.inject.Inject; +import javax.inject.Singleton; /** * Maintains client identity to web socket or SSE channel mapping. diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/server/push/PushMessageSender.java b/zuul-core/src/main/java/com/netflix/zuul/netty/server/push/PushMessageSender.java index 30f142f15d..bbd0b33e54 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/server/push/PushMessageSender.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/server/push/PushMessageSender.java @@ -30,11 +30,10 @@ import io.netty.handler.codec.http.HttpUtil; import io.netty.handler.codec.http.HttpVersion; import io.netty.util.ReferenceCountUtil; +import javax.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.inject.Inject; - /** * Serves "/push" URL that is used by the backend to POST push messages to a given Zuul instance. This URL handler * MUST BE accessible ONLY from RFC 1918 private internal network space (10.0.0.0 or 172.16.0.0) to guarantee that diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/server/push/PushRegistrationHandler.java b/zuul-core/src/main/java/com/netflix/zuul/netty/server/push/PushRegistrationHandler.java index f42ae1922d..0381500b8f 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/server/push/PushRegistrationHandler.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/server/push/PushRegistrationHandler.java @@ -22,15 +22,14 @@ import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.handler.codec.http.websocketx.PingWebSocketFrame; import io.netty.util.concurrent.ScheduledFuture; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Author: Susheel Aroskar diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/server/ssl/SslHandshakeInfoHandler.java b/zuul-core/src/main/java/com/netflix/zuul/netty/server/ssl/SslHandshakeInfoHandler.java index 483a95717c..79a9154434 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/server/ssl/SslHandshakeInfoHandler.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/server/ssl/SslHandshakeInfoHandler.java @@ -33,16 +33,15 @@ import io.netty.handler.ssl.SslHandler; import io.netty.handler.ssl.SslHandshakeCompletionEvent; import io.netty.util.AttributeKey; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.net.ssl.SSLException; -import javax.net.ssl.SSLSession; import java.nio.channels.ClosedChannelException; import java.security.cert.Certificate; import java.security.cert.X509Certificate; import java.util.regex.Matcher; import java.util.regex.Pattern; +import javax.net.ssl.SSLException; +import javax.net.ssl.SSLSession; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Stores info about the client and server's SSL certificates in the context, after a successful handshake. diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/ssl/BaseSslContextFactory.java b/zuul-core/src/main/java/com/netflix/zuul/netty/ssl/BaseSslContextFactory.java index 4277b88e80..661a9bcb9e 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/ssl/BaseSslContextFactory.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/ssl/BaseSslContextFactory.java @@ -31,9 +31,6 @@ import io.netty.handler.ssl.SslContextBuilder; import io.netty.handler.ssl.SslProvider; import io.netty.handler.ssl.SupportedCipherSuiteFilter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; @@ -49,6 +46,8 @@ import java.util.List; import java.util.Objects; import java.util.function.ToDoubleFunction; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * User: michaels@netflix.com diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/ssl/SslContextFactory.java b/zuul-core/src/main/java/com/netflix/zuul/netty/ssl/SslContextFactory.java index 8374c31874..957f4b9d29 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/ssl/SslContextFactory.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/ssl/SslContextFactory.java @@ -18,7 +18,6 @@ import io.netty.handler.ssl.SslContext; import io.netty.handler.ssl.SslContextBuilder; - import java.security.NoSuchAlgorithmException; import java.util.List; diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/timeouts/OriginTimeoutManager.java b/zuul-core/src/main/java/com/netflix/zuul/netty/timeouts/OriginTimeoutManager.java index 89f27a6339..aade924c2c 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/netty/timeouts/OriginTimeoutManager.java +++ b/zuul-core/src/main/java/com/netflix/zuul/netty/timeouts/OriginTimeoutManager.java @@ -24,11 +24,10 @@ import com.netflix.zuul.context.CommonContextKeys; import com.netflix.zuul.message.http.HttpRequestMessage; import com.netflix.zuul.origins.NettyOrigin; - -import javax.annotation.Nullable; import java.time.Duration; import java.util.Objects; import java.util.Optional; +import javax.annotation.Nullable; /** * Origin Timeout Manager diff --git a/zuul-core/src/main/java/com/netflix/zuul/niws/RequestAttempt.java b/zuul-core/src/main/java/com/netflix/zuul/niws/RequestAttempt.java index 82e45dea65..5590543ae3 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/niws/RequestAttempt.java +++ b/zuul-core/src/main/java/com/netflix/zuul/niws/RequestAttempt.java @@ -28,9 +28,8 @@ import com.netflix.zuul.exception.OutboundException; import com.netflix.zuul.netty.connectionpool.OriginConnectException; import io.netty.handler.timeout.ReadTimeoutException; - -import javax.net.ssl.SSLHandshakeException; import java.net.InetAddress; +import javax.net.ssl.SSLHandshakeException; /** * User: michaels@netflix.com diff --git a/zuul-core/src/main/java/com/netflix/zuul/niws/RequestAttempts.java b/zuul-core/src/main/java/com/netflix/zuul/niws/RequestAttempts.java index 6270e07f36..4c96538e7e 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/niws/RequestAttempts.java +++ b/zuul-core/src/main/java/com/netflix/zuul/niws/RequestAttempts.java @@ -21,12 +21,11 @@ import com.fasterxml.jackson.databind.node.ArrayNode; import com.netflix.zuul.context.CommonContextKeys; import com.netflix.zuul.context.SessionContext; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.annotation.Nullable; import java.io.IOException; import java.util.ArrayList; +import javax.annotation.Nullable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * User: michaels@netflix.com diff --git a/zuul-core/src/main/java/com/netflix/zuul/origins/BasicNettyOrigin.java b/zuul-core/src/main/java/com/netflix/zuul/origins/BasicNettyOrigin.java index 1757c2b026..0325943e5d 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/origins/BasicNettyOrigin.java +++ b/zuul-core/src/main/java/com/netflix/zuul/origins/BasicNettyOrigin.java @@ -41,7 +41,6 @@ import com.netflix.zuul.stats.status.ZuulStatusCategory; import io.netty.channel.EventLoop; import io.netty.util.concurrent.Promise; - import java.net.InetAddress; import java.util.Objects; import java.util.Optional; diff --git a/zuul-core/src/main/java/com/netflix/zuul/origins/BasicNettyOriginManager.java b/zuul-core/src/main/java/com/netflix/zuul/origins/BasicNettyOriginManager.java index e452472371..bfb506b5b0 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/origins/BasicNettyOriginManager.java +++ b/zuul-core/src/main/java/com/netflix/zuul/origins/BasicNettyOriginManager.java @@ -18,10 +18,9 @@ import com.netflix.spectator.api.Registry; import com.netflix.zuul.context.SessionContext; - +import java.util.concurrent.ConcurrentHashMap; import javax.inject.Inject; import javax.inject.Singleton; -import java.util.concurrent.ConcurrentHashMap; /** * Basic Netty Origin Manager that most apps can use. This can also serve as a useful template for creating more diff --git a/zuul-core/src/main/java/com/netflix/zuul/origins/NettyOrigin.java b/zuul-core/src/main/java/com/netflix/zuul/origins/NettyOrigin.java index fca96b6fa5..f3ec67dfe6 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/origins/NettyOrigin.java +++ b/zuul-core/src/main/java/com/netflix/zuul/origins/NettyOrigin.java @@ -27,7 +27,6 @@ import com.netflix.zuul.passport.CurrentPassport; import io.netty.channel.EventLoop; import io.netty.util.concurrent.Promise; - import java.net.InetAddress; import java.util.concurrent.atomic.AtomicReference; diff --git a/zuul-core/src/main/java/com/netflix/zuul/origins/OriginName.java b/zuul-core/src/main/java/com/netflix/zuul/origins/OriginName.java index 8301a24464..4f365e98ff 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/origins/OriginName.java +++ b/zuul-core/src/main/java/com/netflix/zuul/origins/OriginName.java @@ -17,7 +17,6 @@ package com.netflix.zuul.origins; import com.netflix.zuul.util.VipUtils; - import java.util.Locale; import java.util.Objects; diff --git a/zuul-core/src/main/java/com/netflix/zuul/origins/OriginThrottledException.java b/zuul-core/src/main/java/com/netflix/zuul/origins/OriginThrottledException.java index 901db64aac..33590c6c0a 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/origins/OriginThrottledException.java +++ b/zuul-core/src/main/java/com/netflix/zuul/origins/OriginThrottledException.java @@ -18,7 +18,6 @@ import com.netflix.zuul.exception.ZuulException; import com.netflix.zuul.stats.status.StatusCategory; - import java.util.Objects; public abstract class OriginThrottledException extends ZuulException { diff --git a/zuul-core/src/main/java/com/netflix/zuul/passport/CurrentPassport.java b/zuul-core/src/main/java/com/netflix/zuul/passport/CurrentPassport.java index 898111ce12..d7d02cbc7c 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/passport/CurrentPassport.java +++ b/zuul-core/src/main/java/com/netflix/zuul/passport/CurrentPassport.java @@ -26,9 +26,6 @@ import com.netflix.zuul.context.SessionContext; import io.netty.channel.Channel; import io.netty.util.AttributeKey; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.util.ArrayList; import java.util.Arrays; import java.util.ConcurrentModificationException; @@ -40,6 +37,8 @@ import java.util.concurrent.locks.ReentrantLock; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class CurrentPassport { private static final Logger logger = LoggerFactory.getLogger(CurrentPassport.class); diff --git a/zuul-core/src/main/java/com/netflix/zuul/plugins/Tracer.java b/zuul-core/src/main/java/com/netflix/zuul/plugins/Tracer.java index d744ab5a7b..ca9d90790d 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/plugins/Tracer.java +++ b/zuul-core/src/main/java/com/netflix/zuul/plugins/Tracer.java @@ -17,7 +17,6 @@ import com.netflix.spectator.api.Spectator; import com.netflix.zuul.monitoring.TracerFactory; - import java.net.InetAddress; import java.net.UnknownHostException; import java.util.concurrent.TimeUnit; diff --git a/zuul-core/src/main/java/com/netflix/zuul/stats/ErrorStatsData.java b/zuul-core/src/main/java/com/netflix/zuul/stats/ErrorStatsData.java index c736e446b5..9a9e177aa3 100755 --- a/zuul-core/src/main/java/com/netflix/zuul/stats/ErrorStatsData.java +++ b/zuul-core/src/main/java/com/netflix/zuul/stats/ErrorStatsData.java @@ -19,7 +19,6 @@ import com.netflix.spectator.api.Spectator; import com.netflix.spectator.api.patterns.PolledMeter; import com.netflix.zuul.stats.monitoring.NamedCount; - import java.util.concurrent.atomic.AtomicLong; /** diff --git a/zuul-core/src/main/java/com/netflix/zuul/stats/ErrorStatsManager.java b/zuul-core/src/main/java/com/netflix/zuul/stats/ErrorStatsManager.java index cefa6aa829..2322022ea6 100755 --- a/zuul-core/src/main/java/com/netflix/zuul/stats/ErrorStatsManager.java +++ b/zuul-core/src/main/java/com/netflix/zuul/stats/ErrorStatsManager.java @@ -16,7 +16,6 @@ package com.netflix.zuul.stats; import com.netflix.zuul.stats.monitoring.MonitorRegistry; - import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/zuul-core/src/main/java/com/netflix/zuul/stats/NamedCountingMonitor.java b/zuul-core/src/main/java/com/netflix/zuul/stats/NamedCountingMonitor.java index a49ea7637a..06ada29761 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/stats/NamedCountingMonitor.java +++ b/zuul-core/src/main/java/com/netflix/zuul/stats/NamedCountingMonitor.java @@ -20,7 +20,6 @@ import com.netflix.spectator.api.patterns.PolledMeter; import com.netflix.zuul.stats.monitoring.MonitorRegistry; import com.netflix.zuul.stats.monitoring.NamedCount; - import java.util.concurrent.atomic.AtomicLong; /** diff --git a/zuul-core/src/main/java/com/netflix/zuul/stats/RouteStatusCodeMonitor.java b/zuul-core/src/main/java/com/netflix/zuul/stats/RouteStatusCodeMonitor.java index 0fa462f24f..b068178d7e 100755 --- a/zuul-core/src/main/java/com/netflix/zuul/stats/RouteStatusCodeMonitor.java +++ b/zuul-core/src/main/java/com/netflix/zuul/stats/RouteStatusCodeMonitor.java @@ -20,10 +20,9 @@ import com.netflix.spectator.api.Spectator; import com.netflix.spectator.api.patterns.PolledMeter; import com.netflix.zuul.stats.monitoring.NamedCount; - -import javax.annotation.Nullable; import java.util.Objects; import java.util.concurrent.atomic.AtomicLong; +import javax.annotation.Nullable; /** * counter for per route/status code counting diff --git a/zuul-core/src/main/java/com/netflix/zuul/stats/StatsManager.java b/zuul-core/src/main/java/com/netflix/zuul/stats/StatsManager.java index 228fb733c4..e28114d9a8 100755 --- a/zuul-core/src/main/java/com/netflix/zuul/stats/StatsManager.java +++ b/zuul-core/src/main/java/com/netflix/zuul/stats/StatsManager.java @@ -18,14 +18,13 @@ import com.google.common.annotations.VisibleForTesting; import com.netflix.zuul.message.http.HttpRequestInfo; import com.netflix.zuul.stats.monitoring.MonitorRegistry; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * High level statistics counter manager to count stats on various aspects of requests diff --git a/zuul-core/src/main/java/com/netflix/zuul/stats/status/StatusCategoryUtils.java b/zuul-core/src/main/java/com/netflix/zuul/stats/status/StatusCategoryUtils.java index f8c261eefe..445642c3cf 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/stats/status/StatusCategoryUtils.java +++ b/zuul-core/src/main/java/com/netflix/zuul/stats/status/StatusCategoryUtils.java @@ -20,7 +20,6 @@ import com.netflix.zuul.context.SessionContext; import com.netflix.zuul.message.ZuulMessage; import com.netflix.zuul.message.http.HttpResponseMessage; - import javax.annotation.Nullable; /** diff --git a/zuul-core/src/main/java/com/netflix/zuul/util/Gzipper.java b/zuul-core/src/main/java/com/netflix/zuul/util/Gzipper.java index 6268001b00..c7fee8519f 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/util/Gzipper.java +++ b/zuul-core/src/main/java/com/netflix/zuul/util/Gzipper.java @@ -20,7 +20,6 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.handler.codec.http.HttpContent; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.zip.GZIPOutputStream; diff --git a/zuul-core/src/main/java/com/netflix/zuul/util/HttpUtils.java b/zuul-core/src/main/java/com/netflix/zuul/util/HttpUtils.java index c153088a3a..50a26d55ca 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/util/HttpUtils.java +++ b/zuul-core/src/main/java/com/netflix/zuul/util/HttpUtils.java @@ -25,11 +25,10 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.http.HttpHeaderValues; import io.netty.handler.codec.http2.Http2StreamChannel; +import javax.annotation.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.annotation.Nullable; - /** * User: Mike Smith * Date: 4/28/15 diff --git a/zuul-core/src/main/java/com/netflix/zuul/util/JsonUtility.java b/zuul-core/src/main/java/com/netflix/zuul/util/JsonUtility.java index 18503efd34..6e390183c9 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/util/JsonUtility.java +++ b/zuul-core/src/main/java/com/netflix/zuul/util/JsonUtility.java @@ -15,12 +15,11 @@ */ package com.netflix.zuul.util; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.util.Arrays; import java.util.Collection; import java.util.Map; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Utility for generating JSON from Maps/Lists diff --git a/zuul-core/src/main/java/com/netflix/zuul/util/ProxyUtils.java b/zuul-core/src/main/java/com/netflix/zuul/util/ProxyUtils.java index 693da8958c..4e7b422984 100644 --- a/zuul-core/src/main/java/com/netflix/zuul/util/ProxyUtils.java +++ b/zuul-core/src/main/java/com/netflix/zuul/util/ProxyUtils.java @@ -21,7 +21,6 @@ import com.netflix.zuul.message.Headers; import com.netflix.zuul.message.http.HttpHeaderNames; import com.netflix.zuul.message.http.HttpRequestMessage; - import java.util.HashSet; import java.util.Set; diff --git a/zuul-core/src/test/java/com/netflix/netty/common/CloseOnIdleStateHandlerTest.java b/zuul-core/src/test/java/com/netflix/netty/common/CloseOnIdleStateHandlerTest.java index cc02135a1b..f4f1a6d7a8 100644 --- a/zuul-core/src/test/java/com/netflix/netty/common/CloseOnIdleStateHandlerTest.java +++ b/zuul-core/src/test/java/com/netflix/netty/common/CloseOnIdleStateHandlerTest.java @@ -16,6 +16,8 @@ package com.netflix.netty.common; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.netflix.spectator.api.Counter; import com.netflix.spectator.api.DefaultRegistry; import com.netflix.spectator.api.Id; @@ -26,8 +28,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - class CloseOnIdleStateHandlerTest { private Registry registry = new DefaultRegistry(); diff --git a/zuul-core/src/test/java/com/netflix/netty/common/SourceAddressChannelHandlerTest.java b/zuul-core/src/test/java/com/netflix/netty/common/SourceAddressChannelHandlerTest.java index 53db8950d5..8c073f6cf9 100644 --- a/zuul-core/src/test/java/com/netflix/netty/common/SourceAddressChannelHandlerTest.java +++ b/zuul-core/src/test/java/com/netflix/netty/common/SourceAddressChannelHandlerTest.java @@ -16,9 +16,9 @@ package com.netflix.netty.common; -import org.junit.AssumptionViolatedException; -import org.junit.jupiter.api.Assumptions; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.net.Inet4Address; import java.net.Inet6Address; @@ -29,10 +29,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.AssumptionViolatedException; +import org.junit.jupiter.api.Assumptions; +import org.junit.jupiter.api.Test; /** * Unit tests for {@link SourceAddressChannelHandler}. diff --git a/zuul-core/src/test/java/com/netflix/netty/common/metrics/InstrumentedResourceLeakDetectorTest.java b/zuul-core/src/test/java/com/netflix/netty/common/metrics/InstrumentedResourceLeakDetectorTest.java index 67c35a9f83..68b6e02458 100644 --- a/zuul-core/src/test/java/com/netflix/netty/common/metrics/InstrumentedResourceLeakDetectorTest.java +++ b/zuul-core/src/test/java/com/netflix/netty/common/metrics/InstrumentedResourceLeakDetectorTest.java @@ -16,14 +16,14 @@ package com.netflix.netty.common.metrics; +import static org.junit.jupiter.api.Assertions.assertEquals; + import io.netty.buffer.ByteBuf; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; -import static org.junit.jupiter.api.Assertions.assertEquals; - @ExtendWith(MockitoExtension.class) class InstrumentedResourceLeakDetectorTest { diff --git a/zuul-core/src/test/java/com/netflix/netty/common/proxyprotocol/ElbProxyProtocolChannelHandlerTest.java b/zuul-core/src/test/java/com/netflix/netty/common/proxyprotocol/ElbProxyProtocolChannelHandlerTest.java index 120b553acf..0c62772e41 100644 --- a/zuul-core/src/test/java/com/netflix/netty/common/proxyprotocol/ElbProxyProtocolChannelHandlerTest.java +++ b/zuul-core/src/test/java/com/netflix/netty/common/proxyprotocol/ElbProxyProtocolChannelHandlerTest.java @@ -16,6 +16,11 @@ package com.netflix.netty.common.proxyprotocol; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import com.google.common.net.InetAddresses; import com.netflix.netty.common.SourceAddressChannelHandler; import com.netflix.spectator.api.Counter; @@ -29,20 +34,14 @@ import io.netty.channel.embedded.EmbeddedChannel; import io.netty.handler.codec.haproxy.HAProxyMessage; import io.netty.handler.codec.haproxy.HAProxyProtocolVersion; +import java.net.InetSocketAddress; +import java.nio.charset.StandardCharsets; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; -import java.net.InetSocketAddress; -import java.nio.charset.StandardCharsets; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - @ExtendWith(MockitoExtension.class) class ElbProxyProtocolChannelHandlerTest { @@ -295,34 +294,34 @@ void negotiateProxy_ppv2_ipv4() { channel.pipeline() .addLast(ElbProxyProtocolChannelHandler.NAME, new ElbProxyProtocolChannelHandler(registry, true)); ByteBuf buf = Unpooled.wrappedBuffer(new byte[] { - 0x0D, - 0x0A, - 0x0D, - 0x0A, - 0x00, - 0x0D, - 0x0A, - 0x51, - 0x55, - 0x49, - 0x54, - 0x0A, - 0x21, - 0x11, - 0x00, - 0x0C, - (byte) 0xC0, - (byte) 0xA8, - 0x00, - 0x01, - 0x7C, - 0x7B, - 0x6F, - 0x6F, - 0x27, - 0x18, - 0x01, - (byte) 0xbb + 0x0D, + 0x0A, + 0x0D, + 0x0A, + 0x00, + 0x0D, + 0x0A, + 0x51, + 0x55, + 0x49, + 0x54, + 0x0A, + 0x21, + 0x11, + 0x00, + 0x0C, + (byte) 0xC0, + (byte) 0xA8, + 0x00, + 0x01, + 0x7C, + 0x7B, + 0x6F, + 0x6F, + 0x27, + 0x18, + 0x01, + (byte) 0xbb }); channel.writeInbound(buf); diff --git a/zuul-core/src/test/java/com/netflix/netty/common/proxyprotocol/HAProxyMessageChannelHandlerTest.java b/zuul-core/src/test/java/com/netflix/netty/common/proxyprotocol/HAProxyMessageChannelHandlerTest.java index 9b61a79770..3ab12b55a9 100644 --- a/zuul-core/src/test/java/com/netflix/netty/common/proxyprotocol/HAProxyMessageChannelHandlerTest.java +++ b/zuul-core/src/test/java/com/netflix/netty/common/proxyprotocol/HAProxyMessageChannelHandlerTest.java @@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; + import com.netflix.netty.common.SourceAddressChannelHandler; import com.netflix.zuul.Attrs; import com.netflix.zuul.netty.server.Server; @@ -157,7 +158,6 @@ void v2parseCustomTLVs() { Assert.assertEquals(nflxTLV.size(), 1); final String payload = nflxTLV.get(0).content().toString(StandardCharsets.UTF_8); assertThat(payload).isEqualTo("nflx.custom.tlv"); - } @Test @@ -221,7 +221,6 @@ void validatev2TCPV4NoTLVs() { final List customTLV = channel.attr(HAProxyMessageChannelHandler.ATTR_HAPROXY_CUSTOM_TLVS).get(); assertThat(customTLV.isEmpty()); - } @Test @@ -308,6 +307,5 @@ void validateV2TCPV6NoTLVS() { final List customTLV = channel.attr(HAProxyMessageChannelHandler.ATTR_HAPROXY_CUSTOM_TLVS).get(); assertThat(customTLV.isEmpty()); - } } diff --git a/zuul-core/src/test/java/com/netflix/netty/common/proxyprotocol/StripUntrustedProxyHeadersHandlerTest.java b/zuul-core/src/test/java/com/netflix/netty/common/proxyprotocol/StripUntrustedProxyHeadersHandlerTest.java index ebaf14ae2e..3ed99770cf 100644 --- a/zuul-core/src/test/java/com/netflix/netty/common/proxyprotocol/StripUntrustedProxyHeadersHandlerTest.java +++ b/zuul-core/src/test/java/com/netflix/netty/common/proxyprotocol/StripUntrustedProxyHeadersHandlerTest.java @@ -16,6 +16,13 @@ package com.netflix.netty.common.proxyprotocol; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import com.google.common.collect.ImmutableList; import com.netflix.netty.common.proxyprotocol.StripUntrustedProxyHeadersHandler.AllowWhen; import com.netflix.netty.common.ssl.SslHandshakeInfo; @@ -37,13 +44,6 @@ import org.mockito.junit.jupiter.MockitoSettings; import org.mockito.quality.Strictness; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - /** * Strip Untrusted Proxy Headers Handler Test * diff --git a/zuul-core/src/test/java/com/netflix/netty/common/throttle/MaxInboundConnectionsHandlerTest.java b/zuul-core/src/test/java/com/netflix/netty/common/throttle/MaxInboundConnectionsHandlerTest.java index 94b7028bd8..455fa6ca5d 100644 --- a/zuul-core/src/test/java/com/netflix/netty/common/throttle/MaxInboundConnectionsHandlerTest.java +++ b/zuul-core/src/test/java/com/netflix/netty/common/throttle/MaxInboundConnectionsHandlerTest.java @@ -16,6 +16,9 @@ package com.netflix.netty.common.throttle; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import com.netflix.spectator.api.Counter; import com.netflix.spectator.api.DefaultRegistry; import com.netflix.spectator.api.Id; @@ -27,9 +30,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - class MaxInboundConnectionsHandlerTest { private Registry registry = new DefaultRegistry(); diff --git a/zuul-core/src/test/java/com/netflix/zuul/AttrsTest.java b/zuul-core/src/test/java/com/netflix/zuul/AttrsTest.java index 969bfbc121..6119fcce75 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/AttrsTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/AttrsTest.java @@ -16,14 +16,14 @@ package com.netflix.zuul; -import com.google.common.truth.Truth; -import com.netflix.zuul.Attrs.Key; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; +import com.google.common.truth.Truth; +import com.netflix.zuul.Attrs.Key; +import org.junit.jupiter.api.Test; + class AttrsTest { @Test void keysAreUnique() { diff --git a/zuul-core/src/test/java/com/netflix/zuul/DynamicFilterLoaderTest.java b/zuul-core/src/test/java/com/netflix/zuul/DynamicFilterLoaderTest.java index c0e5bd7a88..4b79e4b456 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/DynamicFilterLoaderTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/DynamicFilterLoaderTest.java @@ -15,26 +15,25 @@ */ package com.netflix.zuul; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.when; + import com.netflix.zuul.filters.BaseSyncFilter; import com.netflix.zuul.filters.FilterRegistry; import com.netflix.zuul.filters.FilterType; import com.netflix.zuul.filters.MutableFilterRegistry; import com.netflix.zuul.filters.ZuulFilter; import com.netflix.zuul.message.ZuulMessage; +import java.io.File; +import java.util.Collection; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import java.io.File; -import java.util.Collection; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.when; - class DynamicFilterLoaderTest { @Mock diff --git a/zuul-core/src/test/java/com/netflix/zuul/FilterFileManagerTest.java b/zuul-core/src/test/java/com/netflix/zuul/FilterFileManagerTest.java index cf514592a8..260fcfcdcd 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/FilterFileManagerTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/FilterFileManagerTest.java @@ -15,15 +15,6 @@ */ package com.netflix.zuul; -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.MockitoAnnotations; -import org.mockito.junit.jupiter.MockitoExtension; - -import java.io.File; - import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.doNothing; @@ -31,6 +22,14 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; +import java.io.File; +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.MockitoAnnotations; +import org.mockito.junit.jupiter.MockitoExtension; + /** * Tests for {@link FilterFileManager}. */ diff --git a/zuul-core/src/test/java/com/netflix/zuul/StaticFilterLoaderTest.java b/zuul-core/src/test/java/com/netflix/zuul/StaticFilterLoaderTest.java index d70caf4f4c..066cbb0a7d 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/StaticFilterLoaderTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/StaticFilterLoaderTest.java @@ -22,11 +22,10 @@ import com.netflix.zuul.filters.ZuulFilter; import com.netflix.zuul.filters.http.HttpInboundSyncFilter; import com.netflix.zuul.message.http.HttpRequestMessage; -import org.junit.jupiter.api.Test; - import java.util.ArrayList; import java.util.List; import java.util.SortedSet; +import org.junit.jupiter.api.Test; class StaticFilterLoaderTest { diff --git a/zuul-core/src/test/java/com/netflix/zuul/com/netflix/zuul/netty/server/push/PushConnectionTest.java b/zuul-core/src/test/java/com/netflix/zuul/com/netflix/zuul/netty/server/push/PushConnectionTest.java index f60b6ca62b..25f51d6a1d 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/com/netflix/zuul/netty/server/push/PushConnectionTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/com/netflix/zuul/netty/server/push/PushConnectionTest.java @@ -16,13 +16,13 @@ package com.netflix.zuul.com.netflix.zuul.netty.server.push; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import com.netflix.zuul.netty.server.push.PushConnection; import com.netflix.zuul.netty.server.push.PushProtocol; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - /** * Author: Susheel Aroskar * Date: 10/18/2018 diff --git a/zuul-core/src/test/java/com/netflix/zuul/context/DebugTest.java b/zuul-core/src/test/java/com/netflix/zuul/context/DebugTest.java index 01bc06379e..d4359c6bfe 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/context/DebugTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/context/DebugTest.java @@ -15,19 +15,6 @@ */ package com.netflix.zuul.context; -import com.google.common.truth.Truth; -import com.netflix.zuul.message.Headers; -import com.netflix.zuul.message.http.HttpQueryParams; -import com.netflix.zuul.message.http.HttpRequestMessage; -import com.netflix.zuul.message.http.HttpResponseMessage; -import com.netflix.zuul.message.http.HttpResponseMessageImpl; -import com.netflix.zuul.message.util.HttpRequestBuilder; -import io.netty.handler.codec.http.HttpMethod; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import java.util.List; - import static com.netflix.zuul.context.Debug.addRequestDebug; import static com.netflix.zuul.context.Debug.addRoutingDebug; import static com.netflix.zuul.context.Debug.debugRequest; @@ -39,6 +26,18 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; +import com.google.common.truth.Truth; +import com.netflix.zuul.message.Headers; +import com.netflix.zuul.message.http.HttpQueryParams; +import com.netflix.zuul.message.http.HttpRequestMessage; +import com.netflix.zuul.message.http.HttpResponseMessage; +import com.netflix.zuul.message.http.HttpResponseMessageImpl; +import com.netflix.zuul.message.util.HttpRequestBuilder; +import io.netty.handler.codec.http.HttpMethod; +import java.util.List; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + class DebugTest { private SessionContext ctx; diff --git a/zuul-core/src/test/java/com/netflix/zuul/context/SessionContextTest.java b/zuul-core/src/test/java/com/netflix/zuul/context/SessionContextTest.java index 59ae267cd1..3322744291 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/context/SessionContextTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/context/SessionContextTest.java @@ -15,16 +15,16 @@ */ package com.netflix.zuul.context; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; + import com.google.common.truth.Truth; import com.netflix.zuul.context.SessionContext.Key; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertThrows; - @ExtendWith(MockitoExtension.class) class SessionContextTest { diff --git a/zuul-core/src/test/java/com/netflix/zuul/filters/BaseFilterTest.java b/zuul-core/src/test/java/com/netflix/zuul/filters/BaseFilterTest.java index 73d0441a7f..6492763815 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/filters/BaseFilterTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/filters/BaseFilterTest.java @@ -17,6 +17,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; + import com.google.common.truth.Truth; import com.netflix.config.ConfigurationManager; import com.netflix.zuul.context.SessionContext; diff --git a/zuul-core/src/test/java/com/netflix/zuul/filters/common/GZipResponseFilterTest.java b/zuul-core/src/test/java/com/netflix/zuul/filters/common/GZipResponseFilterTest.java index 365a5119e8..649abf55f5 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/filters/common/GZipResponseFilterTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/filters/common/GZipResponseFilterTest.java @@ -16,6 +16,11 @@ package com.netflix.zuul.filters.common; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.when; + import com.netflix.zuul.context.SessionContext; import com.netflix.zuul.message.Headers; import com.netflix.zuul.message.http.HttpHeaderNames; @@ -26,6 +31,9 @@ import io.netty.handler.codec.http.DefaultHttpContent; import io.netty.handler.codec.http.DefaultLastHttpContent; import io.netty.handler.codec.http.HttpContent; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.util.zip.GZIPInputStream; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -33,15 +41,6 @@ import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.util.zip.GZIPInputStream; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Mockito.when; - @ExtendWith(MockitoExtension.class) class GZipResponseFilterTest { private final SessionContext context = new SessionContext(); diff --git a/zuul-core/src/test/java/com/netflix/zuul/filters/endpoint/ProxyEndpointTest.java b/zuul-core/src/test/java/com/netflix/zuul/filters/endpoint/ProxyEndpointTest.java index ac7748aebe..3b6940564d 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/filters/endpoint/ProxyEndpointTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/filters/endpoint/ProxyEndpointTest.java @@ -16,6 +16,10 @@ package com.netflix.zuul.filters.endpoint; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import com.netflix.appinfo.InstanceInfo; import com.netflix.spectator.api.Spectator; import com.netflix.zuul.context.CommonContextKeys; @@ -36,10 +40,6 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - @ExtendWith(MockitoExtension.class) class ProxyEndpointTest { @@ -96,4 +96,4 @@ void testRetryWillResetBodyReader() { proxyEndpoint.handleOriginNonSuccessResponse(response, discoveryResult); assertEquals("Hello There", new String(request.getBody())); } -} \ No newline at end of file +} diff --git a/zuul-core/src/test/java/com/netflix/zuul/message/HeadersTest.java b/zuul-core/src/test/java/com/netflix/zuul/message/HeadersTest.java index 8755576c4e..7aa5b6a842 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/message/HeadersTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/message/HeadersTest.java @@ -16,10 +16,13 @@ package com.netflix.zuul.message; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + import com.google.common.truth.Truth; import com.netflix.zuul.exception.ZuulException; -import org.junit.jupiter.api.Test; - import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; @@ -28,11 +31,7 @@ import java.util.List; import java.util.Map; import java.util.Set; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.Test; /** * Tests for {@link Headers}. diff --git a/zuul-core/src/test/java/com/netflix/zuul/message/ZuulMessageImplTest.java b/zuul-core/src/test/java/com/netflix/zuul/message/ZuulMessageImplTest.java index 53e63bff07..f14efcb892 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/message/ZuulMessageImplTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/message/ZuulMessageImplTest.java @@ -16,6 +16,10 @@ package com.netflix.zuul.message; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import com.netflix.zuul.context.SessionContext; import io.netty.buffer.Unpooled; import io.netty.handler.codec.http.DefaultHttpContent; @@ -25,10 +29,6 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - @ExtendWith(MockitoExtension.class) class ZuulMessageImplTest { private static final String TEXT1 = "Hello World!"; diff --git a/zuul-core/src/test/java/com/netflix/zuul/message/http/HttpQueryParamsTest.java b/zuul-core/src/test/java/com/netflix/zuul/message/http/HttpQueryParamsTest.java index 823911e2b1..d0dce57f84 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/message/http/HttpQueryParamsTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/message/http/HttpQueryParamsTest.java @@ -16,15 +16,14 @@ package com.netflix.zuul.message.http; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.Locale; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; -import java.util.Locale; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - @ExtendWith(MockitoExtension.class) class HttpQueryParamsTest { diff --git a/zuul-core/src/test/java/com/netflix/zuul/message/http/HttpRequestMessageImplTest.java b/zuul-core/src/test/java/com/netflix/zuul/message/http/HttpRequestMessageImplTest.java index 2e2419a224..fe4c325fcc 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/message/http/HttpRequestMessageImplTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/message/http/HttpRequestMessageImplTest.java @@ -16,6 +16,15 @@ package com.netflix.zuul.message.http; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import com.google.common.net.InetAddresses; import com.netflix.config.ConfigurationManager; import com.netflix.zuul.context.CommonContextKeys; @@ -23,26 +32,16 @@ import com.netflix.zuul.message.Headers; import io.netty.channel.local.LocalAddress; import io.netty.handler.codec.http.cookie.Cookie; -import org.apache.commons.configuration.AbstractConfiguration; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.junit.jupiter.MockitoExtension; - import java.net.InetSocketAddress; import java.net.SocketAddress; import java.net.URISyntaxException; import java.util.List; import java.util.Optional; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import org.apache.commons.configuration.AbstractConfiguration; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; @ExtendWith(MockitoExtension.class) class HttpRequestMessageImplTest { diff --git a/zuul-core/src/test/java/com/netflix/zuul/message/http/HttpResponseMessageImplTest.java b/zuul-core/src/test/java/com/netflix/zuul/message/http/HttpResponseMessageImplTest.java index 044d2b7186..c32a2d3d92 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/message/http/HttpResponseMessageImplTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/message/http/HttpResponseMessageImplTest.java @@ -16,20 +16,19 @@ package com.netflix.zuul.message.http; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import com.netflix.zuul.context.SessionContext; import com.netflix.zuul.message.Headers; +import java.nio.charset.StandardCharsets; 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.nio.charset.StandardCharsets; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - /** * Unit tests for {@link HttpResponseMessageImpl}. */ diff --git a/zuul-core/src/test/java/com/netflix/zuul/monitoring/ConnCounterTest.java b/zuul-core/src/test/java/com/netflix/zuul/monitoring/ConnCounterTest.java index f09e078621..c8d7bfed59 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/monitoring/ConnCounterTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/monitoring/ConnCounterTest.java @@ -16,6 +16,9 @@ package com.netflix.zuul.monitoring; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import com.netflix.spectator.api.DefaultRegistry; import com.netflix.spectator.api.Gauge; import com.netflix.spectator.api.Registry; @@ -24,9 +27,6 @@ import io.netty.channel.embedded.EmbeddedChannel; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; - class ConnCounterTest { @Test void record() { diff --git a/zuul-core/src/test/java/com/netflix/zuul/monitoring/ConnTimerTest.java b/zuul-core/src/test/java/com/netflix/zuul/monitoring/ConnTimerTest.java index 06585921fd..727ad01cee 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/monitoring/ConnTimerTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/monitoring/ConnTimerTest.java @@ -16,6 +16,9 @@ package com.netflix.zuul.monitoring; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import com.netflix.spectator.api.DefaultRegistry; import com.netflix.spectator.api.Registry; import com.netflix.spectator.api.histogram.PercentileTimer; @@ -24,9 +27,6 @@ import io.netty.channel.embedded.EmbeddedChannel; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; - class ConnTimerTest { @Test void record() { diff --git a/zuul-core/src/test/java/com/netflix/zuul/netty/connectionpool/DefaultClientChannelManagerTest.java b/zuul-core/src/test/java/com/netflix/zuul/netty/connectionpool/DefaultClientChannelManagerTest.java index 8c46149742..03519f6474 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/netty/connectionpool/DefaultClientChannelManagerTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/netty/connectionpool/DefaultClientChannelManagerTest.java @@ -16,6 +16,17 @@ package com.netflix.zuul.netty.connectionpool; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import com.google.common.net.InetAddresses; import com.google.common.truth.Truth; import com.netflix.appinfo.InstanceInfo; @@ -36,26 +47,14 @@ import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.nio.NioSocketChannel; import io.netty.util.concurrent.Promise; -import org.junit.jupiter.api.Test; -import org.mockito.Mockito; - import java.net.InetSocketAddress; import java.net.ServerSocket; import java.net.SocketAddress; import java.util.UUID; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; /** * Tests for {@link DefaultClientChannelManager}. These tests don't use IPv6 addresses because {@link InstanceInfo} is diff --git a/zuul-core/src/test/java/com/netflix/zuul/netty/connectionpool/PerServerConnectionPoolTest.java b/zuul-core/src/test/java/com/netflix/zuul/netty/connectionpool/PerServerConnectionPoolTest.java index e60ce6c61c..bd6fe108f4 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/netty/connectionpool/PerServerConnectionPoolTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/netty/connectionpool/PerServerConnectionPoolTest.java @@ -16,6 +16,16 @@ package com.netflix.zuul.netty.connectionpool; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.spy; + import com.netflix.appinfo.InstanceInfo; import com.netflix.appinfo.InstanceInfo.Builder; import com.netflix.client.config.DefaultClientConfigImpl; @@ -41,30 +51,19 @@ import io.netty.channel.local.LocalServerChannel; import io.netty.handler.codec.DecoderException; import io.netty.util.concurrent.Promise; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; - -import javax.net.ssl.SSLHandshakeException; import java.util.Deque; import java.util.UUID; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertInstanceOf; -import static org.junit.jupiter.api.Assertions.assertNotEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Mockito.spy; +import javax.net.ssl.SSLHandshakeException; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; /** * @author Justin Guerra @@ -404,4 +403,4 @@ private PooledConnection newPooledConnection(Channel ch) { registry.counter("fake_close_counter"), registry.counter("fake_close_wrt_counter")); } -} \ No newline at end of file +} diff --git a/zuul-core/src/test/java/com/netflix/zuul/netty/filter/ZuulEndPointRunnerTest.java b/zuul-core/src/test/java/com/netflix/zuul/netty/filter/ZuulEndPointRunnerTest.java index 523336a29e..50ce8bf456 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/netty/filter/ZuulEndPointRunnerTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/netty/filter/ZuulEndPointRunnerTest.java @@ -16,6 +16,15 @@ package com.netflix.zuul.netty.filter; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import com.netflix.spectator.api.NoopRegistry; import com.netflix.spectator.api.Registry; import com.netflix.zuul.Filter; @@ -41,15 +50,6 @@ import org.mockito.ArgumentCaptor; import rx.Observable; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - class ZuulEndPointRunnerTest { private static final String BASIC_ENDPOINT = "basicEndpoint"; private ZuulEndPointRunner endpointRunner; diff --git a/zuul-core/src/test/java/com/netflix/zuul/netty/filter/ZuulFilterChainRunnerTest.java b/zuul-core/src/test/java/com/netflix/zuul/netty/filter/ZuulFilterChainRunnerTest.java index 96b22a4a88..ab3ef408b2 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/netty/filter/ZuulFilterChainRunnerTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/netty/filter/ZuulFilterChainRunnerTest.java @@ -15,6 +15,16 @@ */ package com.netflix.zuul.netty.filter; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.mockito.Mockito.when; + import com.netflix.spectator.api.Registry; import com.netflix.zuul.ExecutionStatus; import com.netflix.zuul.FilterUsageNotifier; @@ -36,16 +46,6 @@ import org.junit.jupiter.api.Test; import rx.Observable; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.when; - class ZuulFilterChainRunnerTest { private HttpRequestMessage request; private HttpResponseMessage response; diff --git a/zuul-core/src/test/java/com/netflix/zuul/netty/insights/ServerStateHandlerTest.java b/zuul-core/src/test/java/com/netflix/zuul/netty/insights/ServerStateHandlerTest.java index 01e87be070..505c78d5d8 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/netty/insights/ServerStateHandlerTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/netty/insights/ServerStateHandlerTest.java @@ -16,6 +16,8 @@ package com.netflix.zuul.netty.insights; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.netflix.spectator.api.Counter; import com.netflix.spectator.api.DefaultRegistry; import com.netflix.spectator.api.Id; @@ -28,8 +30,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - class ServerStateHandlerTest { private Registry registry; diff --git a/zuul-core/src/test/java/com/netflix/zuul/netty/server/BaseZuulChannelInitializerTest.java b/zuul-core/src/test/java/com/netflix/zuul/netty/server/BaseZuulChannelInitializerTest.java index 08219ba551..81725a0226 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/netty/server/BaseZuulChannelInitializerTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/netty/server/BaseZuulChannelInitializerTest.java @@ -16,6 +16,8 @@ package com.netflix.zuul.netty.server; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import com.netflix.netty.common.SourceAddressChannelHandler; import com.netflix.netty.common.channel.config.ChannelConfig; import com.netflix.netty.common.channel.config.CommonChannelConfigKeys; @@ -32,8 +34,6 @@ import io.netty.util.concurrent.GlobalEventExecutor; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertNotNull; - /** * Unit tests for {@link BaseZuulChannelInitializer}. */ diff --git a/zuul-core/src/test/java/com/netflix/zuul/netty/server/ClientConnectionsShutdownTest.java b/zuul-core/src/test/java/com/netflix/zuul/netty/server/ClientConnectionsShutdownTest.java index d40e160cec..dab3461d2e 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/netty/server/ClientConnectionsShutdownTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/netty/server/ClientConnectionsShutdownTest.java @@ -16,6 +16,15 @@ package com.netflix.zuul.netty.server; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.isA; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; + import com.netflix.appinfo.InstanceInfo.InstanceStatus; import com.netflix.config.ConfigurationManager; import com.netflix.discovery.EurekaClient; @@ -35,6 +44,10 @@ import io.netty.channel.local.LocalServerChannel; import io.netty.util.concurrent.EventExecutor; import io.netty.util.concurrent.Promise; +import java.util.UUID; +import java.util.concurrent.Callable; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import org.apache.commons.configuration.AbstractConfiguration; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -44,20 +57,6 @@ import org.mockito.ArgumentMatchers; import org.mockito.Mockito; -import java.util.UUID; -import java.util.concurrent.Callable; -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; - -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.ArgumentMatchers.isA; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; - /** * @author Justin Guerra * @since 2/28/23 @@ -216,4 +215,4 @@ protected void initChannel(LocalChannel ch) {} channels.add(connect.channel()); } } -} \ No newline at end of file +} diff --git a/zuul-core/src/test/java/com/netflix/zuul/netty/server/ClientRequestReceiverTest.java b/zuul-core/src/test/java/com/netflix/zuul/netty/server/ClientRequestReceiverTest.java index d091fefa21..a8a9ec3d99 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/netty/server/ClientRequestReceiverTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/netty/server/ClientRequestReceiverTest.java @@ -16,6 +16,12 @@ package com.netflix.zuul.netty.server; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import com.google.common.net.InetAddresses; import com.netflix.netty.common.HttpLifecycleChannelHandler; import com.netflix.netty.common.HttpLifecycleChannelHandler.CompleteEvent; @@ -41,19 +47,12 @@ import io.netty.handler.codec.http.HttpResponseStatus; import io.netty.handler.codec.http.HttpServerCodec; import io.netty.handler.codec.http.HttpVersion; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.junit.jupiter.MockitoExtension; - import java.net.InetSocketAddress; import java.util.Arrays; import java.util.List; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; /** * Unit tests for {@link ClientRequestReceiver}. @@ -78,7 +77,7 @@ void proxyProtocol_portSetInSessionContextAndInHttpRequestMessageImpl() { } assertEquals((int) result.getClientDestinationPort().get(), hapmDestinationAddress.getPort()); int destinationPort = ((InetSocketAddress) - result.getContext().get(CommonContextKeys.PROXY_PROTOCOL_DESTINATION_ADDRESS)) + result.getContext().get(CommonContextKeys.PROXY_PROTOCOL_DESTINATION_ADDRESS)) .getPort(); assertEquals(444, destinationPort); assertEquals(444, result.getOriginalPort()); diff --git a/zuul-core/src/test/java/com/netflix/zuul/netty/server/ClientResponseWriterTest.java b/zuul-core/src/test/java/com/netflix/zuul/netty/server/ClientResponseWriterTest.java index cf31abd955..9818e35199 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/netty/server/ClientResponseWriterTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/netty/server/ClientResponseWriterTest.java @@ -16,6 +16,10 @@ package com.netflix.zuul.netty.server; +import static com.google.common.truth.Truth.assertThat; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + import com.netflix.netty.common.HttpLifecycleChannelHandler; import com.netflix.zuul.BasicRequestCompleteHandler; import com.netflix.zuul.context.CommonContextKeys; @@ -38,16 +42,11 @@ import io.netty.handler.codec.http.HttpResponse; import io.netty.handler.codec.http.HttpVersion; import io.netty.util.ReferenceCountUtil; +import java.util.concurrent.atomic.AtomicReference; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; -import java.util.concurrent.atomic.AtomicReference; - -import static com.google.common.truth.Truth.assertThat; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; - @ExtendWith(MockitoExtension.class) class ClientResponseWriterTest { @@ -108,14 +107,13 @@ public void clearReferenceOnComplete() { channel.pipeline().addFirst(new ChannelOutboundHandlerAdapter() { @Override public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception { - if(msg instanceof HttpResponse response) { + if (msg instanceof HttpResponse response) { nettyResp.set(response); } ReferenceCountUtil.safeRelease(msg); } }); - SessionContext ctx = new SessionContext(); HttpRequestMessage request = new HttpRequestBuilder(ctx).build(); request.storeInboundRequest(); diff --git a/zuul-core/src/test/java/com/netflix/zuul/netty/server/IoUringTest.java b/zuul-core/src/test/java/com/netflix/zuul/netty/server/IoUringTest.java index 765fb8a491..ad2339f23e 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/netty/server/IoUringTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/netty/server/IoUringTest.java @@ -16,6 +16,13 @@ package com.netflix.zuul.netty.server; +import static org.awaitility.Awaitility.await; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.mockito.Mockito.mock; + import com.netflix.config.ConfigurationManager; import com.netflix.netty.common.metrics.EventLoopGroupMetrics; import com.netflix.netty.common.status.ServerStatusManager; @@ -28,13 +35,6 @@ import io.netty.incubator.channel.uring.IOUringSocketChannel; import io.netty.util.concurrent.GlobalEventExecutor; import io.netty.util.internal.PlatformDependent; -import org.apache.commons.configuration.AbstractConfiguration; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.OutputStream; import java.net.InetSocketAddress; import java.net.Socket; @@ -45,13 +45,12 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; - -import static org.awaitility.Awaitility.await; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; -import static org.mockito.Mockito.mock; +import org.apache.commons.configuration.AbstractConfiguration; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /* diff --git a/zuul-core/src/test/java/com/netflix/zuul/netty/server/ServerTest.java b/zuul-core/src/test/java/com/netflix/zuul/netty/server/ServerTest.java index b240d57c07..e6c225b713 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/netty/server/ServerTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/netty/server/ServerTest.java @@ -16,6 +16,13 @@ package com.netflix.zuul.netty.server; +import static org.awaitility.Awaitility.await; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.mockito.Mockito.mock; + import com.netflix.config.ConfigurationManager; import com.netflix.netty.common.metrics.EventLoopGroupMetrics; import com.netflix.netty.common.status.ServerStatusManager; @@ -26,12 +33,6 @@ import io.netty.channel.group.DefaultChannelGroup; import io.netty.channel.socket.nio.NioSocketChannel; import io.netty.util.concurrent.GlobalEventExecutor; -import org.apache.commons.configuration.AbstractConfiguration; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.OutputStream; import java.net.InetSocketAddress; import java.net.Socket; @@ -42,13 +43,11 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; - -import static org.awaitility.Awaitility.await; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; -import static org.mockito.Mockito.mock; +import org.apache.commons.configuration.AbstractConfiguration; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Tests for {@link Server}. diff --git a/zuul-core/src/test/java/com/netflix/zuul/netty/server/SocketAddressPropertyTest.java b/zuul-core/src/test/java/com/netflix/zuul/netty/server/SocketAddressPropertyTest.java index c81fe8294c..a1f594cfc5 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/netty/server/SocketAddressPropertyTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/netty/server/SocketAddressPropertyTest.java @@ -16,20 +16,19 @@ package com.netflix.zuul.netty.server; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + import com.netflix.zuul.netty.server.SocketAddressProperty.BindType; import io.netty.channel.unix.DomainSocketAddress; -import org.junit.jupiter.api.Test; - import java.net.Inet4Address; import java.net.Inet6Address; import java.net.InetSocketAddress; import java.net.SocketAddress; import java.util.Arrays; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.Test; class SocketAddressPropertyTest { diff --git a/zuul-core/src/test/java/com/netflix/zuul/netty/server/http2/Http2ConnectionErrorHandlerTest.java b/zuul-core/src/test/java/com/netflix/zuul/netty/server/http2/Http2ConnectionErrorHandlerTest.java index 3891c5ace4..c299f7b40f 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/netty/server/http2/Http2ConnectionErrorHandlerTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/netty/server/http2/Http2ConnectionErrorHandlerTest.java @@ -1,12 +1,12 @@ /** * Copyright 2023 Netflix, Inc. - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,14 +15,14 @@ */ package com.netflix.zuul.netty.server.http2; +import static org.junit.jupiter.api.Assertions.assertEquals; + import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.channel.embedded.EmbeddedChannel; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - /** * @author Justin Guerra * @since 11/15/23 @@ -54,4 +54,4 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E this.caught = cause; } } -} \ No newline at end of file +} diff --git a/zuul-core/src/test/java/com/netflix/zuul/netty/server/http2/Http2ContentLengthEnforcingHandlerTest.java b/zuul-core/src/test/java/com/netflix/zuul/netty/server/http2/Http2ContentLengthEnforcingHandlerTest.java index 10ba2ddbcf..98cb8d3fe3 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/netty/server/http2/Http2ContentLengthEnforcingHandlerTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/netty/server/http2/Http2ContentLengthEnforcingHandlerTest.java @@ -16,6 +16,8 @@ package com.netflix.zuul.netty.server.http2; +import static com.google.common.truth.Truth.assertThat; + import io.netty.buffer.ByteBufUtil; import io.netty.buffer.UnpooledByteBufAllocator; import io.netty.channel.embedded.EmbeddedChannel; @@ -29,8 +31,6 @@ import io.netty.handler.codec.http2.Http2ResetFrame; import org.junit.jupiter.api.Test; -import static com.google.common.truth.Truth.assertThat; - class Http2ContentLengthEnforcingHandlerTest { @Test diff --git a/zuul-core/src/test/java/com/netflix/zuul/netty/server/http2/Http2OrHttpHandlerTest.java b/zuul-core/src/test/java/com/netflix/zuul/netty/server/http2/Http2OrHttpHandlerTest.java index 8b93b75dcd..e0865d97e0 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/netty/server/http2/Http2OrHttpHandlerTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/netty/server/http2/Http2OrHttpHandlerTest.java @@ -16,6 +16,11 @@ package com.netflix.zuul.netty.server.http2; +import static com.google.common.truth.Truth.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + import com.netflix.netty.common.Http2ConnectionCloseHandler; import com.netflix.netty.common.Http2ConnectionExpiryHandler; import com.netflix.netty.common.channel.config.ChannelConfig; @@ -31,11 +36,6 @@ import io.netty.handler.ssl.ApplicationProtocolNames; import org.junit.jupiter.api.Test; -import static com.google.common.truth.Truth.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; - /** * @author Argha C * @since November 18, 2020 @@ -107,4 +107,4 @@ void skipProtocolCloseHandler() throws Exception { http2OrHttpHandler.configurePipeline(channel.pipeline().lastContext(), ApplicationProtocolNames.HTTP_2); assertNull(channel.pipeline().context(Http2ConnectionErrorHandler.class)); } -} \ No newline at end of file +} diff --git a/zuul-core/src/test/java/com/netflix/zuul/netty/server/push/PushAuthHandlerTest.java b/zuul-core/src/test/java/com/netflix/zuul/netty/server/push/PushAuthHandlerTest.java index 0f8ea5ff4d..cca3158239 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/netty/server/push/PushAuthHandlerTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/netty/server/push/PushAuthHandlerTest.java @@ -16,6 +16,9 @@ package com.netflix.zuul.netty.server.push; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import io.netty.buffer.Unpooled; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.http.DefaultFullHttpRequest; @@ -25,9 +28,6 @@ import io.netty.handler.codec.http.HttpVersion; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - class PushAuthHandlerTest { @Test void testIsInvalidOrigin() { diff --git a/zuul-core/src/test/java/com/netflix/zuul/netty/server/push/PushConnectionRegistryTest.java b/zuul-core/src/test/java/com/netflix/zuul/netty/server/push/PushConnectionRegistryTest.java index 33ad991c89..f7973ddfdb 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/netty/server/push/PushConnectionRegistryTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/netty/server/push/PushConnectionRegistryTest.java @@ -16,11 +16,6 @@ package com.netflix.zuul.netty.server.push; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import java.util.List; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; @@ -28,6 +23,10 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; +import java.util.List; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + class PushConnectionRegistryTest { private PushConnectionRegistry pushConnectionRegistry; diff --git a/zuul-core/src/test/java/com/netflix/zuul/netty/server/push/PushMessageSenderInitializerTest.java b/zuul-core/src/test/java/com/netflix/zuul/netty/server/push/PushMessageSenderInitializerTest.java index a1a665d150..a4906a6c11 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/netty/server/push/PushMessageSenderInitializerTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/netty/server/push/PushMessageSenderInitializerTest.java @@ -16,6 +16,9 @@ package com.netflix.zuul.netty.server.push; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.mockito.Mockito.mock; + import io.netty.channel.Channel; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelPipeline; @@ -25,9 +28,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.mockito.Mockito.mock; - /** * Unit tests for {@link PushMessageSenderInitializer}. */ diff --git a/zuul-core/src/test/java/com/netflix/zuul/netty/server/push/PushRegistrationHandlerTest.java b/zuul-core/src/test/java/com/netflix/zuul/netty/server/push/PushRegistrationHandlerTest.java index 155246b127..572f8d513d 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/netty/server/push/PushRegistrationHandlerTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/netty/server/push/PushRegistrationHandlerTest.java @@ -15,6 +15,16 @@ */ package com.netflix.zuul.netty.server.push; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; + import com.google.common.util.concurrent.MoreExecutors; import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; @@ -25,6 +35,11 @@ import io.netty.handler.codec.http.websocketx.CloseWebSocketFrame; import io.netty.handler.codec.http.websocketx.TextWebSocketFrame; import io.netty.util.concurrent.ScheduledFuture; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; @@ -35,22 +50,6 @@ import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; - /** * @author Justin Guerra * @since 8/31/22 @@ -219,4 +218,4 @@ public String getClientIdentity() { return "whatever"; } } -} \ No newline at end of file +} diff --git a/zuul-core/src/test/java/com/netflix/zuul/netty/server/ssl/SslHandshakeInfoHandlerTest.java b/zuul-core/src/test/java/com/netflix/zuul/netty/server/ssl/SslHandshakeInfoHandlerTest.java index a81248c22b..fbfc5e4738 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/netty/server/ssl/SslHandshakeInfoHandlerTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/netty/server/ssl/SslHandshakeInfoHandlerTest.java @@ -16,6 +16,10 @@ package com.netflix.zuul.netty.server.ssl; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelOutboundHandlerAdapter; import io.netty.channel.ChannelPromise; @@ -24,14 +28,9 @@ import io.netty.handler.ssl.SslHandler; import io.netty.handler.ssl.util.SelfSignedCertificate; import io.netty.util.ReferenceCountUtil; -import org.junit.jupiter.api.Test; - -import javax.net.ssl.SSLEngine; import java.nio.channels.ClosedChannelException; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; +import javax.net.ssl.SSLEngine; +import org.junit.jupiter.api.Test; /** * Unit tests for {@link SslHandshakeInfoHandler}. diff --git a/zuul-core/src/test/java/com/netflix/zuul/netty/ssl/BaseSslContextFactoryTest.java b/zuul-core/src/test/java/com/netflix/zuul/netty/ssl/BaseSslContextFactoryTest.java index bc39e897fa..7552379db1 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/netty/ssl/BaseSslContextFactoryTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/netty/ssl/BaseSslContextFactoryTest.java @@ -16,11 +16,11 @@ package com.netflix.zuul.netty.ssl; +import static org.junit.jupiter.api.Assertions.assertEquals; + import io.netty.handler.ssl.SslProvider; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - /** * Tests for {@link BaseSslContextFactory}. */ diff --git a/zuul-core/src/test/java/com/netflix/zuul/netty/ssl/ClientSslContextFactoryTest.java b/zuul-core/src/test/java/com/netflix/zuul/netty/ssl/ClientSslContextFactoryTest.java index aeae78aa7a..57cb813a5a 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/netty/ssl/ClientSslContextFactoryTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/netty/ssl/ClientSslContextFactoryTest.java @@ -16,17 +16,16 @@ package com.netflix.zuul.netty.ssl; +import static com.google.common.truth.Truth.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.netflix.spectator.api.DefaultRegistry; import io.netty.handler.ssl.OpenSslClientContext; import io.netty.handler.ssl.SslContext; -import org.junit.jupiter.api.Test; - -import javax.net.ssl.SSLSessionContext; import java.util.Arrays; import java.util.List; - -import static com.google.common.truth.Truth.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; +import javax.net.ssl.SSLSessionContext; +import org.junit.jupiter.api.Test; /** * Tests for {@link ClientSslContextFactory}. diff --git a/zuul-core/src/test/java/com/netflix/zuul/netty/ssl/OpenSslTest.java b/zuul-core/src/test/java/com/netflix/zuul/netty/ssl/OpenSslTest.java index db2085ce87..0e9fa07d10 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/netty/ssl/OpenSslTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/netty/ssl/OpenSslTest.java @@ -16,14 +16,14 @@ package com.netflix.zuul.netty.ssl; +import static com.google.common.truth.Truth.assertThat; +import static org.junit.jupiter.api.Assertions.assertTrue; + import io.netty.handler.ssl.OpenSsl; import io.netty.handler.ssl.SslProvider; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static com.google.common.truth.Truth.assertThat; -import static org.junit.jupiter.api.Assertions.assertTrue; - class OpenSslTest { @BeforeEach void beforeEach() { diff --git a/zuul-core/src/test/java/com/netflix/zuul/netty/timeouts/OriginTimeoutManagerTest.java b/zuul-core/src/test/java/com/netflix/zuul/netty/timeouts/OriginTimeoutManagerTest.java index 638494148e..99203de849 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/netty/timeouts/OriginTimeoutManagerTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/netty/timeouts/OriginTimeoutManagerTest.java @@ -16,6 +16,9 @@ package com.netflix.zuul.netty.timeouts; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.when; + import com.netflix.client.config.CommonClientConfigKey; import com.netflix.client.config.DefaultClientConfigImpl; import com.netflix.client.config.IClientConfig; @@ -23,17 +26,13 @@ import com.netflix.zuul.context.SessionContext; import com.netflix.zuul.message.http.HttpRequestMessage; import com.netflix.zuul.origins.NettyOrigin; +import java.time.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 java.time.Duration; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.when; - /** * Origin Timeout Manager Test * @@ -137,4 +136,4 @@ void computeReadTimeout_bolth_enforceMax() { assertEquals(OriginTimeoutManager.MAX_OUTBOUND_READ_TIMEOUT_MS.get(), timeout.toMillis()); } -} \ No newline at end of file +} diff --git a/zuul-core/src/test/java/com/netflix/zuul/niws/RequestAttemptTest.java b/zuul-core/src/test/java/com/netflix/zuul/niws/RequestAttemptTest.java index 108fea49cd..f9903dcb11 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/niws/RequestAttemptTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/niws/RequestAttemptTest.java @@ -16,21 +16,20 @@ package com.netflix.zuul.niws; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; + import com.netflix.zuul.exception.OutboundErrorType; import com.netflix.zuul.netty.connectionpool.OriginConnectException; import io.netty.handler.codec.http2.DefaultHttp2Connection; import io.netty.handler.codec.http2.Http2Error; import io.netty.handler.codec.http2.Http2Exception; -import org.junit.jupiter.api.Test; - -import javax.net.ssl.SSLHandshakeException; import java.io.IOException; import java.security.cert.CertificateException; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.when; +import javax.net.ssl.SSLHandshakeException; +import org.junit.jupiter.api.Test; public class RequestAttemptTest { @@ -93,16 +92,16 @@ void h2ExceptionCauseHandled() { // mock a stacktrace to ensure we don't actually capture it completely when(h2Exception.getStackTrace()).thenReturn(new StackTraceElement[] { - new StackTraceElement( - DefaultHttp2Connection.class.getCanonicalName(), - "createStream", - "DefaultHttp2Connection.java", - 772), - new StackTraceElement( - DefaultHttp2Connection.class.getCanonicalName(), - "checkNewStreamAllowed", - "DefaultHttp2Connection.java", - 902) + new StackTraceElement( + DefaultHttp2Connection.class.getCanonicalName(), + "createStream", + "DefaultHttp2Connection.java", + 772), + new StackTraceElement( + DefaultHttp2Connection.class.getCanonicalName(), + "checkNewStreamAllowed", + "DefaultHttp2Connection.java", + 902) }); RequestAttempt attempt = new RequestAttempt(1, null, null, "target", "chosen", 200, null, null, 0, 0, 0); @@ -115,4 +114,4 @@ void h2ExceptionCauseHandled() { "io.netty.handler.codec.http2.DefaultHttp2Connection.createStream(DefaultHttp2Connection.java:772)", attempt.getCause()); } -} \ No newline at end of file +} diff --git a/zuul-core/src/test/java/com/netflix/zuul/origins/OriginNameTest.java b/zuul-core/src/test/java/com/netflix/zuul/origins/OriginNameTest.java index e28d78455a..9a5ca0c26d 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/origins/OriginNameTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/origins/OriginNameTest.java @@ -16,11 +16,11 @@ package com.netflix.zuul.origins; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.Test; + class OriginNameTest { @Test void getAuthority() { diff --git a/zuul-core/src/test/java/com/netflix/zuul/passport/CurrentPassportTest.java b/zuul-core/src/test/java/com/netflix/zuul/passport/CurrentPassportTest.java index 88372d3438..7d8e7449b6 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/passport/CurrentPassportTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/passport/CurrentPassportTest.java @@ -16,13 +16,12 @@ package com.netflix.zuul.passport; -import org.junit.jupiter.api.Test; - -import java.util.List; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; +import java.util.List; +import org.junit.jupiter.api.Test; + class CurrentPassportTest { @Test void test_findEachPairOf_1pair() { diff --git a/zuul-core/src/test/java/com/netflix/zuul/stats/ErrorStatsDataTest.java b/zuul-core/src/test/java/com/netflix/zuul/stats/ErrorStatsDataTest.java index 33ac4ae1a4..fb52f89237 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/stats/ErrorStatsDataTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/stats/ErrorStatsDataTest.java @@ -16,13 +16,13 @@ package com.netflix.zuul.stats; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotEquals; - /** * Unit tests for {@link ErrorStatsData}. */ diff --git a/zuul-core/src/test/java/com/netflix/zuul/stats/ErrorStatsManagerTest.java b/zuul-core/src/test/java/com/netflix/zuul/stats/ErrorStatsManagerTest.java index 1ccb236015..dc6b36c858 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/stats/ErrorStatsManagerTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/stats/ErrorStatsManagerTest.java @@ -16,15 +16,14 @@ package com.netflix.zuul.stats; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import java.util.concurrent.ConcurrentHashMap; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; -import java.util.concurrent.ConcurrentHashMap; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; - /** * Unit tests for {@link ErrorStatsManager}. */ diff --git a/zuul-core/src/test/java/com/netflix/zuul/stats/RouteStatusCodeMonitorTest.java b/zuul-core/src/test/java/com/netflix/zuul/stats/RouteStatusCodeMonitorTest.java index 54d34bbe11..926e5280f3 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/stats/RouteStatusCodeMonitorTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/stats/RouteStatusCodeMonitorTest.java @@ -16,11 +16,11 @@ package com.netflix.zuul.stats; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; +import org.junit.jupiter.api.Test; + /** * Unit tests for {@link RouteStatusCodeMonitor}. */ diff --git a/zuul-core/src/test/java/com/netflix/zuul/stats/StatsManagerTest.java b/zuul-core/src/test/java/com/netflix/zuul/stats/StatsManagerTest.java index 1ddaa42198..fe5739d533 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/stats/StatsManagerTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/stats/StatsManagerTest.java @@ -16,21 +16,20 @@ package com.netflix.zuul.stats; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.when; + import com.netflix.zuul.message.Headers; import com.netflix.zuul.message.http.HttpRequestInfo; +import java.util.concurrent.ConcurrentHashMap; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; -import java.util.concurrent.ConcurrentHashMap; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Mockito.when; - /** * Unit tests for {@link StatsManager}. */ diff --git a/zuul-core/src/test/java/com/netflix/zuul/util/HttpUtilsTest.java b/zuul-core/src/test/java/com/netflix/zuul/util/HttpUtilsTest.java index f962f13622..a29537ccad 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/util/HttpUtilsTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/util/HttpUtilsTest.java @@ -16,6 +16,12 @@ package com.netflix.zuul.util; +import static com.google.common.truth.Truth.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import com.netflix.zuul.context.SessionContext; import com.netflix.zuul.message.Headers; import com.netflix.zuul.message.ZuulMessage; @@ -27,12 +33,6 @@ import com.netflix.zuul.message.http.HttpResponseMessageImpl; import org.junit.jupiter.api.Test; -import static com.google.common.truth.Truth.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - /** * Unit tests for {@link HttpUtils}. */ diff --git a/zuul-core/src/test/java/com/netflix/zuul/util/JsonUtilityTest.java b/zuul-core/src/test/java/com/netflix/zuul/util/JsonUtilityTest.java index 4d8c678b66..c95ab8d63f 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/util/JsonUtilityTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/util/JsonUtilityTest.java @@ -16,13 +16,12 @@ package com.netflix.zuul.util; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.Map; - -import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; /** * Unit tests for {@link JsonUtility}. diff --git a/zuul-core/src/test/java/com/netflix/zuul/util/VipUtilsTest.java b/zuul-core/src/test/java/com/netflix/zuul/util/VipUtilsTest.java index 4a4ab7b057..84dbe5fb3a 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/util/VipUtilsTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/util/VipUtilsTest.java @@ -16,11 +16,11 @@ package com.netflix.zuul.util; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.Test; + /** * Unit tests for {@link VipUtils}. */ diff --git a/zuul-discovery/src/main/java/com/netflix/zuul/discovery/DiscoveryResult.java b/zuul-discovery/src/main/java/com/netflix/zuul/discovery/DiscoveryResult.java index 3a7f9a982c..908d49fb59 100644 --- a/zuul-discovery/src/main/java/com/netflix/zuul/discovery/DiscoveryResult.java +++ b/zuul-discovery/src/main/java/com/netflix/zuul/discovery/DiscoveryResult.java @@ -23,11 +23,10 @@ import com.netflix.loadbalancer.LoadBalancerStats; import com.netflix.loadbalancer.ServerStats; import com.netflix.niws.loadbalancer.DiscoveryEnabledServer; - -import javax.annotation.Nullable; import java.util.Locale; import java.util.Objects; import java.util.Optional; +import javax.annotation.Nullable; /** * @author Argha C @@ -58,7 +57,6 @@ public DiscoveryResult(DiscoveryEnabledServer server, LoadBalancerStats lbStats) } /** - * * This solely exists to create a result object from incomplete InstanceInfo. * Usage of this for production code is strongly discouraged, since the underlying instances are prone to memory leaks */ @@ -73,8 +71,8 @@ public String toString() { } /** - * * This convenience method exists for usage in tests. For production usage, please use the constructor linked: + * * @see DiscoveryResult#DiscoveryResult(DiscoveryEnabledServer, LoadBalancerStats) */ @VisibleForTesting diff --git a/zuul-discovery/src/main/java/com/netflix/zuul/discovery/DynamicServerResolver.java b/zuul-discovery/src/main/java/com/netflix/zuul/discovery/DynamicServerResolver.java index f8560c6529..cf39854f24 100644 --- a/zuul-discovery/src/main/java/com/netflix/zuul/discovery/DynamicServerResolver.java +++ b/zuul-discovery/src/main/java/com/netflix/zuul/discovery/DynamicServerResolver.java @@ -26,20 +26,19 @@ import com.netflix.niws.loadbalancer.DiscoveryEnabledServer; import com.netflix.zuul.resolver.Resolver; import com.netflix.zuul.resolver.ResolverListener; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.annotation.Nullable; import java.util.HashSet; import java.util.List; import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; +import javax.annotation.Nullable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author Argha C * @since 2/25/21 - * + *

* Implements a resolver, wrapping a ribbon load-balancer. */ public class DynamicServerResolver implements Resolver { diff --git a/zuul-discovery/src/main/java/com/netflix/zuul/discovery/NonDiscoveryServer.java b/zuul-discovery/src/main/java/com/netflix/zuul/discovery/NonDiscoveryServer.java index b5c4153023..ea767b2c15 100644 --- a/zuul-discovery/src/main/java/com/netflix/zuul/discovery/NonDiscoveryServer.java +++ b/zuul-discovery/src/main/java/com/netflix/zuul/discovery/NonDiscoveryServer.java @@ -17,7 +17,6 @@ package com.netflix.zuul.discovery; import com.netflix.loadbalancer.Server; - import java.util.Objects; /** diff --git a/zuul-discovery/src/test/java/com/netflix/zuul/discovery/DiscoveryResultTest.java b/zuul-discovery/src/test/java/com/netflix/zuul/discovery/DiscoveryResultTest.java index 394cca1890..2e31ced263 100644 --- a/zuul-discovery/src/test/java/com/netflix/zuul/discovery/DiscoveryResultTest.java +++ b/zuul-discovery/src/test/java/com/netflix/zuul/discovery/DiscoveryResultTest.java @@ -16,6 +16,9 @@ package com.netflix.zuul.discovery; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import com.google.common.truth.Truth; import com.netflix.appinfo.InstanceInfo; import com.netflix.appinfo.InstanceInfo.Builder; @@ -24,12 +27,8 @@ import com.netflix.loadbalancer.DynamicServerListLoadBalancer; import com.netflix.loadbalancer.Server; import com.netflix.niws.loadbalancer.DiscoveryEnabledServer; -import org.junit.jupiter.api.Test; - import java.util.Optional; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; +import org.junit.jupiter.api.Test; class DiscoveryResultTest { diff --git a/zuul-discovery/src/test/java/com/netflix/zuul/discovery/DynamicServerResolverTest.java b/zuul-discovery/src/test/java/com/netflix/zuul/discovery/DynamicServerResolverTest.java index 3574a12f71..c0d7788f4d 100644 --- a/zuul-discovery/src/test/java/com/netflix/zuul/discovery/DynamicServerResolverTest.java +++ b/zuul-discovery/src/test/java/com/netflix/zuul/discovery/DynamicServerResolverTest.java @@ -24,9 +24,8 @@ import com.netflix.client.config.DefaultClientConfigImpl; import com.netflix.niws.loadbalancer.DiscoveryEnabledServer; import com.netflix.zuul.resolver.ResolverListener; -import org.junit.jupiter.api.Test; - import java.util.List; +import org.junit.jupiter.api.Test; class DynamicServerResolverTest { diff --git a/zuul-groovy/src/main/java/com/netflix/zuul/groovy/GroovyCompiler.java b/zuul-groovy/src/main/java/com/netflix/zuul/groovy/GroovyCompiler.java index 07419c1630..c9e93221a6 100644 --- a/zuul-groovy/src/main/java/com/netflix/zuul/groovy/GroovyCompiler.java +++ b/zuul-groovy/src/main/java/com/netflix/zuul/groovy/GroovyCompiler.java @@ -18,11 +18,10 @@ import com.netflix.zuul.DynamicCodeCompiler; import groovy.lang.GroovyClassLoader; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.File; import java.io.IOException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Groovy code compiler @@ -37,7 +36,6 @@ public class GroovyCompiler implements DynamicCodeCompiler { /** * Compiles Groovy code and returns the Class of the compiles code. - * */ @Override public Class compile(String sCode, String sName) { @@ -56,7 +54,6 @@ GroovyClassLoader getGroovyClassLoader() { /** * Compiles groovy class from a file - * */ @Override public Class compile(File file) throws IOException { diff --git a/zuul-groovy/src/main/java/com/netflix/zuul/scriptManager/FilterInfo.java b/zuul-groovy/src/main/java/com/netflix/zuul/scriptManager/FilterInfo.java index c980e543d4..f7e8dba752 100644 --- a/zuul-groovy/src/main/java/com/netflix/zuul/scriptManager/FilterInfo.java +++ b/zuul-groovy/src/main/java/com/netflix/zuul/scriptManager/FilterInfo.java @@ -16,10 +16,9 @@ package com.netflix.zuul.scriptManager; import com.netflix.zuul.filters.FilterType; - -import javax.annotation.concurrent.ThreadSafe; import java.util.Date; import java.util.concurrent.atomic.AtomicBoolean; +import javax.annotation.concurrent.ThreadSafe; /** * Representation of a ZuulFilter for representing and storing in a database @@ -63,7 +62,6 @@ public FilterInfo( } /** - * * @return the filter name; the class name of the filter */ public String getFilterName() { @@ -72,6 +70,7 @@ public String getFilterName() { /** * the Source code for the filter + * * @return the Source code for the filter */ public String getFilterCode() { @@ -139,7 +138,6 @@ public FilterInfo( } /** - * * @return the revision of this filter */ public int getRevision() { @@ -147,7 +145,6 @@ public int getRevision() { } /** - * * @return creation date */ public Date getCreationDate() { @@ -155,7 +152,6 @@ public Date getCreationDate() { } /** - * * @return true if this filter is active */ public boolean isActive() { @@ -163,7 +159,6 @@ public boolean isActive() { } /** - * * @return true if this filter should be active a "canary" cluster. A "canary" cluster is a separate cluster * where filters may be tested before going to the full production cluster. */ @@ -172,7 +167,6 @@ public boolean isCanary() { } /** - * * @return unique key for the filter */ public String getFilterID() { @@ -180,7 +174,6 @@ public String getFilterID() { } /** - * * @return the filter order */ public String getFilterOrder() { @@ -189,6 +182,7 @@ public String getFilterOrder() { /** * builds the unique filter_id key + * * @return key is application_name:filter_name:filter_type */ public static String buildFilterID(String application_name, FilterType filter_type, String filter_name) { diff --git a/zuul-groovy/src/test/java/com/netflix/zuul/groovy/GroovyCompilerTest.java b/zuul-groovy/src/test/java/com/netflix/zuul/groovy/GroovyCompilerTest.java index e94d950a76..2b28257725 100644 --- a/zuul-groovy/src/test/java/com/netflix/zuul/groovy/GroovyCompilerTest.java +++ b/zuul-groovy/src/test/java/com/netflix/zuul/groovy/GroovyCompilerTest.java @@ -16,16 +16,16 @@ package com.netflix.zuul.groovy; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import groovy.lang.GroovyObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; - /** * Unit tests for {@link GroovyCompiler}. */ diff --git a/zuul-groovy/src/test/java/com/netflix/zuul/groovy/GroovyFileFilterTest.java b/zuul-groovy/src/test/java/com/netflix/zuul/groovy/GroovyFileFilterTest.java index 3ce510f51f..afa98faedb 100644 --- a/zuul-groovy/src/test/java/com/netflix/zuul/groovy/GroovyFileFilterTest.java +++ b/zuul-groovy/src/test/java/com/netflix/zuul/groovy/GroovyFileFilterTest.java @@ -16,13 +16,12 @@ package com.netflix.zuul.groovy; -import org.junit.jupiter.api.Test; - -import java.io.File; - import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; +import java.io.File; +import org.junit.jupiter.api.Test; + /** * Unit tests for {@link GroovyFileFilter}. */ diff --git a/zuul-groovy/src/test/java/com/netflix/zuul/scriptManager/FilterVerifierTest.java b/zuul-groovy/src/test/java/com/netflix/zuul/scriptManager/FilterVerifierTest.java index 7b9fecdd61..8c43e22fce 100644 --- a/zuul-groovy/src/test/java/com/netflix/zuul/scriptManager/FilterVerifierTest.java +++ b/zuul-groovy/src/test/java/com/netflix/zuul/scriptManager/FilterVerifierTest.java @@ -16,15 +16,15 @@ package com.netflix.zuul.scriptManager; -import com.netflix.zuul.filters.FilterType; -import org.codehaus.groovy.control.CompilationFailedException; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; +import com.netflix.zuul.filters.FilterType; +import org.codehaus.groovy.control.CompilationFailedException; +import org.junit.jupiter.api.Test; + /** * Unit tests for {@link FilterVerifier}. */ diff --git a/zuul-guice/src/main/java/com/netflix/zuul/guice/GuiceFilterFactory.java b/zuul-guice/src/main/java/com/netflix/zuul/guice/GuiceFilterFactory.java index b1907a7768..2e73156560 100644 --- a/zuul-guice/src/main/java/com/netflix/zuul/guice/GuiceFilterFactory.java +++ b/zuul-guice/src/main/java/com/netflix/zuul/guice/GuiceFilterFactory.java @@ -19,7 +19,6 @@ import com.google.inject.Injector; import com.netflix.zuul.FilterFactory; import com.netflix.zuul.filters.ZuulFilter; - import javax.inject.Inject; import javax.inject.Singleton; diff --git a/zuul-guice/src/main/java/com/netflix/zuul/init/ZuulFiltersModule.java b/zuul-guice/src/main/java/com/netflix/zuul/init/ZuulFiltersModule.java index 7e5d1860b9..99f129c8b5 100644 --- a/zuul-guice/src/main/java/com/netflix/zuul/init/ZuulFiltersModule.java +++ b/zuul-guice/src/main/java/com/netflix/zuul/init/ZuulFiltersModule.java @@ -25,15 +25,14 @@ import com.netflix.zuul.FilterUsageNotifier; import com.netflix.zuul.filters.ZuulFilter; import com.netflix.zuul.guice.GuiceFilterFactory; -import org.apache.commons.configuration.AbstractConfiguration; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.FilenameFilter; import java.io.IOException; import java.util.Arrays; import java.util.function.Predicate; import java.util.stream.Stream; +import org.apache.commons.configuration.AbstractConfiguration; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * User: michaels@netflix.com diff --git a/zuul-guice/src/test/java/com/netflix/zuul/guice/GuiceFilterFactoryIntegTest.java b/zuul-guice/src/test/java/com/netflix/zuul/guice/GuiceFilterFactoryIntegTest.java index 0220ab08ba..4baca72b9d 100644 --- a/zuul-guice/src/test/java/com/netflix/zuul/guice/GuiceFilterFactoryIntegTest.java +++ b/zuul-guice/src/test/java/com/netflix/zuul/guice/GuiceFilterFactoryIntegTest.java @@ -16,12 +16,12 @@ package com.netflix.zuul.guice; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import com.google.inject.Inject; import com.netflix.zuul.BaseInjectionIntegTest; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertNotNull; - class GuiceFilterFactoryIntegTest extends BaseInjectionIntegTest { @Inject @@ -41,4 +41,4 @@ void fieldInjection() throws Exception { assertNotNull(filter.injector); } -} \ No newline at end of file +} diff --git a/zuul-guice/src/test/java/com/netflix/zuul/guice/TestGuiceConstructorFilter.java b/zuul-guice/src/test/java/com/netflix/zuul/guice/TestGuiceConstructorFilter.java index 4e67214974..9ed2ad5101 100644 --- a/zuul-guice/src/test/java/com/netflix/zuul/guice/TestGuiceConstructorFilter.java +++ b/zuul-guice/src/test/java/com/netflix/zuul/guice/TestGuiceConstructorFilter.java @@ -20,7 +20,6 @@ import com.netflix.zuul.filters.BaseSyncFilter; import com.netflix.zuul.filters.FilterType; import com.netflix.zuul.message.ZuulMessage; - import javax.inject.Inject; public class TestGuiceConstructorFilter extends BaseSyncFilter { @@ -51,4 +50,4 @@ public boolean shouldFilter(ZuulMessage msg) { public ZuulMessage apply(ZuulMessage msg) { return null; } -} \ No newline at end of file +} diff --git a/zuul-guice/src/test/java/com/netflix/zuul/guice/TestGuiceFieldFilter.java b/zuul-guice/src/test/java/com/netflix/zuul/guice/TestGuiceFieldFilter.java index 431fb36c1a..e00d2abfa7 100644 --- a/zuul-guice/src/test/java/com/netflix/zuul/guice/TestGuiceFieldFilter.java +++ b/zuul-guice/src/test/java/com/netflix/zuul/guice/TestGuiceFieldFilter.java @@ -20,7 +20,6 @@ import com.netflix.zuul.filters.BaseSyncFilter; import com.netflix.zuul.filters.FilterType; import com.netflix.zuul.message.ZuulMessage; - import javax.inject.Inject; public class TestGuiceFieldFilter extends BaseSyncFilter { @@ -47,4 +46,4 @@ public boolean shouldFilter(ZuulMessage msg) { public ZuulMessage apply(ZuulMessage msg) { return null; } -} \ No newline at end of file +} diff --git a/zuul-guice/src/test/java/com/netflix/zuul/init/InitTestModule.java b/zuul-guice/src/test/java/com/netflix/zuul/init/InitTestModule.java index 03527df1d7..3d7662a576 100644 --- a/zuul-guice/src/test/java/com/netflix/zuul/init/InitTestModule.java +++ b/zuul-guice/src/test/java/com/netflix/zuul/init/InitTestModule.java @@ -20,9 +20,8 @@ import com.netflix.config.ConfigurationManager; import com.netflix.spectator.api.NoopRegistry; import com.netflix.spectator.api.Registry; -import org.apache.commons.configuration.AbstractConfiguration; - import java.io.FilenameFilter; +import org.apache.commons.configuration.AbstractConfiguration; public class InitTestModule extends AbstractModule { @Override diff --git a/zuul-guice/src/test/java/com/netflix/zuul/init/ZuulFiltersModuleIntegTest.java b/zuul-guice/src/test/java/com/netflix/zuul/init/ZuulFiltersModuleIntegTest.java index 83a338dd15..2e78ba5048 100644 --- a/zuul-guice/src/test/java/com/netflix/zuul/init/ZuulFiltersModuleIntegTest.java +++ b/zuul-guice/src/test/java/com/netflix/zuul/init/ZuulFiltersModuleIntegTest.java @@ -16,17 +16,16 @@ package com.netflix.zuul.init; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.netflix.config.ConfigurationManager; import com.netflix.zuul.BaseInjectionIntegTest; import com.netflix.zuul.FilterFileManager.FilterFileManagerConfig; +import javax.inject.Inject; import org.apache.commons.configuration.AbstractConfiguration; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import javax.inject.Inject; - -import static org.junit.jupiter.api.Assertions.assertEquals; - class ZuulFiltersModuleIntegTest extends BaseInjectionIntegTest { @Inject diff --git a/zuul-guice/src/test/java/com/netflix/zuul/init/ZuulFiltersModuleTest.java b/zuul-guice/src/test/java/com/netflix/zuul/init/ZuulFiltersModuleTest.java index 1773f80f72..8c469f41b8 100644 --- a/zuul-guice/src/test/java/com/netflix/zuul/init/ZuulFiltersModuleTest.java +++ b/zuul-guice/src/test/java/com/netflix/zuul/init/ZuulFiltersModuleTest.java @@ -16,6 +16,9 @@ package com.netflix.zuul.init; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.MatcherAssert.assertThat; + import com.netflix.zuul.init2.TestZuulFilter2; import org.apache.commons.configuration.AbstractConfiguration; import org.junit.jupiter.api.Test; @@ -24,9 +27,6 @@ import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.MatcherAssert.assertThat; - @ExtendWith(MockitoExtension.class) class ZuulFiltersModuleTest { @@ -101,7 +101,7 @@ void testMultiClasses() { Class expectedClass2 = TestZuulFilter2.class; Mockito.when(configuration.getStringArray("zuul.filters.classes")).thenReturn(new String[] { - "com.netflix.zuul.init.TestZuulFilter", "com.netflix.zuul.init2.TestZuulFilter2" + "com.netflix.zuul.init.TestZuulFilter", "com.netflix.zuul.init2.TestZuulFilter2" }); Mockito.when(configuration.getStringArray("zuul.filters.packages")).thenReturn(new String[0]); @@ -127,4 +127,4 @@ void testMultiPackages() { assertThat(classNames[0], equalTo(expectedClass1.getCanonicalName())); assertThat(classNames[1], equalTo(expectedClass2.getCanonicalName())); } -} \ No newline at end of file +} diff --git a/zuul-integration-test/src/test/java/com/netflix/netty/common/metrics/CustomLeakDetector.java b/zuul-integration-test/src/test/java/com/netflix/netty/common/metrics/CustomLeakDetector.java index a88ea017b0..0686ec1f5c 100644 --- a/zuul-integration-test/src/test/java/com/netflix/netty/common/metrics/CustomLeakDetector.java +++ b/zuul-integration-test/src/test/java/com/netflix/netty/common/metrics/CustomLeakDetector.java @@ -15,12 +15,12 @@ */ package com.netflix.netty.common.metrics; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import java.util.stream.Collectors; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class CustomLeakDetector extends InstrumentedResourceLeakDetector { private static final List GLOBAL_REGISTRY = new CopyOnWriteArrayList<>(); diff --git a/zuul-integration-test/src/test/java/com/netflix/zuul/integration/IntegrationTest.java b/zuul-integration-test/src/test/java/com/netflix/zuul/integration/IntegrationTest.java index f79ed2990d..f5dfab5e12 100644 --- a/zuul-integration-test/src/test/java/com/netflix/zuul/integration/IntegrationTest.java +++ b/zuul-integration-test/src/test/java/com/netflix/zuul/integration/IntegrationTest.java @@ -16,6 +16,20 @@ package com.netflix.zuul.integration; +import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; +import static com.github.tomakehurst.wiremock.client.WireMock.anyRequestedFor; +import static com.github.tomakehurst.wiremock.client.WireMock.anyUrl; +import static com.github.tomakehurst.wiremock.client.WireMock.get; +import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor; +import static com.github.tomakehurst.wiremock.client.WireMock.ok; +import static com.github.tomakehurst.wiremock.client.WireMock.post; +import static com.github.tomakehurst.wiremock.client.WireMock.verify; +import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig; +import static com.google.common.truth.Truth.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import com.aayushatharva.brotli4j.decoder.DecoderJNI; import com.aayushatharva.brotli4j.decoder.DirectDecompress; import com.github.tomakehurst.wiremock.client.WireMock; @@ -35,6 +49,21 @@ import io.netty.handler.codec.compression.Brotli; import io.netty.incubator.channel.uring.IOUring; import io.netty.util.ResourceLeakDetector; +import java.io.IOException; +import java.io.InputStream; +import java.net.HttpURLConnection; +import java.net.ServerSocket; +import java.net.URL; +import java.nio.charset.StandardCharsets; +import java.time.Duration; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.UUID; +import java.util.concurrent.TimeUnit; +import java.util.stream.Stream; +import java.util.zip.GZIPInputStream; +import java.util.zip.Inflater; import okhttp3.HttpUrl; import okhttp3.OkHttpClient; import okhttp3.Protocol; @@ -55,36 +84,6 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import java.io.IOException; -import java.io.InputStream; -import java.net.HttpURLConnection; -import java.net.ServerSocket; -import java.net.URL; -import java.nio.charset.StandardCharsets; -import java.time.Duration; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.UUID; -import java.util.concurrent.TimeUnit; -import java.util.stream.Stream; -import java.util.zip.GZIPInputStream; -import java.util.zip.Inflater; - -import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; -import static com.github.tomakehurst.wiremock.client.WireMock.anyRequestedFor; -import static com.github.tomakehurst.wiremock.client.WireMock.anyUrl; -import static com.github.tomakehurst.wiremock.client.WireMock.get; -import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor; -import static com.github.tomakehurst.wiremock.client.WireMock.ok; -import static com.github.tomakehurst.wiremock.client.WireMock.post; -import static com.github.tomakehurst.wiremock.client.WireMock.verify; -import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig; -import static com.google.common.truth.Truth.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - class IntegrationTest { static { diff --git a/zuul-integration-test/src/test/java/com/netflix/zuul/integration/server/Bootstrap.java b/zuul-integration-test/src/test/java/com/netflix/zuul/integration/server/Bootstrap.java index 8b0ba385fd..c40663b738 100644 --- a/zuul-integration-test/src/test/java/com/netflix/zuul/integration/server/Bootstrap.java +++ b/zuul-integration-test/src/test/java/com/netflix/zuul/integration/server/Bootstrap.java @@ -20,11 +20,10 @@ import com.google.inject.Injector; import com.netflix.zuul.netty.server.BaseServerStartup; import com.netflix.zuul.netty.server.Server; +import java.util.concurrent.TimeUnit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.concurrent.TimeUnit; - public class Bootstrap { private static final Logger logger = LoggerFactory.getLogger(Bootstrap.class); diff --git a/zuul-integration-test/src/test/java/com/netflix/zuul/integration/server/FilterLoaderProvider.java b/zuul-integration-test/src/test/java/com/netflix/zuul/integration/server/FilterLoaderProvider.java index 1234ef08d5..2cbe154662 100644 --- a/zuul-integration-test/src/test/java/com/netflix/zuul/integration/server/FilterLoaderProvider.java +++ b/zuul-integration-test/src/test/java/com/netflix/zuul/integration/server/FilterLoaderProvider.java @@ -26,7 +26,6 @@ import com.netflix.zuul.integration.server.filters.NeedsBodyBufferedOutboundFilter; import com.netflix.zuul.integration.server.filters.RequestHeaderFilter; import com.netflix.zuul.integration.server.filters.ResponseHeaderFilter; - import java.util.Collections; import java.util.LinkedHashSet; import java.util.Set; diff --git a/zuul-integration-test/src/test/java/com/netflix/zuul/integration/server/OriginServerList.java b/zuul-integration-test/src/test/java/com/netflix/zuul/integration/server/OriginServerList.java index 32f41150c2..15cc959a8c 100644 --- a/zuul-integration-test/src/test/java/com/netflix/zuul/integration/server/OriginServerList.java +++ b/zuul-integration-test/src/test/java/com/netflix/zuul/integration/server/OriginServerList.java @@ -20,7 +20,6 @@ import com.google.common.collect.Lists; import com.netflix.loadbalancer.ConfigurationBasedServerList; import com.netflix.loadbalancer.Server; - import java.util.List; public class OriginServerList extends ConfigurationBasedServerList { diff --git a/zuul-integration-test/src/test/java/com/netflix/zuul/integration/server/ServerModule.java b/zuul-integration-test/src/test/java/com/netflix/zuul/integration/server/ServerModule.java index 25b52b10ca..4bd9432712 100644 --- a/zuul-integration-test/src/test/java/com/netflix/zuul/integration/server/ServerModule.java +++ b/zuul-integration-test/src/test/java/com/netflix/zuul/integration/server/ServerModule.java @@ -37,9 +37,8 @@ import com.netflix.zuul.origins.OriginManager; import com.netflix.zuul.stats.BasicRequestMetricsPublisher; import com.netflix.zuul.stats.RequestMetricsPublisher; -import org.apache.commons.configuration.AbstractConfiguration; - import java.io.FilenameFilter; +import org.apache.commons.configuration.AbstractConfiguration; public class ServerModule extends AbstractModule { @Override @@ -79,7 +78,7 @@ protected void configure() { bind(AccessLogPublisher.class) .toInstance(new AccessLogPublisher( "ACCESS", (channel, httpRequest) -> ClientRequestReceiver.getRequestFromChannel(channel) - .getContext() - .getUUID())); + .getContext() + .getUUID())); } } diff --git a/zuul-integration-test/src/test/java/com/netflix/zuul/integration/server/ServerStartup.java b/zuul-integration-test/src/test/java/com/netflix/zuul/integration/server/ServerStartup.java index 8dbaf12d2e..9e1813717a 100644 --- a/zuul-integration-test/src/test/java/com/netflix/zuul/integration/server/ServerStartup.java +++ b/zuul-integration-test/src/test/java/com/netflix/zuul/integration/server/ServerStartup.java @@ -48,15 +48,14 @@ import io.netty.handler.codec.compression.CompressionOptions; import io.netty.handler.codec.http.HttpContentCompressor; import io.netty.handler.ssl.ClientAuth; - -import javax.inject.Inject; -import javax.inject.Singleton; import java.io.File; import java.net.InetSocketAddress; import java.net.SocketAddress; import java.util.Collections; import java.util.HashMap; import java.util.Map; +import javax.inject.Inject; +import javax.inject.Singleton; @Singleton public class ServerStartup extends BaseServerStartup { @@ -136,9 +135,9 @@ protected Map> chooseAddrsAndChannels( * or directly on the internet. */ switch (SERVER_TYPE) { - /* The below settings can be used when running behind an ELB HTTP listener that terminates SSL for you - * and passes XFF headers. - */ + /* The below settings can be used when running behind an ELB HTTP listener that terminates SSL for you + * and passes XFF headers. + */ case HTTP: channelConfig.set( CommonChannelConfigKeys.allowProxyHeadersWhen, @@ -159,9 +158,9 @@ protected void addHttp1Handlers(ChannelPipeline pipeline) { logAddrConfigured(sockAddr); break; - /* The below settings can be used when running behind an ELB TCP listener with proxy protocol, terminating - * SSL in Zuul. - */ + /* The below settings can be used when running behind an ELB TCP listener with proxy protocol, terminating + * SSL in Zuul. + */ case HTTP2: sslConfig = ServerSslConfig.withDefaultCiphers( loadFromResources("server.cert"), loadFromResources("server.key"), WWW_PROTOCOLS); @@ -183,12 +182,12 @@ protected void addHttp1Handlers(ChannelPipeline pipeline) { logAddrConfigured(sockAddr, sslConfig); break; - /* The below settings can be used when running behind an ELB TCP listener with proxy protocol, terminating - * SSL in Zuul. - * - * Can be tested using certs in resources directory: - * curl https://localhost:7001/test -vk --cert src/main/resources/ssl/client.cert:zuul123 --key src/main/resources/ssl/client.key - */ + /* The below settings can be used when running behind an ELB TCP listener with proxy protocol, terminating + * SSL in Zuul. + * + * Can be tested using certs in resources directory: + * curl https://localhost:7001/test -vk --cert src/main/resources/ssl/client.cert:zuul123 --key src/main/resources/ssl/client.key + */ case HTTP_MUTUAL_TLS: sslConfig = new ServerSslConfig( WWW_PROTOCOLS, @@ -217,8 +216,8 @@ protected void addHttp1Handlers(ChannelPipeline pipeline) { logAddrConfigured(sockAddr, sslConfig); break; - /* Settings to be used when running behind an ELB TCP listener with proxy protocol as a Push notification - * server using WebSockets */ + /* Settings to be used when running behind an ELB TCP listener with proxy protocol as a Push notification + * server using WebSockets */ case WEBSOCKET: channelConfig.set( CommonChannelConfigKeys.allowProxyHeadersWhen, @@ -241,8 +240,8 @@ protected void addHttp1Handlers(ChannelPipeline pipeline) { logAddrConfigured(pushSockAddr); break; - /* Settings to be used when running behind an ELB TCP listener with proxy protocol as a Push notification - * server using Server Sent Events (SSE) */ + /* Settings to be used when running behind an ELB TCP listener with proxy protocol as a Push notification + * server using Server Sent Events (SSE) */ case SSE: channelConfig.set( CommonChannelConfigKeys.allowProxyHeadersWhen, diff --git a/zuul-integration-test/src/test/java/com/netflix/zuul/integration/server/TestUtil.java b/zuul-integration-test/src/test/java/com/netflix/zuul/integration/server/TestUtil.java index 3d1f4fdcf8..d95fcda9fb 100644 --- a/zuul-integration-test/src/test/java/com/netflix/zuul/integration/server/TestUtil.java +++ b/zuul-integration-test/src/test/java/com/netflix/zuul/integration/server/TestUtil.java @@ -18,11 +18,10 @@ import com.netflix.appinfo.InstanceInfo; import com.netflix.niws.loadbalancer.DiscoveryEnabledServer; -import org.apache.commons.lang3.StringUtils; - import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.UUID; +import org.apache.commons.lang3.StringUtils; public class TestUtil { private TestUtil() {} diff --git a/zuul-integration-test/src/test/java/com/netflix/zuul/integration/server/filters/RequestHeaderFilter.java b/zuul-integration-test/src/test/java/com/netflix/zuul/integration/server/filters/RequestHeaderFilter.java index 3d840a0282..4ad5bc63d4 100644 --- a/zuul-integration-test/src/test/java/com/netflix/zuul/integration/server/filters/RequestHeaderFilter.java +++ b/zuul-integration-test/src/test/java/com/netflix/zuul/integration/server/filters/RequestHeaderFilter.java @@ -21,9 +21,8 @@ import com.netflix.zuul.filters.http.HttpInboundFilter; import com.netflix.zuul.integration.server.HeaderNames; import com.netflix.zuul.message.http.HttpRequestMessage; -import rx.Observable; - import java.util.UUID; +import rx.Observable; @Filter(order = 10, type = FilterType.INBOUND) public class RequestHeaderFilter extends HttpInboundFilter { diff --git a/zuul-processor/src/main/java/com/netflix/zuul/filters/processor/FilterProcessor.java b/zuul-processor/src/main/java/com/netflix/zuul/filters/processor/FilterProcessor.java index 7ed7257269..e04d666dd6 100644 --- a/zuul-processor/src/main/java/com/netflix/zuul/filters/processor/FilterProcessor.java +++ b/zuul-processor/src/main/java/com/netflix/zuul/filters/processor/FilterProcessor.java @@ -17,18 +17,6 @@ package com.netflix.zuul.filters.processor; import com.google.common.annotations.VisibleForTesting; - -import javax.annotation.processing.AbstractProcessor; -import javax.annotation.processing.Filer; -import javax.annotation.processing.RoundEnvironment; -import javax.annotation.processing.SupportedAnnotationTypes; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; -import javax.lang.model.element.Element; -import javax.lang.model.element.Modifier; -import javax.lang.model.element.TypeElement; -import javax.tools.FileObject; -import javax.tools.StandardLocation; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.FileNotFoundException; @@ -48,6 +36,17 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; +import javax.annotation.processing.AbstractProcessor; +import javax.annotation.processing.Filer; +import javax.annotation.processing.RoundEnvironment; +import javax.annotation.processing.SupportedAnnotationTypes; +import javax.annotation.processing.SupportedSourceVersion; +import javax.lang.model.SourceVersion; +import javax.lang.model.element.Element; +import javax.lang.model.element.Modifier; +import javax.lang.model.element.TypeElement; +import javax.tools.FileObject; +import javax.tools.StandardLocation; @SupportedAnnotationTypes(FilterProcessor.FILTER_TYPE) @SupportedSourceVersion(SourceVersion.RELEASE_8) diff --git a/zuul-processor/src/test/java/com/netflix/zuul/filters/processor/FilterProcessorTest.java b/zuul-processor/src/test/java/com/netflix/zuul/filters/processor/FilterProcessorTest.java index 2a608f3a34..213c9e6905 100644 --- a/zuul-processor/src/test/java/com/netflix/zuul/filters/processor/FilterProcessorTest.java +++ b/zuul-processor/src/test/java/com/netflix/zuul/filters/processor/FilterProcessorTest.java @@ -21,9 +21,8 @@ import com.netflix.zuul.filters.ZuulFilter; import com.netflix.zuul.filters.processor.override.SubpackageFilter; import com.netflix.zuul.filters.processor.subpackage.OverrideFilter; -import org.junit.jupiter.api.Test; - import java.util.Collection; +import org.junit.jupiter.api.Test; /** * Tests for {@link FilterProcessor}. diff --git a/zuul-sample/src/main/groovy/com/netflix/zuul/sample/filters/inbound/SampleServiceFilter.groovy b/zuul-sample/src/main/groovy/com/netflix/zuul/sample/filters/inbound/SampleServiceFilter.groovy index e1a876e608..aefdfcf682 100644 --- a/zuul-sample/src/main/groovy/com/netflix/zuul/sample/filters/inbound/SampleServiceFilter.groovy +++ b/zuul-sample/src/main/groovy/com/netflix/zuul/sample/filters/inbound/SampleServiceFilter.groovy @@ -19,12 +19,11 @@ package com.netflix.zuul.sample.filters.inbound import com.netflix.zuul.filters.http.HttpInboundFilter import com.netflix.zuul.message.http.HttpRequestMessage import com.netflix.zuul.sample.SampleService +import javax.inject.Inject import org.slf4j.Logger import org.slf4j.LoggerFactory import rx.Observable -import javax.inject.Inject - /** * Sample Service Filter to demonstrate Guice injection of services and * making external requests to slow endpoints. diff --git a/zuul-sample/src/main/groovy/com/netflix/zuul/sample/filters/outbound/ZuulResponseFilter.groovy b/zuul-sample/src/main/groovy/com/netflix/zuul/sample/filters/outbound/ZuulResponseFilter.groovy index 92313b930a..b783aef05f 100644 --- a/zuul-sample/src/main/groovy/com/netflix/zuul/sample/filters/outbound/ZuulResponseFilter.groovy +++ b/zuul-sample/src/main/groovy/com/netflix/zuul/sample/filters/outbound/ZuulResponseFilter.groovy @@ -16,6 +16,15 @@ package com.netflix.zuul.sample.filters.outbound +import static com.netflix.zuul.constants.ZuulHeaders.CONNECTION +import static com.netflix.zuul.constants.ZuulHeaders.KEEP_ALIVE +import static com.netflix.zuul.constants.ZuulHeaders.X_ORIGINATING_URL +import static com.netflix.zuul.constants.ZuulHeaders.X_ZUUL +import static com.netflix.zuul.constants.ZuulHeaders.X_ZUUL_ERROR_CAUSE +import static com.netflix.zuul.constants.ZuulHeaders.X_ZUUL_INSTANCE +import static com.netflix.zuul.constants.ZuulHeaders.X_ZUUL_PROXY_ATTEMPTS +import static com.netflix.zuul.constants.ZuulHeaders.X_ZUUL_STATUS + import com.netflix.config.DynamicBooleanProperty import com.netflix.zuul.context.Debug import com.netflix.zuul.context.SessionContext @@ -30,8 +39,6 @@ import com.netflix.zuul.stats.status.StatusCategoryUtils import org.slf4j.Logger import org.slf4j.LoggerFactory -import static com.netflix.zuul.constants.ZuulHeaders.* - /** * Sample Response Filter - adding custom response headers for better analysis of how the request was proxied * diff --git a/zuul-sample/src/main/java/com/netflix/zuul/sample/Bootstrap.java b/zuul-sample/src/main/java/com/netflix/zuul/sample/Bootstrap.java index 2c37bd5584..cd2905f7a9 100644 --- a/zuul-sample/src/main/java/com/netflix/zuul/sample/Bootstrap.java +++ b/zuul-sample/src/main/java/com/netflix/zuul/sample/Bootstrap.java @@ -20,14 +20,13 @@ import com.google.inject.Injector; import com.netflix.zuul.netty.server.BaseServerStartup; import com.netflix.zuul.netty.server.Server; +import java.util.concurrent.TimeUnit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.concurrent.TimeUnit; - /** * Bootstrap - * + *

* Author: Arthur Gonigberg * Date: November 20, 2017 */ diff --git a/zuul-sample/src/main/java/com/netflix/zuul/sample/SampleServerStartup.java b/zuul-sample/src/main/java/com/netflix/zuul/sample/SampleServerStartup.java index a57e6fea77..dfa6a2f94d 100644 --- a/zuul-sample/src/main/java/com/netflix/zuul/sample/SampleServerStartup.java +++ b/zuul-sample/src/main/java/com/netflix/zuul/sample/SampleServerStartup.java @@ -48,19 +48,18 @@ import io.netty.channel.ChannelInitializer; import io.netty.channel.group.ChannelGroup; import io.netty.handler.ssl.ClientAuth; - -import javax.inject.Inject; -import javax.inject.Singleton; import java.io.File; import java.net.InetSocketAddress; import java.net.SocketAddress; import java.util.Collections; import java.util.HashMap; import java.util.Map; +import javax.inject.Inject; +import javax.inject.Singleton; /** * Sample Server Startup - class that configures the Netty server startup settings - * + *

* Author: Arthur Gonigberg * Date: November 20, 2017 */ @@ -143,9 +142,9 @@ protected Map> chooseAddrsAndChannels( * or directly on the internet. */ switch (SERVER_TYPE) { - /* The below settings can be used when running behind an ELB HTTP listener that terminates SSL for you - * and passes XFF headers. - */ + /* The below settings can be used when running behind an ELB HTTP listener that terminates SSL for you + * and passes XFF headers. + */ case HTTP: channelConfig.set( CommonChannelConfigKeys.allowProxyHeadersWhen, @@ -160,9 +159,9 @@ protected Map> chooseAddrsAndChannels( logAddrConfigured(sockAddr); break; - /* The below settings can be used when running behind an ELB TCP listener with proxy protocol, terminating - * SSL in Zuul. - */ + /* The below settings can be used when running behind an ELB TCP listener with proxy protocol, terminating + * SSL in Zuul. + */ case HTTP2: sslConfig = ServerSslConfig.withDefaultCiphers( loadFromResources("server.cert"), loadFromResources("server.key"), WWW_PROTOCOLS); @@ -184,12 +183,12 @@ protected Map> chooseAddrsAndChannels( logAddrConfigured(sockAddr, sslConfig); break; - /* The below settings can be used when running behind an ELB TCP listener with proxy protocol, terminating - * SSL in Zuul. - * - * Can be tested using certs in resources directory: - * curl https://localhost:7001/test -vk --cert src/main/resources/ssl/client.cert:zuul123 --key src/main/resources/ssl/client.key - */ + /* The below settings can be used when running behind an ELB TCP listener with proxy protocol, terminating + * SSL in Zuul. + * + * Can be tested using certs in resources directory: + * curl https://localhost:7001/test -vk --cert src/main/resources/ssl/client.cert:zuul123 --key src/main/resources/ssl/client.key + */ case HTTP_MUTUAL_TLS: sslConfig = new ServerSslConfig( WWW_PROTOCOLS, @@ -218,8 +217,8 @@ protected Map> chooseAddrsAndChannels( logAddrConfigured(sockAddr, sslConfig); break; - /* Settings to be used when running behind an ELB TCP listener with proxy protocol as a Push notification - * server using WebSockets */ + /* Settings to be used when running behind an ELB TCP listener with proxy protocol as a Push notification + * server using WebSockets */ case WEBSOCKET: channelConfig.set( CommonChannelConfigKeys.allowProxyHeadersWhen, @@ -241,8 +240,8 @@ protected Map> chooseAddrsAndChannels( logAddrConfigured(pushSockAddr); break; - /* Settings to be used when running behind an ELB TCP listener with proxy protocol as a Push notification - * server using Server Sent Events (SSE) */ + /* Settings to be used when running behind an ELB TCP listener with proxy protocol as a Push notification + * server using Server Sent Events (SSE) */ case SSE: channelConfig.set( CommonChannelConfigKeys.allowProxyHeadersWhen, diff --git a/zuul-sample/src/main/java/com/netflix/zuul/sample/SampleService.java b/zuul-sample/src/main/java/com/netflix/zuul/sample/SampleService.java index 1617aa6e18..8ef65a6dd5 100644 --- a/zuul-sample/src/main/java/com/netflix/zuul/sample/SampleService.java +++ b/zuul-sample/src/main/java/com/netflix/zuul/sample/SampleService.java @@ -16,15 +16,14 @@ package com.netflix.zuul.sample; -import rx.Observable; - -import javax.inject.Singleton; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; +import javax.inject.Singleton; +import rx.Observable; /** * Sample Service for demonstration in SampleServiceFilter. - * + *

* Author: Arthur Gonigberg * Date: January 04, 2018 */ diff --git a/zuul-sample/src/main/java/com/netflix/zuul/sample/ZuulSampleModule.java b/zuul-sample/src/main/java/com/netflix/zuul/sample/ZuulSampleModule.java index eda1aebc29..c52eefff67 100644 --- a/zuul-sample/src/main/java/com/netflix/zuul/sample/ZuulSampleModule.java +++ b/zuul-sample/src/main/java/com/netflix/zuul/sample/ZuulSampleModule.java @@ -42,13 +42,12 @@ import com.netflix.zuul.origins.OriginManager; import com.netflix.zuul.stats.BasicRequestMetricsPublisher; import com.netflix.zuul.stats.RequestMetricsPublisher; -import org.apache.commons.configuration.AbstractConfiguration; - import java.io.FilenameFilter; +import org.apache.commons.configuration.AbstractConfiguration; /** * Zuul Sample Module - * + *

* Author: Arthur Gonigberg * Date: November 20, 2017 */ @@ -91,7 +90,7 @@ protected void configure() { bind(AccessLogPublisher.class) .toInstance(new AccessLogPublisher( "ACCESS", (channel, httpRequest) -> ClientRequestReceiver.getRequestFromChannel(channel) - .getContext() - .getUUID())); + .getContext() + .getUUID())); } } diff --git a/zuul-sample/src/main/java/com/netflix/zuul/sample/push/SamplePushMessageSender.java b/zuul-sample/src/main/java/com/netflix/zuul/sample/push/SamplePushMessageSender.java index 3dc94d0a20..5dcfd1a25a 100644 --- a/zuul-sample/src/main/java/com/netflix/zuul/sample/push/SamplePushMessageSender.java +++ b/zuul-sample/src/main/java/com/netflix/zuul/sample/push/SamplePushMessageSender.java @@ -1,12 +1,12 @@ /** * Copyright 2018 Netflix, Inc. - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -22,7 +22,6 @@ import io.netty.channel.ChannelHandler; import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpResponseStatus; - import javax.inject.Singleton; /** diff --git a/zuul-sample/src/main/java/com/netflix/zuul/sample/push/SamplePushMessageSenderInitializer.java b/zuul-sample/src/main/java/com/netflix/zuul/sample/push/SamplePushMessageSenderInitializer.java index a958390753..8228143ab8 100644 --- a/zuul-sample/src/main/java/com/netflix/zuul/sample/push/SamplePushMessageSenderInitializer.java +++ b/zuul-sample/src/main/java/com/netflix/zuul/sample/push/SamplePushMessageSenderInitializer.java @@ -1,12 +1,12 @@ /** * Copyright 2018 Netflix, Inc. - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -19,7 +19,6 @@ import com.netflix.zuul.netty.server.push.PushMessageSender; import com.netflix.zuul.netty.server.push.PushMessageSenderInitializer; import io.netty.channel.ChannelPipeline; - import javax.inject.Inject; import javax.inject.Singleton;