Drop NettyWebSocketFactory, close AsyncHttpClient#988

Author: slandelle

client/src/main/java/org/asynchttpclient/AsyncHttpClientConfig.java

@@ -1,7 +1,6 @@
 package org.asynchttpclient;
 
 import io.netty.buffer.ByteBuf;
-import io.netty.channel.Channel;
 import io.netty.channel.ChannelOption;
 import io.netty.channel.ChannelPipeline;
 import io.netty.channel.EventLoopGroup;
@@ -22,7 +21,6 @@
 import org.asynchttpclient.netty.LazyNettyResponseBodyPart;
 import org.asynchttpclient.netty.NettyResponseBodyPart;
 import org.asynchttpclient.netty.channel.pool.ChannelPool;
-import org.asynchttpclient.netty.ws.NettyWebSocket;
 import org.asynchttpclient.proxy.ProxyServer;
 import org.asynchttpclient.proxy.ProxyServerSelector;
 
@@ -291,8 +289,6 @@ public interface AsyncHttpClientConfig {
 
  Timer getNettyTimer();
 
- NettyWebSocketFactory getNettyWebSocketFactory();
-
  KeepAliveStrategy getKeepAliveStrategy();
 
  interface AdditionalPipelineInitializer {
@@ -319,19 +315,4 @@ public NettyResponseBodyPart newResponseBodyPart(ByteBuf buf, boolean last) {
 
  public abstract NettyResponseBodyPart newResponseBodyPart(ByteBuf buf, boolean last);
  }
-
- interface NettyWebSocketFactory {
-
- NettyWebSocket newNettyWebSocket(Channel channel, AsyncHttpClientConfig config);
-
- enum DefaultNettyWebSocketFactory implements NettyWebSocketFactory {
-
- INSTANCE;
-
- @Override
- public NettyWebSocket newNettyWebSocket(Channel channel, AsyncHttpClientConfig config) {
- return new NettyWebSocket(channel, config);
- }
- }
- }
 }

client/src/main/java/org/asynchttpclient/DefaultAsyncHttpClientConfig.java

@@ -121,7 +121,6 @@ public class DefaultAsyncHttpClientConfig implements AsyncHttpClientConfig {
  private final boolean preferNative;
  private final Timer nettyTimer;
  private final ThreadFactory threadFactory;
- private final NettyWebSocketFactory nettyWebSocketFactory;
  private final AdditionalPipelineInitializer httpAdditionalPipelineInitializer;
  private final AdditionalPipelineInitializer wsAdditionalPipelineInitializer;
  private final ResponseBodyPartFactory responseBodyPartFactory;
@@ -185,7 +184,6 @@ private DefaultAsyncHttpClientConfig(//
  boolean preferNative,//
  Timer nettyTimer,//
  ThreadFactory threadFactory,//
- NettyWebSocketFactory nettyWebSocketFactory,//
  AdditionalPipelineInitializer httpAdditionalPipelineInitializer,//
  AdditionalPipelineInitializer wsAdditionalPipelineInitializer,//
  ResponseBodyPartFactory responseBodyPartFactory) {
@@ -248,7 +246,6 @@ private DefaultAsyncHttpClientConfig(//
  this.preferNative = preferNative;
  this.nettyTimer = nettyTimer;
  this.threadFactory = threadFactory;
- this.nettyWebSocketFactory = nettyWebSocketFactory;
  this.httpAdditionalPipelineInitializer = httpAdditionalPipelineInitializer;
  this.wsAdditionalPipelineInitializer = wsAdditionalPipelineInitializer;
  this.responseBodyPartFactory = responseBodyPartFactory;
@@ -501,11 +498,6 @@ public ThreadFactory getThreadFactory() {
  return threadFactory;
  }
 
- @Override
- public NettyWebSocketFactory getNettyWebSocketFactory() {
- return nettyWebSocketFactory;
- }
-
  @Override
  public AdditionalPipelineInitializer getHttpAdditionalPipelineInitializer() {
  return httpAdditionalPipelineInitializer;
@@ -586,7 +578,6 @@ public static class Builder {
  private boolean preferNative;
  private Timer nettyTimer;
  private ThreadFactory threadFactory;
- private NettyWebSocketFactory nettyWebSocketFactory = NettyWebSocketFactory.DefaultNettyWebSocketFactory.INSTANCE;
  private AdditionalPipelineInitializer httpAdditionalPipelineInitializer;
  private AdditionalPipelineInitializer wsAdditionalPipelineInitializer;
  private ResponseBodyPartFactory responseBodyPartFactory = ResponseBodyPartFactory.EAGER;
@@ -653,7 +644,6 @@ public Builder(AsyncHttpClientConfig config) {
  preferNative = config.isPreferNative();
  nettyTimer = config.getNettyTimer();
  threadFactory = config.getThreadFactory();
- nettyWebSocketFactory = config.getNettyWebSocketFactory();
  httpAdditionalPipelineInitializer = config.getHttpAdditionalPipelineInitializer();
  wsAdditionalPipelineInitializer = config.getWsAdditionalPipelineInitializer();
  responseBodyPartFactory = config.getResponseBodyPartFactory();
@@ -941,11 +931,6 @@ public Builder setThreadFactory(ThreadFactory threadFactory) {
  return this;
  }
 
- public Builder setNettyWebSocketFactory(NettyWebSocketFactory nettyWebSocketFactory) {
- this.nettyWebSocketFactory = nettyWebSocketFactory;
- return this;
- }
-
  public Builder setHttpAdditionalPipelineInitializer(AdditionalPipelineInitializer httpAdditionalPipelineInitializer) {
  this.httpAdditionalPipelineInitializer = httpAdditionalPipelineInitializer;
  return this;
@@ -1024,7 +1009,6 @@ public DefaultAsyncHttpClientConfig build() {
  preferNative, //
  nettyTimer, //
  threadFactory, //
- nettyWebSocketFactory, //
  httpAdditionalPipelineInitializer, //
  wsAdditionalPipelineInitializer, //
  responseBodyPartFactory);

client/src/main/java/org/asynchttpclient/netty/handler/WebSocketProtocol.java

@@ -59,7 +59,7 @@ public WebSocketProtocol(ChannelManager channelManager,//
  private void invokeOnSucces(Channel channel, WebSocketUpgradeHandler h) {
  if (!h.touchSuccess()) {
  try {
- h.onSuccess(config.getNettyWebSocketFactory().newNettyWebSocket(channel, config));
+ h.onSuccess(new NettyWebSocket(channel, config));
  } catch (Exception ex) {
  logger.warn("onSuccess unexpected exception", ex);
  }