Skip to content

Commit 556d610

Browse files
silence-codingsilence-coding
committed
Code optimization
2 parents 56da156 + 677c43f commit 556d610

File tree

12 files changed

+134
-105
lines changed

12 files changed

+134
-105
lines changed

‎client/src/main/java/org/asynchttpclient/DefaultRequest.java‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import java.io.File;
2727
import java.io.InputStream;
2828
import java.net.InetAddress;
29+
import java.net.InetSocketAddress;
2930
import java.net.SocketAddress;
3031
import java.nio.ByteBuffer;
3132
import java.nio.charset.Charset;
@@ -137,12 +138,28 @@ public Uri getUri() {
137138
}
138139

139140
@Override
140-
public SocketAddress getAddress() {
141+
public InetAddress getAddress() {
142+
if (!(address instanceof InetSocketAddress)) {
143+
throw new IllegalArgumentException("address can't cast to InetAddress, please use the method of getSocketAddress");
144+
}
145+
return ((InetSocketAddress) address).getAddress();
146+
}
147+
148+
@Override
149+
public InetAddress getLocalAddress() {
150+
if (!(localAddress instanceof InetSocketAddress)) {
151+
throw new IllegalArgumentException("localAddress can't cast to InetAddress, please use the method of getLocalSocketAddress");
152+
}
153+
return ((InetSocketAddress) localAddress).getAddress();
154+
}
155+
156+
@Override
157+
public SocketAddress getSocketAddress() {
141158
return address;
142159
}
143160

144161
@Override
145-
public SocketAddress getLocalAddress() {
162+
public SocketAddress getLocalSocketAddress() {
146163
return localAddress;
147164
}
148165

‎client/src/main/java/org/asynchttpclient/Request.java‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,24 @@ public interface Request {
6464
String getUrl();
6565

6666
/**
67-
* @return the SocketAddress to be used to bypass uri's hostname or unix domain path resolution
67+
* @return the InetAddress to be used to bypass uri's hostname or unix domain path resolution
68+
*/
69+
InetAddress getAddress();
70+
71+
/**
72+
* @return the local address to bind from
6873
*/
69-
SocketAddress getAddress();
74+
InetAddress getLocalAddress();
7075

7176
/**
7277
* @return the local address to bind from
7378
*/
74-
SocketAddress getLocalAddress();
79+
SocketAddress getLocalSocketAddress();
80+
81+
/**
82+
* @return the SocketAddress to be used to bypass uri's hostname or unix domain path resolution
83+
*/
84+
SocketAddress getSocketAddress();
7585

7686
/**
7787
* @return the HTTP headers

‎client/src/main/java/org/asynchttpclient/RequestBuilderBase.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ protected RequestBuilderBase(Request prototype, boolean disableUrlEncoding, bool
112112
this.method = prototype.getMethod();
113113
this.uriEncoder = UriEncoder.uriEncoder(disableUrlEncoding);
114114
this.uri = prototype.getUri();
115-
this.address = prototype.getAddress();
116-
this.localAddress = prototype.getLocalAddress();
115+
this.address = prototype.getSocketAddress();
116+
this.localAddress = prototype.getLocalSocketAddress();
117117
this.headers = new DefaultHttpHeaders(validateHeaders);
118118
this.headers.add(prototype.getHeaders());
119119
if (isNonEmpty(prototype.getCookies())) {
@@ -151,9 +151,6 @@ private T asDerivedType() {
151151
}
152152

153153
public T setUrl(String url) {
154-
if (!url.contains("://")){
155-
url = "http://127.0.0.1:80" + url;
156-
}
157154
return setUri(Uri.create(url));
158155
}
159156

‎client/src/main/java/org/asynchttpclient/netty/channel/ChannelManager.java‎

Lines changed: 30 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import io.netty.resolver.NameResolver;
3939
import io.netty.util.Timer;
4040
import io.netty.util.concurrent.*;
41-
import io.netty.util.internal.StringUtil;
41+
import io.netty.util.internal.PlatformDependent;
4242
import org.asynchttpclient.*;
4343
import org.asynchttpclient.channel.ChannelPool;
4444
import org.asynchttpclient.channel.ChannelPoolPartitioning;
@@ -52,7 +52,6 @@
5252
import org.asynchttpclient.netty.ssl.DefaultSslEngineFactory;
5353
import org.asynchttpclient.proxy.ProxyServer;
5454
import org.asynchttpclient.uri.Uri;
55-
import org.asynchttpclient.util.StringUtils;
5655
import org.slf4j.Logger;
5756
import org.slf4j.LoggerFactory;
5857

@@ -126,11 +125,7 @@ public ChannelManager(final AsyncHttpClientConfig config, Timer nettyTimer) {
126125
TransportFactory<? extends Channel, ? extends EventLoopGroup> transportFactory;
127126
if (allowReleaseEventLoopGroup) {
128127
if (config.isUseNativeTransport()) {
129-
if (config.isUseUnixDomain()){
130-
transportFactory = getDomainTransportFactory();
131-
}else {
132-
transportFactory = getNativeTransportFactory();
133-
}
128+
transportFactory = config.isUseUnixDomain() ? getDomainTransportFactory() : getNativeTransportFactory();
134129
} else {
135130
transportFactory = NioTransportFactory.INSTANCE;
136131
}
@@ -145,17 +140,9 @@ public ChannelManager(final AsyncHttpClientConfig config, Timer nettyTimer) {
145140
}
146141
transportFactory = NioTransportFactory.INSTANCE;
147142
} else if (eventLoopGroup instanceof EpollEventLoopGroup) {
148-
if (config.isUseUnixDomain()){
149-
transportFactory = new EpollDomainTransportFactory();
150-
}else {
151-
transportFactory = new EpollTransportFactory();
152-
}
143+
transportFactory = config.isUseUnixDomain() ? new EpollDomainTransportFactory() : new EpollTransportFactory();
153144
} else if (eventLoopGroup instanceof KQueueEventLoopGroup) {
154-
if (config.isUseUnixDomain()){
155-
transportFactory = new KQueueDomainTransportFactory();
156-
}else {
157-
transportFactory = new KQueueTransportFactory();
158-
}
145+
transportFactory = config.isUseUnixDomain()? new KQueueDomainTransportFactory():new KQueueTransportFactory();
159146
} else {
160147
throw new IllegalArgumentException("Unknown event loop group " + eventLoopGroup.getClass().getSimpleName());
161148
}
@@ -205,27 +192,33 @@ private Bootstrap newBootstrap(ChannelFactory<? extends Channel> channelFactory,
205192

206193
@SuppressWarnings("unchecked")
207194
private TransportFactory<? extends Channel, ? extends EventLoopGroup> getNativeTransportFactory() {
208-
try {
209-
return (TransportFactory<? extends Channel, ? extends EventLoopGroup>) Class.forName("org.asynchttpclient.netty.channel.EpollTransportFactory").newInstance();
210-
} catch (Exception e) {
211-
try {
212-
return (TransportFactory<? extends Channel, ? extends EventLoopGroup>) Class.forName("org.asynchttpclient.netty.channel.KQueueTransportFactory").newInstance();
213-
} catch (Exception e1) {
214-
throw new IllegalArgumentException("No suitable native transport (epoll or kqueue) available");
215-
}
195+
String nativeTransportFactoryClassName = null;
196+
if (PlatformDependent.isOsx()) {
197+
nativeTransportFactoryClassName = "org.asynchttpclient.netty.channel.KQueueTransportFactory";
198+
} else if (!PlatformDependent.isWindows()) {
199+
nativeTransportFactoryClassName = "org.asynchttpclient.netty.channel.EpollTransportFactory";
216200
}
201+
return loadNativeTransportFactory(nativeTransportFactoryClassName);
217202
}
218203

219-
private TransportFactory<? extends Channel, ? extends EventLoopGroup> getDomainTransportFactory() {
204+
private TransportFactory<? extends Channel, ? extends EventLoopGroup> loadNativeTransportFactory(String nativeTransportFactoryClassName) {
220205
try {
221-
return (TransportFactory<? extends Channel, ? extends EventLoopGroup>) Class.forName("org.asynchttpclient.netty.channel.EpollDomainTransportFactory").newInstance();
222-
} catch (Exception e) {
223-
try {
224-
return (TransportFactory<? extends Channel, ? extends EventLoopGroup>) Class.forName("org.asynchttpclient.netty.channel.KQueueDomainTransportFactory").newInstance();
225-
} catch (Exception e1) {
226-
throw new IllegalArgumentException("No suitable native transport (epoll or kqueue) available");
206+
if (nativeTransportFactoryClassName != null) {
207+
return (TransportFactory<? extends Channel, ? extends EventLoopGroup>) Class.forName(nativeTransportFactoryClassName).newInstance();
227208
}
209+
} catch (Exception e) {
210+
e.printStackTrace();
211+
}
212+
throw new IllegalArgumentException("No suitable native transport available");
213+
}
214+
private TransportFactory<? extends Channel, ? extends EventLoopGroup> getDomainTransportFactory() {
215+
String nativeTransportFactoryClassName = null;
216+
if (PlatformDependent.isOsx()) {
217+
nativeTransportFactoryClassName = "org.asynchttpclient.netty.channel.KQueueDomainTransportFactory";
218+
} else if (!PlatformDependent.isWindows()) {
219+
nativeTransportFactoryClassName = "org.asynchttpclient.netty.channel.EpollDomainTransportFactory";
228220
}
221+
return loadNativeTransportFactory(nativeTransportFactoryClassName);
229222
}
230223

231224
public void configureBootstraps(NettyRequestSender requestSender) {
@@ -382,6 +375,11 @@ public Future<Channel> updatePipelineForHttpTunneling(ChannelPipeline pipeline,
382375

383376
if (requestUri.isWebSocket()) {
384377
pipeline.addAfter(AHC_HTTP_HANDLER, AHC_WS_HANDLER, wsHandler);
378+
379+
if (config.isEnableWebSocketCompression()) {
380+
pipeline.addBefore(AHC_WS_HANDLER, WS_COMPRESSOR_HANDLER, WebSocketClientCompressionHandler.INSTANCE);
381+
}
382+
385383
pipeline.remove(AHC_HTTP_HANDLER);
386384
}
387385
return whenHanshaked;

‎client/src/main/java/org/asynchttpclient/netty/channel/EpollDomainTransportFactory.java‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,16 @@
1313
*/
1414
package org.asynchttpclient.netty.channel;
1515

16-
import io.netty.channel.epoll.Epoll;
1716
import io.netty.channel.epoll.EpollDomainSocketChannel;
1817
import io.netty.channel.epoll.EpollEventLoopGroup;
18+
import org.asynchttpclient.util.ReflectionUtil;
1919

2020
import java.util.concurrent.ThreadFactory;
2121

2222
class EpollDomainTransportFactory implements TransportFactory<EpollDomainSocketChannel, EpollEventLoopGroup> {
2323

2424
EpollDomainTransportFactory() {
25-
try {
26-
Class.forName("io.netty.channel.epoll.Epoll");
27-
} catch (ClassNotFoundException e) {
28-
throw new IllegalStateException("The epoll transport is not available");
29-
}
30-
if (!Epoll.isAvailable()) {
31-
throw new IllegalStateException("The epoll transport is not supported");
32-
}
25+
ReflectionUtil.loadEpollClass();
3326
}
3427

3528
@Override

‎client/src/main/java/org/asynchttpclient/netty/channel/EpollTransportFactory.java‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,16 @@
1313
*/
1414
package org.asynchttpclient.netty.channel;
1515

16-
import io.netty.channel.epoll.Epoll;
1716
import io.netty.channel.epoll.EpollEventLoopGroup;
1817
import io.netty.channel.epoll.EpollSocketChannel;
18+
import org.asynchttpclient.util.ReflectionUtil;
1919

2020
import java.util.concurrent.ThreadFactory;
2121

2222
class EpollTransportFactory implements TransportFactory<EpollSocketChannel, EpollEventLoopGroup> {
2323

2424
EpollTransportFactory() {
25-
try {
26-
Class.forName("io.netty.channel.epoll.Epoll");
27-
} catch (ClassNotFoundException e) {
28-
throw new IllegalStateException("The epoll transport is not available");
29-
}
30-
if (!Epoll.isAvailable()) {
31-
throw new IllegalStateException("The epoll transport is not supported");
32-
}
25+
ReflectionUtil.loadEpollClass();
3326
}
3427

3528
@Override

‎client/src/main/java/org/asynchttpclient/netty/channel/KQueueDomainTransportFactory.java‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,16 @@
1313
*/
1414
package org.asynchttpclient.netty.channel;
1515

16-
import io.netty.channel.kqueue.KQueue;
1716
import io.netty.channel.kqueue.KQueueDomainSocketChannel;
1817
import io.netty.channel.kqueue.KQueueEventLoopGroup;
18+
import org.asynchttpclient.util.ReflectionUtil;
1919

2020
import java.util.concurrent.ThreadFactory;
2121

2222
class KQueueDomainTransportFactory implements TransportFactory<KQueueDomainSocketChannel, KQueueEventLoopGroup> {
2323

2424
KQueueDomainTransportFactory() {
25-
try {
26-
Class.forName("io.netty.channel.kqueue.KQueue");
27-
} catch (ClassNotFoundException e) {
28-
throw new IllegalStateException("The kqueue transport is not available");
29-
}
30-
if (!KQueue.isAvailable()) {
31-
throw new IllegalStateException("The kqueue transport is not supported");
32-
}
25+
ReflectionUtil.loadKQueueClass();
3326
}
3427

3528
@Override

‎client/src/main/java/org/asynchttpclient/netty/channel/KQueueTransportFactory.java‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,16 @@
1313
*/
1414
package org.asynchttpclient.netty.channel;
1515

16-
import io.netty.channel.kqueue.KQueue;
1716
import io.netty.channel.kqueue.KQueueEventLoopGroup;
1817
import io.netty.channel.kqueue.KQueueSocketChannel;
18+
import org.asynchttpclient.util.ReflectionUtil;
1919

2020
import java.util.concurrent.ThreadFactory;
2121

2222
class KQueueTransportFactory implements TransportFactory<KQueueSocketChannel, KQueueEventLoopGroup> {
2323

2424
KQueueTransportFactory() {
25-
try {
26-
Class.forName("io.netty.channel.kqueue.KQueue");
27-
} catch (ClassNotFoundException e) {
28-
throw new IllegalStateException("The kqueue transport is not available");
29-
}
30-
if (!KQueue.isAvailable()) {
31-
throw new IllegalStateException("The kqueue transport is not supported");
32-
}
25+
ReflectionUtil.loadKQueueClass();
3326
}
3427

3528
@Override

‎client/src/main/java/org/asynchttpclient/netty/handler/intercept/Redirect30xInterceptor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public boolean exitAfterHandlingRedirect(Channel channel,
9393
final RequestBuilder requestBuilder = new RequestBuilder(switchToGet ? GET : originalMethod)
9494
.setChannelPoolPartitioning(request.getChannelPoolPartitioning())
9595
.setFollowRedirect(true)
96-
.setLocalAddress(request.getLocalAddress())
96+
.setLocalAddress(request.getLocalSocketAddress())
9797
.setNameResolver(request.getNameResolver())
9898
.setDomainNameResolver(request.getDomainNameResolver())
9999
.setProxyServer(request.getProxyServer())

‎client/src/main/java/org/asynchttpclient/netty/request/NettyRequestSender.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ private <T> ListenableFuture<T> sendRequestWithNewChannel(Request request,
306306
protected void onSuccess(List<DomainSocketAddress> addresses) {
307307
NettyConnectListener<T> connectListener = new NettyConnectListener<>(future,
308308
NettyRequestSender.this, channelManager, connectionSemaphore);
309-
NettyChannelConnector connector = new NettyChannelConnector(request.getLocalAddress(),
309+
NettyChannelConnector connector = new NettyChannelConnector(request.getLocalSocketAddress(),
310310
addresses, asyncHandler, clientState);
311311
if (!future.isDone()) {
312312
// Do not throw an exception when we need an extra connection for a redirect
@@ -335,7 +335,7 @@ protected void onFailure(Throwable cause) {
335335
protected void onSuccess(List<InetSocketAddress> addresses) {
336336
NettyConnectListener<T> connectListener = new NettyConnectListener<>(future,
337337
NettyRequestSender.this, channelManager, connectionSemaphore);
338-
NettyChannelConnector connector = new NettyChannelConnector(request.getLocalAddress(),
338+
NettyChannelConnector connector = new NettyChannelConnector(request.getLocalSocketAddress(),
339339
addresses, asyncHandler, clientState);
340340
if (!future.isDone()) {
341341
// Do not throw an exception when we need an extra connection for a redirect
@@ -381,9 +381,9 @@ private <T> Future<List<InetSocketAddress>> resolveAddresses(Request request,
381381
InetSocketAddress unresolvedRemoteAddress = InetSocketAddress.createUnresolved(uri.getHost(), port);
382382
scheduleRequestTimeout(future, unresolvedRemoteAddress);
383383

384-
if (request.getAddress() != null) {
384+
if (request.getSocketAddress() != null) {
385385
// bypass resolution
386-
InetSocketAddress address = (InetSocketAddress) request.getAddress();
386+
InetSocketAddress address = (InetSocketAddress) request.getSocketAddress();
387387
if (address.getPort() != port){
388388
address = new InetSocketAddress(address.getAddress(), port);
389389
}
@@ -403,7 +403,7 @@ private <T> Future<List<DomainSocketAddress>> resolveDomainAddresses(Request req
403403
} else {
404404
DomainSocketAddress socketAddress = new DomainSocketAddress(config.getUnixSocket());
405405
scheduleRequestTimeout(future, socketAddress);
406-
SocketAddress address = request.getAddress();
406+
SocketAddress address = request.getSocketAddress();
407407
if (address != null) {
408408
final Promise<List<DomainSocketAddress>> promise = ImmediateEventExecutor.INSTANCE.newPromise();
409409
if (!(address instanceof DomainSocketAddress)){

0 commit comments

Comments
 (0)