Reorganize the internal packages (#2452)

Related: #2445 Motivation: As we hide many stuff from our public API, the `internal` package getting more and more crowded. Modifications: - Reorganize the `internal` packages so that the internal classes are always placed `internal.{common,client,server,...}.*`, following the structure of the non-internal classes. Result: - Less cognitive load for devs - Got some room for moving classes to the `internal` packages
line · Feb 5, 2020 · 9061e24 · 9061e24
1 parent 4060d36
commit 9061e24
Show file tree

Hide file tree

Showing 393 changed files with 954 additions and 937 deletions.
diff --git a/benchmarks/src/jmh/java/com/linecorp/armeria/common/QueryStringEncoderBenchmark.java b/benchmarks/src/jmh/java/com/linecorp/armeria/common/QueryStringEncoderBenchmark.java
@@ -28,7 +28,7 @@
 import com.google.common.escape.Escaper;
 import com.google.common.net.UrlEscapers;
 
-import com.linecorp.armeria.internal.TemporaryThreadLocals;
+import com.linecorp.armeria.internal.common.util.TemporaryThreadLocals;
 
 import io.netty.handler.codec.http.QueryStringEncoder;
 

diff --git a/...rmeria/internal/PathParsingBenchmark.java → ...internal/common/PathParsingBenchmark.java b/...rmeria/internal/PathParsingBenchmark.java → ...internal/common/PathParsingBenchmark.java
@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package com.linecorp.armeria.internal;
+package com.linecorp.armeria.internal.common;
 
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Fork;
@@ -34,7 +34,7 @@ public class PathParsingBenchmark {
     private String path2;
 
     @Setup(Level.Invocation)
-    @SuppressWarnings("RedundantStringConstructorCall")
+    @SuppressWarnings("StringOperationCanBeSimplified")
     public void setUp() {
         // Create a new String for paths every time to avoid constant folding.
         path1 = new String("/armeria/services/hello-world");

diff --git a/...metric/RequestMetricSupportBenchmark.java → ...metric/RequestMetricSupportBenchmark.java b/...metric/RequestMetricSupportBenchmark.java → ...metric/RequestMetricSupportBenchmark.java
@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package com.linecorp.armeria.internal.metric;
+package com.linecorp.armeria.internal.common.metric;
 
 import org.openjdk.jmh.annotations.Benchmark;
 

diff --git a/...ernal/HttpTimestampSupplierBenchmark.java → .../util/HttpTimestampSupplierBenchmark.java b/...ernal/HttpTimestampSupplierBenchmark.java → .../util/HttpTimestampSupplierBenchmark.java
@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package com.linecorp.armeria.internal;
+package com.linecorp.armeria.internal.common.util;
 
 import java.time.Clock;
 import java.time.ZonedDateTime;

diff --git a/brave/src/main/java/com/linecorp/armeria/client/brave/ArmeriaHttpClientParser.java b/brave/src/main/java/com/linecorp/armeria/client/brave/ArmeriaHttpClientParser.java
@@ -22,7 +22,7 @@
 import com.linecorp.armeria.common.HttpRequest;
 import com.linecorp.armeria.common.RpcRequest;
 import com.linecorp.armeria.common.logging.RequestLog;
-import com.linecorp.armeria.internal.brave.SpanTags;
+import com.linecorp.armeria.internal.common.brave.SpanTags;
 
 import brave.SpanCustomizer;
 import brave.http.HttpAdapter;

diff --git a/brave/src/main/java/com/linecorp/armeria/client/brave/BraveClient.java b/brave/src/main/java/com/linecorp/armeria/client/brave/BraveClient.java
@@ -16,7 +16,7 @@
 
 package com.linecorp.armeria.client.brave;
 
-import static com.linecorp.armeria.internal.brave.TraceContextUtil.ensureScopeUsesRequestContext;
+import static com.linecorp.armeria.internal.common.brave.TraceContextUtil.ensureScopeUsesRequestContext;
 
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
@@ -34,7 +34,7 @@
 import com.linecorp.armeria.common.RequestHeadersBuilder;
 import com.linecorp.armeria.common.logging.ClientConnectionTimings;
 import com.linecorp.armeria.common.util.SafeCloseable;
-import com.linecorp.armeria.internal.brave.SpanTags;
+import com.linecorp.armeria.internal.common.brave.SpanTags;
 
 import brave.Span;
 import brave.Tracer;

diff --git a/brave/src/main/java/com/linecorp/armeria/client/brave/ClientRequestContextAdapter.java b/brave/src/main/java/com/linecorp/armeria/client/brave/ClientRequestContextAdapter.java
@@ -27,7 +27,7 @@
 import com.linecorp.armeria.common.logging.RequestLog;
 import com.linecorp.armeria.common.logging.RequestLogAccess;
 import com.linecorp.armeria.common.logging.RequestLogProperty;
-import com.linecorp.armeria.internal.brave.SpanContextUtil;
+import com.linecorp.armeria.internal.common.brave.SpanContextUtil;
 
 import brave.http.HttpClientAdapter;
 

diff --git a/brave/src/main/java/com/linecorp/armeria/common/brave/RequestContextCurrentTraceContext.java b/brave/src/main/java/com/linecorp/armeria/common/brave/RequestContextCurrentTraceContext.java
@@ -16,8 +16,8 @@
 
 package com.linecorp.armeria.common.brave;
 
-import static com.linecorp.armeria.internal.brave.TraceContextUtil.setTraceContext;
-import static com.linecorp.armeria.internal.brave.TraceContextUtil.traceContext;
+import static com.linecorp.armeria.internal.common.brave.TraceContextUtil.setTraceContext;
+import static com.linecorp.armeria.internal.common.brave.TraceContextUtil.traceContext;
 
 import java.util.List;
 import java.util.function.Function;
@@ -31,7 +31,7 @@
 
 import com.linecorp.armeria.client.brave.BraveClient;
 import com.linecorp.armeria.common.RequestContext;
-import com.linecorp.armeria.internal.brave.TraceContextUtil;
+import com.linecorp.armeria.internal.common.brave.TraceContextUtil;
 import com.linecorp.armeria.server.brave.BraveService;
 
 import brave.Tracing;

diff --git a/...internal/brave/AsciiStringKeyFactory.java → ...l/common/brave/AsciiStringKeyFactory.java b/...internal/brave/AsciiStringKeyFactory.java → ...l/common/brave/AsciiStringKeyFactory.java
@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package com.linecorp.armeria.internal.brave;
+package com.linecorp.armeria.internal.common.brave;
 
 import com.linecorp.armeria.common.HttpHeaderNames;
 import com.linecorp.armeria.common.HttpHeaders;

diff --git a/...meria/internal/brave/SpanContextUtil.java → ...nternal/common/brave/SpanContextUtil.java b/...meria/internal/brave/SpanContextUtil.java → ...nternal/common/brave/SpanContextUtil.java
@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package com.linecorp.armeria.internal.brave;
+package com.linecorp.armeria.internal.common.brave;
 
 import java.util.concurrent.TimeUnit;
 

diff --git a/...corp/armeria/internal/brave/SpanTags.java → ...meria/internal/common/brave/SpanTags.java b/...corp/armeria/internal/brave/SpanTags.java → ...meria/internal/common/brave/SpanTags.java
@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package com.linecorp.armeria.internal.brave;
+package com.linecorp.armeria.internal.common.brave;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;

diff --git a/...eria/internal/brave/TraceContextUtil.java → ...ternal/common/brave/TraceContextUtil.java b/...eria/internal/brave/TraceContextUtil.java → ...ternal/common/brave/TraceContextUtil.java
@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package com.linecorp.armeria.internal.brave;
+package com.linecorp.armeria.internal.common.brave;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/.../armeria/internal/brave/package-info.java → ...a/internal/common/brave/package-info.java b/.../armeria/internal/brave/package-info.java → ...a/internal/common/brave/package-info.java
@@ -20,6 +20,6 @@
  * <a href="http://zipkin.io/">Zipkin</a>. Anything in this package can be changed or removed at any time.
  */
 @NonNullByDefault
-package com.linecorp.armeria.internal.brave;
+package com.linecorp.armeria.internal.common.brave;
 
 import com.linecorp.armeria.common.util.NonNullByDefault;
diff --git a/brave/src/main/java/com/linecorp/armeria/server/brave/ArmeriaHttpServerParser.java b/brave/src/main/java/com/linecorp/armeria/server/brave/ArmeriaHttpServerParser.java
@@ -18,7 +18,7 @@
 
 import com.linecorp.armeria.common.RpcRequest;
 import com.linecorp.armeria.common.logging.RequestLog;
-import com.linecorp.armeria.internal.brave.SpanTags;
+import com.linecorp.armeria.internal.common.brave.SpanTags;
 import com.linecorp.armeria.server.ServiceRequestContext;
 
 import brave.SpanCustomizer;

diff --git a/brave/src/main/java/com/linecorp/armeria/server/brave/BraveService.java b/brave/src/main/java/com/linecorp/armeria/server/brave/BraveService.java
@@ -16,14 +16,14 @@
 
 package com.linecorp.armeria.server.brave;
 
-import static com.linecorp.armeria.internal.brave.TraceContextUtil.ensureScopeUsesRequestContext;
+import static com.linecorp.armeria.internal.common.brave.TraceContextUtil.ensureScopeUsesRequestContext;
 
 import java.util.function.Function;
 
 import com.linecorp.armeria.common.HttpRequest;
 import com.linecorp.armeria.common.HttpResponse;
 import com.linecorp.armeria.common.util.SafeCloseable;
-import com.linecorp.armeria.internal.brave.SpanTags;
+import com.linecorp.armeria.internal.common.brave.SpanTags;
 import com.linecorp.armeria.server.HttpService;
 import com.linecorp.armeria.server.ServiceRequestContext;
 import com.linecorp.armeria.server.SimpleDecoratingHttpService;

diff --git a/brave/src/main/java/com/linecorp/armeria/server/brave/ServiceRequestContextAdapter.java b/brave/src/main/java/com/linecorp/armeria/server/brave/ServiceRequestContextAdapter.java
@@ -24,8 +24,8 @@
 import com.linecorp.armeria.common.SerializationFormat;
 import com.linecorp.armeria.common.logging.RequestLog;
 import com.linecorp.armeria.common.logging.RequestLogProperty;
-import com.linecorp.armeria.internal.brave.SpanContextUtil;
-import com.linecorp.armeria.internal.brave.SpanTags;
+import com.linecorp.armeria.internal.common.brave.SpanContextUtil;
+import com.linecorp.armeria.internal.common.brave.SpanTags;
 import com.linecorp.armeria.server.Route;
 import com.linecorp.armeria.server.ServiceRequestContext;
 

diff --git a/...rc/test/java/com/linecorp/armeria/common/brave/RequestContextCurrentTraceContextTest.java b/...rc/test/java/com/linecorp/armeria/common/brave/RequestContextCurrentTraceContextTest.java
@@ -31,8 +31,8 @@
 import com.linecorp.armeria.common.HttpRequest;
 import com.linecorp.armeria.common.RequestContext;
 import com.linecorp.armeria.common.util.SafeCloseable;
-import com.linecorp.armeria.internal.brave.TraceContextUtil;
-import com.linecorp.armeria.internal.brave.TraceContextUtil.PingPongExtra;
+import com.linecorp.armeria.internal.common.brave.TraceContextUtil;
+import com.linecorp.armeria.internal.common.brave.TraceContextUtil.PingPongExtra;
 import com.linecorp.armeria.server.ServiceRequestContext;
 
 import brave.propagation.CurrentTraceContext;

diff --git a/core/src/main/java/com/linecorp/armeria/client/ClientOptions.java b/core/src/main/java/com/linecorp/armeria/client/ClientOptions.java
@@ -45,7 +45,7 @@
 import com.linecorp.armeria.common.RequestId;
 import com.linecorp.armeria.common.SessionProtocol;
 import com.linecorp.armeria.common.util.AbstractOptions;
-import com.linecorp.armeria.internal.ArmeriaHttpUtil;
+import com.linecorp.armeria.internal.common.ArmeriaHttpUtil;
 
 import io.netty.handler.codec.http2.HttpConversionUtil.ExtensionHeaderNames;
 import io.netty.util.AsciiString;

diff --git a/core/src/main/java/com/linecorp/armeria/client/ClientRequestContext.java b/core/src/main/java/com/linecorp/armeria/client/ClientRequestContext.java
@@ -17,8 +17,8 @@
 package com.linecorp.armeria.client;
 
 import static com.google.common.base.Preconditions.checkState;
-import static com.linecorp.armeria.internal.RequestContextUtil.newIllegalContextPushingException;
-import static com.linecorp.armeria.internal.RequestContextUtil.noopSafeCloseable;
+import static com.linecorp.armeria.internal.common.RequestContextUtil.newIllegalContextPushingException;
+import static com.linecorp.armeria.internal.common.RequestContextUtil.noopSafeCloseable;
 import static java.util.Objects.requireNonNull;
 
 import java.net.URI;
@@ -43,7 +43,7 @@
 import com.linecorp.armeria.common.RpcRequest;
 import com.linecorp.armeria.common.logging.RequestLog;
 import com.linecorp.armeria.common.util.SafeCloseable;
-import com.linecorp.armeria.internal.RequestContextThreadLocal;
+import com.linecorp.armeria.internal.common.RequestContextThreadLocal;
 import com.linecorp.armeria.server.Service;
 import com.linecorp.armeria.server.ServiceRequestContext;
 

diff --git a/core/src/main/java/com/linecorp/armeria/client/DecodedHttpResponse.java b/core/src/main/java/com/linecorp/armeria/client/DecodedHttpResponse.java
@@ -21,7 +21,7 @@
 import com.linecorp.armeria.common.DefaultHttpResponse;
 import com.linecorp.armeria.common.HttpData;
 import com.linecorp.armeria.common.HttpObject;
-import com.linecorp.armeria.internal.InboundTrafficController;
+import com.linecorp.armeria.internal.common.InboundTrafficController;
 
 import io.netty.channel.EventLoop;
 import io.netty.util.concurrent.EventExecutor;

diff --git a/core/src/main/java/com/linecorp/armeria/client/DefaultClientBuilderParams.java b/core/src/main/java/com/linecorp/armeria/client/DefaultClientBuilderParams.java
@@ -28,7 +28,7 @@
 import com.linecorp.armeria.client.endpoint.EndpointGroup;
 import com.linecorp.armeria.common.Scheme;
 import com.linecorp.armeria.common.SerializationFormat;
-import com.linecorp.armeria.internal.TemporaryThreadLocals;
+import com.linecorp.armeria.internal.common.util.TemporaryThreadLocals;
 
 /**
  * Default {@link ClientBuilderParams} implementation.

diff --git a/core/src/main/java/com/linecorp/armeria/client/DefaultClientRequestContext.java b/core/src/main/java/com/linecorp/armeria/client/DefaultClientRequestContext.java
@@ -54,7 +54,7 @@
 import com.linecorp.armeria.common.logging.RequestLogProperty;
 import com.linecorp.armeria.common.util.ReleasableHolder;
 import com.linecorp.armeria.common.util.UnstableApi;
-import com.linecorp.armeria.internal.TimeoutController;
+import com.linecorp.armeria.internal.common.TimeoutController;
 import com.linecorp.armeria.server.ServiceRequestContext;
 
 import io.micrometer.core.instrument.MeterRegistry;

diff --git a/core/src/main/java/com/linecorp/armeria/client/DefaultWebClient.java b/core/src/main/java/com/linecorp/armeria/client/DefaultWebClient.java
@@ -16,8 +16,8 @@
 
 package com.linecorp.armeria.client;
 
-import static com.linecorp.armeria.internal.ArmeriaHttpUtil.concatPaths;
-import static com.linecorp.armeria.internal.ArmeriaHttpUtil.isAbsoluteUri;
+import static com.linecorp.armeria.internal.common.ArmeriaHttpUtil.concatPaths;
+import static com.linecorp.armeria.internal.common.ArmeriaHttpUtil.isAbsoluteUri;
 
 import java.net.URI;
 
@@ -29,7 +29,7 @@
 import com.linecorp.armeria.common.HttpRequest;
 import com.linecorp.armeria.common.HttpResponse;
 import com.linecorp.armeria.common.logging.RequestLogProperty;
-import com.linecorp.armeria.internal.PathAndQuery;
+import com.linecorp.armeria.internal.common.PathAndQuery;
 
 import io.micrometer.core.instrument.MeterRegistry;
 

diff --git a/core/src/main/java/com/linecorp/armeria/client/DnsResolverGroupBuilder.java b/core/src/main/java/com/linecorp/armeria/client/DnsResolverGroupBuilder.java
@@ -28,7 +28,7 @@
 import com.google.common.collect.ImmutableList;
 
 import com.linecorp.armeria.client.retry.Backoff;
-import com.linecorp.armeria.internal.TransportType;
+import com.linecorp.armeria.internal.common.util.TransportType;
 
 import io.netty.channel.EventLoopGroup;
 import io.netty.resolver.AddressResolver;

diff --git a/core/src/main/java/com/linecorp/armeria/client/Http1ResponseDecoder.java b/core/src/main/java/com/linecorp/armeria/client/Http1ResponseDecoder.java
@@ -25,8 +25,8 @@
 import com.linecorp.armeria.common.ContentTooLargeException;
 import com.linecorp.armeria.common.HttpData;
 import com.linecorp.armeria.common.ProtocolViolationException;
-import com.linecorp.armeria.internal.ArmeriaHttpUtil;
-import com.linecorp.armeria.internal.InboundTrafficController;
+import com.linecorp.armeria.internal.common.ArmeriaHttpUtil;
+import com.linecorp.armeria.internal.common.InboundTrafficController;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;

diff --git a/core/src/main/java/com/linecorp/armeria/client/Http2ClientConnectionHandler.java b/core/src/main/java/com/linecorp/armeria/client/Http2ClientConnectionHandler.java
@@ -16,7 +16,7 @@
 
 package com.linecorp.armeria.client;
 
-import com.linecorp.armeria.internal.AbstractHttp2ConnectionHandler;
+import com.linecorp.armeria.internal.common.AbstractHttp2ConnectionHandler;
 
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;

diff --git a/core/src/main/java/com/linecorp/armeria/client/Http2ClientConnectionHandlerBuilder.java b/core/src/main/java/com/linecorp/armeria/client/Http2ClientConnectionHandlerBuilder.java
@@ -15,7 +15,7 @@
  */
 package com.linecorp.armeria.client;
 
-import com.linecorp.armeria.internal.AbstractHttp2ConnectionHandlerBuilder;
+import com.linecorp.armeria.internal.common.AbstractHttp2ConnectionHandlerBuilder;
 
 import io.netty.channel.Channel;
 import io.netty.handler.codec.http2.Http2ConnectionDecoder;

diff --git a/core/src/main/java/com/linecorp/armeria/client/Http2ResponseDecoder.java b/core/src/main/java/com/linecorp/armeria/client/Http2ResponseDecoder.java
@@ -28,9 +28,9 @@
 import com.linecorp.armeria.common.ClosedSessionException;
 import com.linecorp.armeria.common.ContentTooLargeException;
 import com.linecorp.armeria.common.HttpHeaders;
-import com.linecorp.armeria.internal.ArmeriaHttpUtil;
-import com.linecorp.armeria.internal.Http2GoAwayHandler;
-import com.linecorp.armeria.internal.InboundTrafficController;
+import com.linecorp.armeria.internal.common.ArmeriaHttpUtil;
+import com.linecorp.armeria.internal.common.Http2GoAwayHandler;
+import com.linecorp.armeria.internal.common.InboundTrafficController;
 import com.linecorp.armeria.unsafe.ByteBufHttpData;
 
 import io.netty.buffer.ByteBuf;

diff --git a/core/src/main/java/com/linecorp/armeria/client/HttpClientDelegate.java b/core/src/main/java/com/linecorp/armeria/client/HttpClientDelegate.java
@@ -34,8 +34,8 @@
 import com.linecorp.armeria.common.logging.ClientConnectionTimingsBuilder;
 import com.linecorp.armeria.common.logging.RequestLogBuilder;
 import com.linecorp.armeria.common.util.SafeCloseable;
-import com.linecorp.armeria.internal.PathAndQuery;
-import com.linecorp.armeria.internal.RequestContextUtil;
+import com.linecorp.armeria.internal.common.PathAndQuery;
+import com.linecorp.armeria.internal.common.RequestContextUtil;
 
 import io.netty.channel.Channel;
 import io.netty.channel.EventLoop;

diff --git a/core/src/main/java/com/linecorp/armeria/client/HttpClientFactory.java b/core/src/main/java/com/linecorp/armeria/client/HttpClientFactory.java
@@ -43,7 +43,7 @@
 import com.linecorp.armeria.common.SessionProtocol;
 import com.linecorp.armeria.common.util.AsyncCloseableSupport;
 import com.linecorp.armeria.common.util.ReleasableHolder;
-import com.linecorp.armeria.internal.TransportType;
+import com.linecorp.armeria.internal.common.util.TransportType;
 
 import io.micrometer.core.instrument.MeterRegistry;
 import io.netty.bootstrap.Bootstrap;

diff --git a/core/src/main/java/com/linecorp/armeria/client/HttpClientIdleTimeoutHandler.java b/core/src/main/java/com/linecorp/armeria/client/HttpClientIdleTimeoutHandler.java
@@ -16,7 +16,7 @@
 
 package com.linecorp.armeria.client;
 
-import com.linecorp.armeria.internal.IdleTimeoutHandler;
+import com.linecorp.armeria.internal.common.IdleTimeoutHandler;
 
 import io.netty.channel.ChannelHandlerContext;
 

diff --git a/core/src/main/java/com/linecorp/armeria/client/HttpClientPipelineConfigurator.java b/core/src/main/java/com/linecorp/armeria/client/HttpClientPipelineConfigurator.java
@@ -47,11 +47,11 @@
 import com.linecorp.armeria.common.HttpObject;
 import com.linecorp.armeria.common.SessionProtocol;
 import com.linecorp.armeria.common.util.Exceptions;
-import com.linecorp.armeria.internal.ChannelUtil;
-import com.linecorp.armeria.internal.Http1ClientCodec;
-import com.linecorp.armeria.internal.ReadSuppressingHandler;
-import com.linecorp.armeria.internal.SslContextUtil;
-import com.linecorp.armeria.internal.TrafficLoggingHandler;
+import com.linecorp.armeria.internal.client.Http1ClientCodec;
+import com.linecorp.armeria.internal.common.ReadSuppressingHandler;
+import com.linecorp.armeria.internal.common.TrafficLoggingHandler;
+import com.linecorp.armeria.internal.common.util.ChannelUtil;
+import com.linecorp.armeria.internal.common.util.SslContextUtil;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;

diff --git a/core/src/main/java/com/linecorp/armeria/client/HttpRequestSubscriber.java b/core/src/main/java/com/linecorp/armeria/client/HttpRequestSubscriber.java
@@ -45,8 +45,8 @@
 import com.linecorp.armeria.common.stream.ClosedPublisherException;
 import com.linecorp.armeria.common.util.Exceptions;
 import com.linecorp.armeria.common.util.SafeCloseable;
-import com.linecorp.armeria.internal.HttpObjectEncoder;
-import com.linecorp.armeria.internal.RequestContextUtil;
+import com.linecorp.armeria.internal.common.HttpObjectEncoder;
+import com.linecorp.armeria.internal.common.RequestContextUtil;
 
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;

diff --git a/core/src/main/java/com/linecorp/armeria/client/HttpResponseDecoder.java b/core/src/main/java/com/linecorp/armeria/client/HttpResponseDecoder.java
@@ -35,8 +35,8 @@
 import com.linecorp.armeria.common.stream.CancelledSubscriptionException;
 import com.linecorp.armeria.common.stream.StreamWriter;
 import com.linecorp.armeria.common.util.Exceptions;
-import com.linecorp.armeria.internal.DefaultTimeoutController;
-import com.linecorp.armeria.internal.InboundTrafficController;
+import com.linecorp.armeria.internal.common.DefaultTimeoutController;
+import com.linecorp.armeria.internal.common.InboundTrafficController;
 
 import io.netty.channel.Channel;
 import io.netty.channel.EventLoop;

diff --git a/core/src/main/java/com/linecorp/armeria/client/HttpSession.java b/core/src/main/java/com/linecorp/armeria/client/HttpSession.java
@@ -21,7 +21,7 @@
 import com.linecorp.armeria.common.ClosedSessionException;
 import com.linecorp.armeria.common.HttpRequest;
 import com.linecorp.armeria.common.SessionProtocol;
-import com.linecorp.armeria.internal.InboundTrafficController;
+import com.linecorp.armeria.internal.common.InboundTrafficController;
 
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandler;