Rename Netty response elements

Author: Stephane Landelle

src/main/java/com/ning/http/client/providers/netty/handler/HttpProtocol.java

@@ -45,9 +45,9 @@
 import com.ning.http.client.providers.netty.channel.Channels;
 import com.ning.http.client.providers.netty.future.NettyResponseFuture;
 import com.ning.http.client.providers.netty.request.NettyRequestSender;
-import com.ning.http.client.providers.netty.response.ResponseBodyPart;
-import com.ning.http.client.providers.netty.response.ResponseHeaders;
-import com.ning.http.client.providers.netty.response.ResponseStatus;
+import com.ning.http.client.providers.netty.response.NettyResponseBodyPart;
+import com.ning.http.client.providers.netty.response.NettyResponseHeaders;
+import com.ning.http.client.providers.netty.response.NettyResponseStatus;
 import com.ning.http.client.providers.netty.spnego.SpnegoEngine;
 import com.ning.http.client.uri.UriComponents;
 
@@ -170,7 +170,7 @@ private void finishUpdate(final NettyResponseFuture<?> future, Channel channel,
         markAsDone(future, channel);
     }
 
-    private boolean updateBodyAndInterrupt(NettyResponseFuture<?> future, AsyncHandler<?> handler, ResponseBodyPart bodyPart)
+    private boolean updateBodyAndInterrupt(NettyResponseFuture<?> future, AsyncHandler<?> handler, NettyResponseBodyPart bodyPart)
             throws Exception {
         boolean interrupt = handler.onBodyPartReceived(bodyPart) != STATE.CONTINUE;
         if (bodyPart.isUnderlyingConnectionToBeClosed())
@@ -353,7 +353,7 @@ private boolean exitAfterHandlingConnect(//
     }
 
     private boolean exitAfterHandlingStatus(Channel channel, NettyResponseFuture<?> future, HttpResponse response,
-            AsyncHandler<?> handler, ResponseStatus status) throws IOException, Exception {
+            AsyncHandler<?> handler, NettyResponseStatus status) throws IOException, Exception {
         if (!future.getAndSetStatusReceived(true) && handler.onStatusReceived(status) != STATE.CONTINUE) {
             finishUpdate(future, channel, HttpHeaders.isTransferEncodingChunked(response));
             return true;
@@ -362,7 +362,7 @@ private boolean exitAfterHandlingStatus(Channel channel, NettyResponseFuture<?>
     }
 
     private boolean exitAfterHandlingHeaders(Channel channel, NettyResponseFuture<?> future, HttpResponse response,
-            AsyncHandler<?> handler, ResponseHeaders responseHeaders) throws IOException, Exception {
+            AsyncHandler<?> handler, NettyResponseHeaders responseHeaders) throws IOException, Exception {
         if (!response.headers().isEmpty() && handler.onHeadersReceived(responseHeaders) != STATE.CONTINUE) {
             finishUpdate(future, channel, HttpHeaders.isTransferEncodingChunked(response));
             return true;
@@ -377,7 +377,7 @@ private boolean exitAfterHandlingBody(Channel channel, NettyResponseFuture<?> fu
             // no chunks expected, exiting
             if (response.getContent().readableBytes() > 0)
                 // FIXME no need to notify an empty bodypart?
-                updateBodyAndInterrupt(future, handler, new ResponseBodyPart(response, null, true));
+                updateBodyAndInterrupt(future, handler, new NettyResponseBodyPart(response, null, true));
             finishUpdate(future, channel, false);
             return true;
         }
@@ -399,11 +399,11 @@ private boolean handleHttpResponse(final HttpResponse response,//
 
         future.setKeepAlive(!HttpHeaders.Values.CLOSE.equalsIgnoreCase(response.headers().get(HttpHeaders.Names.CONNECTION)));
 
-        ResponseStatus status = new ResponseStatus(future.getURI(), config, response);
+        NettyResponseStatus status = new NettyResponseStatus(future.getURI(), config, response);
         int statusCode = response.getStatus().getCode();
         Request request = future.getRequest();
         Realm realm = request.getRealm() != null ? request.getRealm() : config.getRealm();
-        ResponseHeaders responseHeaders = new ResponseHeaders(response.headers());
+        NettyResponseHeaders responseHeaders = new NettyResponseHeaders(response.headers());
 
         return exitAfterProcessingFilters(channel, future, handler, status, responseHeaders)
                 || exitAfterHandling401(channel, future, response, request, statusCode, realm, proxyServer) || //
@@ -423,13 +423,13 @@ private void handleChunk(HttpChunk chunk,//
 
         boolean last = chunk.isLast();
         // we don't notify updateBodyAndInterrupt with the last chunk as it's empty
-        if (last || updateBodyAndInterrupt(future, handler, new ResponseBodyPart(null, chunk, last))) {
+        if (last || updateBodyAndInterrupt(future, handler, new NettyResponseBodyPart(null, chunk, last))) {
 
             // only possible if last is true
             if (chunk instanceof HttpChunkTrailer) {
                 HttpChunkTrailer chunkTrailer = (HttpChunkTrailer) chunk;
                 if (!chunkTrailer.trailingHeaders().isEmpty()) {
-                    ResponseHeaders responseHeaders = new ResponseHeaders(future.getHttpHeaders(), chunkTrailer.trailingHeaders());
+                    NettyResponseHeaders responseHeaders = new NettyResponseHeaders(future.getHttpHeaders(), chunkTrailer.trailingHeaders());
                     handler.onHeadersReceived(responseHeaders);
                 }
             }

src/main/java/com/ning/http/client/providers/netty/handler/WebSocketProtocol.java

@@ -36,9 +36,9 @@
 import com.ning.http.client.providers.netty.channel.Channels;
 import com.ning.http.client.providers.netty.future.NettyResponseFuture;
 import com.ning.http.client.providers.netty.request.NettyRequestSender;
-import com.ning.http.client.providers.netty.response.ResponseBodyPart;
-import com.ning.http.client.providers.netty.response.ResponseHeaders;
-import com.ning.http.client.providers.netty.response.ResponseStatus;
+import com.ning.http.client.providers.netty.response.NettyResponseBodyPart;
+import com.ning.http.client.providers.netty.response.NettyResponseHeaders;
+import com.ning.http.client.providers.netty.response.NettyResponseStatus;
 import com.ning.http.client.providers.netty.ws.NettyWebSocket;
 import com.ning.http.client.websocket.WebSocketUpgradeHandler;
 import com.ning.http.util.StandardCharsets;
@@ -74,8 +74,8 @@ public void handle(Channel channel, NettyResponseFuture<?> future, Object e) thr
 
         if (e instanceof HttpResponse) {
             HttpResponse response = (HttpResponse) e;
-            HttpResponseStatus status = new ResponseStatus(future.getURI(), config, response);
-            HttpResponseHeaders responseHeaders = new ResponseHeaders(response.headers());
+            HttpResponseStatus status = new NettyResponseStatus(future.getURI(), config, response);
+            HttpResponseHeaders responseHeaders = new NettyResponseHeaders(response.headers());
 
             if (exitAfterProcessingFilters(channel, future, handler, status, responseHeaders)) {
                 return;
@@ -94,7 +94,7 @@ public void handle(Channel channel, NettyResponseFuture<?> future, Object e) thr
 
             boolean validConnection = c != null && c.equalsIgnoreCase(HttpHeaders.Values.UPGRADE);
 
-            status = new ResponseStatus(future.getURI(), config, response);
+            status = new NettyResponseStatus(future.getURI(), config, response);
             final boolean statusReceived = handler.onStatusReceived(status) == STATE.UPGRADE;
 
             if (!statusReceived) {
@@ -156,7 +156,7 @@ public void setContent(ChannelBuffer content) {
                             }
                         };
 
-                        ResponseBodyPart rp = new ResponseBodyPart(null, webSocketChunk, true);
+                        NettyResponseBodyPart rp = new NettyResponseBodyPart(null, webSocketChunk, true);
                         handler.onBodyPartReceived(rp);
 
                         if (frame instanceof BinaryWebSocketFrame) {

src/main/java/com/ning/http/client/providers/netty/response/NettyResponse.java

@@ -74,12 +74,12 @@ public ChannelBuffer getResponseBodyAsChannelBuffer() throws IOException {
             b = ChannelBuffers.EMPTY_BUFFER;
             break;
         case 1:
-            b = ResponseBodyPart.class.cast(bodyParts.get(0)).getChannelBuffer();
+            b = NettyResponseBodyPart.class.cast(bodyParts.get(0)).getChannelBuffer();
             break;
         default:
             ChannelBuffer[] channelBuffers = new ChannelBuffer[bodyParts.size()];
             for (int i = 0; i < bodyParts.size(); i++) {
-                channelBuffers[i] = ResponseBodyPart.class.cast(bodyParts.get(i)).getChannelBuffer();
+                channelBuffers[i] = NettyResponseBodyPart.class.cast(bodyParts.get(i)).getChannelBuffer();
             }
             b = ChannelBuffers.wrappedBuffer(channelBuffers);
         }

src/main/java/com/ning/http/client/providers/netty/response/ResponseBodyPart.java renamed to src/main/java/com/ning/http/client/providers/netty/response/NettyResponseBodyPart.java

@@ -21,26 +21,24 @@
 
 import com.ning.http.client.HttpResponseBodyPart;
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
 
 /**
  * A callback class used when an HTTP response body is received.
  */
-public class ResponseBodyPart extends HttpResponseBodyPart {
+public class NettyResponseBodyPart extends HttpResponseBodyPart {
 
     private final ChannelBuffer content;
     private volatile byte[] bytes;
     private final int length;
 
-    public ResponseBodyPart(HttpResponse response, boolean last) {
+    public NettyResponseBodyPart(HttpResponse response, boolean last) {
         this(response, null, last);
     }
 
-    public ResponseBodyPart(HttpResponse response, HttpChunk chunk, boolean last) {
+    public NettyResponseBodyPart(HttpResponse response, HttpChunk chunk, boolean last) {
         super(last);
         content = chunk != null ? chunk.getContent() : response.getContent();
         length = content.readableBytes();
@@ -81,9 +79,4 @@ public ByteBuffer getBodyByteBuffer() {
     public int length() {
         return length;
     }
-
-    @Override
-    public InputStream readBodyPartBytes() {
-        return new ByteArrayInputStream(getBodyPartBytes());
-    }
 }

src/main/java/com/ning/http/client/providers/netty/response/ResponseHeaders.java renamed to src/main/java/com/ning/http/client/providers/netty/response/NettyResponseHeaders.java

@@ -23,18 +23,18 @@
 /**
  * A class that represent the HTTP headers.
  */
-public class ResponseHeaders extends HttpResponseHeaders {
+public class NettyResponseHeaders extends HttpResponseHeaders {
 
     private final HttpHeaders responseHeaders;
     private final HttpHeaders trailingHeaders;
     private final FluentCaseInsensitiveStringsMap headers;
 
     // FIXME unused AsyncHttpProvider provider
-    public ResponseHeaders(HttpHeaders responseHeaders) {
+    public NettyResponseHeaders(HttpHeaders responseHeaders) {
         this(responseHeaders, null);
     }
 
-    public ResponseHeaders(HttpHeaders responseHeaders, HttpHeaders traillingHeaders) {
+    public NettyResponseHeaders(HttpHeaders responseHeaders, HttpHeaders traillingHeaders) {
         super(traillingHeaders != null);
         this.responseHeaders = responseHeaders;
         this.trailingHeaders = traillingHeaders;

src/main/java/com/ning/http/client/providers/netty/response/ResponseStatus.java renamed to src/main/java/com/ning/http/client/providers/netty/response/NettyResponseStatus.java

@@ -27,11 +27,11 @@
 /**
  * A class that represent the HTTP response' status line (code + text)
  */
-public class ResponseStatus extends HttpResponseStatus {
+public class NettyResponseStatus extends HttpResponseStatus {
 
     private final HttpResponse response;
 
-    public ResponseStatus(UriComponents uri, AsyncHttpClientConfig config, HttpResponse response) {
+    public NettyResponseStatus(UriComponents uri, AsyncHttpClientConfig config, HttpResponse response) {
         super(uri, config);
         this.response = response;
     }

src/test/java/com/ning/http/client/providers/netty/NettyAsyncResponseTest.java

@@ -27,7 +27,7 @@
 import com.ning.http.client.HttpResponseHeaders;
 import com.ning.http.client.cookie.Cookie;
 import com.ning.http.client.providers.netty.response.NettyResponse;
-import com.ning.http.client.providers.netty.response.ResponseStatus;
+import com.ning.http.client.providers.netty.response.NettyResponseStatus;
 
 /**
  * @author Benjamin Hanzelmann
@@ -43,7 +43,7 @@ public void testCookieParseExpires() {
         Date date = new Date(System.currentTimeMillis() + 60000); // sdf.parse( dateString );
         final String cookieDef = String.format("efmembercheck=true; expires=%s; path=/; domain=.eclipse.org", sdf.format(date));
 
-        NettyResponse response = new NettyResponse(new ResponseStatus(null, null, null), new HttpResponseHeaders(false) {
+        NettyResponse response = new NettyResponse(new NettyResponseStatus(null, null, null), new HttpResponseHeaders(false) {
             @Override
             public FluentCaseInsensitiveStringsMap getHeaders() {
                 return new FluentCaseInsensitiveStringsMap().add("Set-Cookie", cookieDef);
@@ -61,7 +61,7 @@ public FluentCaseInsensitiveStringsMap getHeaders() {
     @Test(groups = "standalone")
     public void testCookieParseMaxAge() {
         final String cookieDef = "efmembercheck=true; max-age=60; path=/; domain=.eclipse.org";
-        NettyResponse response = new NettyResponse(new ResponseStatus(null, null, null), new HttpResponseHeaders(false) {
+        NettyResponse response = new NettyResponse(new NettyResponseStatus(null, null, null), new HttpResponseHeaders(false) {
             @Override
             public FluentCaseInsensitiveStringsMap getHeaders() {
                 return new FluentCaseInsensitiveStringsMap().add("Set-Cookie", cookieDef);
@@ -77,7 +77,7 @@ public FluentCaseInsensitiveStringsMap getHeaders() {
     @Test(groups = "standalone")
     public void testCookieParseWeirdExpiresValue() {
         final String cookieDef = "efmembercheck=true; expires=60; path=/; domain=.eclipse.org";
-        NettyResponse response = new NettyResponse(new ResponseStatus(null, null, null), new HttpResponseHeaders(false) {
+        NettyResponse response = new NettyResponse(new NettyResponseStatus(null, null, null), new HttpResponseHeaders(false) {
             @Override
             public FluentCaseInsensitiveStringsMap getHeaders() {
                 return new FluentCaseInsensitiveStringsMap().add("Set-Cookie", cookieDef);