Forking Twitter's hpack

Motivation: The twitter hpack project does not have the support that it used to have. See discussion here: netty#4403. Modifications: Created a new module in Netty and copied the latest from twitter hpack master. Result: Netty no longer depends on twitter hpack.
haetao · Nov 14, 2015 · 8accc52 · 8accc52
1 parent 2ecce8f
commit 8accc52
Show file tree

Hide file tree

Showing 43 changed files with 4,600 additions and 13 deletions.
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -211,3 +211,11 @@ non-blocking XML processor, which can be obtained at:
   * HOMEPAGE:
     * http://wiki.fasterxml.com/AaltoHome
 
+This product contains a modified version of 'HPACK', a Java implementation of
+the HTTP/2 HPACK algorithm written by Twitter. It can be obtained at:
+
+  * LICENSE:
+    * license/LICENSE.hpack.txt (Apache License 2.0)
+  * HOMEPAGE:
+    * https://github.com/twitter/hpack
+
diff --git a/codec-http2/pom.xml b/codec-http2/pom.xml
@@ -39,15 +39,15 @@
       <artifactId>netty-handler</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>com.twitter</groupId>
-      <artifactId>hpack</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.jcraft</groupId>
       <artifactId>jzlib</artifactId>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+    </dependency>
   </dependencies>
 </project>
 
diff --git a/codec-http2/src/main/java/io/netty/handler/codec/http2/DefaultHttp2HeadersDecoder.java b/codec-http2/src/main/java/io/netty/handler/codec/http2/DefaultHttp2HeadersDecoder.java
@@ -15,10 +15,10 @@
 
 package io.netty.handler.codec.http2;
 
-import com.twitter.hpack.Decoder;
-import com.twitter.hpack.HeaderListener;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufInputStream;
+import io.netty.handler.codec.http2.hpack.Decoder;
+import io.netty.handler.codec.http2.hpack.HeaderListener;
 import io.netty.util.AsciiString;
 
 import java.io.IOException;

diff --git a/codec-http2/src/main/java/io/netty/handler/codec/http2/DefaultHttp2HeadersEncoder.java b/codec-http2/src/main/java/io/netty/handler/codec/http2/DefaultHttp2HeadersEncoder.java
@@ -15,9 +15,9 @@
 
 package io.netty.handler.codec.http2;
 
-import com.twitter.hpack.Encoder;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufOutputStream;
+import io.netty.handler.codec.http2.hpack.Encoder;
 import io.netty.util.AsciiString;
 
 import java.io.ByteArrayOutputStream;