Remove HttpHeadersUtil

Motivation:
HttpHeadersUtil methods were previously moved to HttpUtils in 4.1. However this class was not removed when merging from 4.1 to master.

Modifications:
- Remove HttpHeadersUtil

Result:
Less duplicate code.

Author: Scottmitch

codec-http/src/main/java/io/netty/handler/codec/http/HttpHeaderUtil.java

@@ -21,6 +21,8 @@
 import java.util.Iterator;
 import java.util.List;
 
+import static io.netty.util.AsciiString.c2b;
+
 /**
  * Utility methods useful in the HTTP context.
  */
@@ -188,7 +190,7 @@ public static long getContentLength(HttpMessage message, long defaultValue) {
      *         a number. Not to exceed the boundaries of integer.
      */
     public static int getContentLength(HttpMessage message, int defaultValue) {
-        return (int) Math.min(Integer.MAX_VALUE, HttpHeaderUtil.getContentLength(message, (long) defaultValue));
+        return (int) Math.min(Integer.MAX_VALUE, HttpUtil.getContentLength(message, (long) defaultValue));
     }
 
     /**
@@ -319,8 +321,4 @@ static void encodeAscii0(CharSequence seq, ByteBuf buf) {
             buf.writeByte(c2b(seq.charAt(i)));
         }
     }
-
-    private static byte c2b(char c) {
-        return c > 255 ? (byte) '?' : (byte) c;
-    }
 }

codec-http/src/main/java/io/netty/handler/codec/http/HttpUtil.java

@@ -23,9 +23,9 @@
 import io.netty.handler.codec.http.DefaultFullHttpResponse;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpHeaderNames;
-import io.netty.handler.codec.http.HttpHeaderUtil;
 import io.netty.handler.codec.http.HttpRequest;
 import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.HttpUtil;
 import io.netty.handler.ssl.SslHandler;
 
 import static io.netty.handler.codec.http.HttpMethod.*;
@@ -91,7 +91,7 @@ public void operationComplete(ChannelFuture future) throws Exception {
 
     private static void sendHttpResponse(ChannelHandlerContext ctx, HttpRequest req, HttpResponse res) {
         ChannelFuture f = ctx.channel().writeAndFlush(res);
-        if (!HttpHeaderUtil.isKeepAlive(req) || res.status().code() != 200) {
+        if (!HttpUtil.isKeepAlive(req) || res.status().code() != 200) {
             f.addListener(ChannelFutureListener.CLOSE);
         }
     }

codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandshakeHandler.java

@@ -296,7 +296,7 @@ public void testEmptyFullContentWithTrailer() throws Exception {
     @Test
     public void test100Continue() throws Exception {
         FullHttpRequest request = newRequest();
-        HttpHeaderUtil.set100ContinueExpected(request, true);
+        HttpUtil.set100ContinueExpected(request, true);
 
         EmbeddedChannel ch = new EmbeddedChannel(new HttpContentCompressor());
         ch.writeInbound(request);

codec-http/src/test/java/io/netty/handler/codec/http/HttpContentCompressorTest.java

@@ -22,16 +22,19 @@
 import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.handler.codec.http.DefaultFullHttpResponse;
 import io.netty.handler.codec.http.FullHttpResponse;
-import io.netty.handler.codec.http.HttpHeaderUtil;
 import io.netty.handler.codec.http.HttpHeaderValues;
 import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpUtil;
 import io.netty.util.CharsetUtil;
 
 import java.util.Date;
 
-import static io.netty.handler.codec.http.HttpHeaderNames.*;
-import static io.netty.handler.codec.http.HttpResponseStatus.*;
-import static io.netty.handler.codec.http.HttpVersion.*;
+import static io.netty.handler.codec.http.HttpHeaderNames.CONNECTION;
+import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_LENGTH;
+import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_TYPE;
+import static io.netty.handler.codec.http.HttpResponseStatus.CONTINUE;
+import static io.netty.handler.codec.http.HttpResponseStatus.OK;
+import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
 
 /**
  * HTTP handler that responds with a "Hello World"
@@ -43,10 +46,10 @@ public void messageReceived(ChannelHandlerContext ctx, Object msg) {
         if (msg instanceof HttpRequest) {
             HttpRequest req = (HttpRequest) msg;
 
-            if (HttpHeaderUtil.is100ContinueExpected(req)) {
+            if (HttpUtil.is100ContinueExpected(req)) {
                 ctx.write(new DefaultFullHttpResponse(HTTP_1_1, CONTINUE));
             }
-            boolean keepAlive = HttpHeaderUtil.isKeepAlive(req);
+            boolean keepAlive = HttpUtil.isKeepAlive(req);
 
             ByteBuf content = Unpooled.copiedBuffer("Hello World " + new Date(), CharsetUtil.UTF_8);