From efe27dbce548f4def09e9829bfc57e99676c50d2 Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Fri, 2 Mar 2012 10:43:04 -0800 Subject: [PATCH] Rename SPDY header block (de)compressor classes --- .../handler/codec/spdy/SpdyHeaderBlockCompressor.java | 9 ++++++--- .../handler/codec/spdy/SpdyHeaderBlockDecompressor.java | 2 +- ...bEncoder.java => SpdyHeaderBlockJZlibCompressor.java} | 4 ++-- ...ecoder.java => SpdyHeaderBlockJZlibDecompressor.java} | 4 ++-- ...ibEncoder.java => SpdyHeaderBlockZlibCompressor.java} | 4 ++-- 5 files changed, 13 insertions(+), 10 deletions(-) rename codec-http/src/main/java/io/netty/handler/codec/spdy/{SpdyJZlibEncoder.java => SpdyHeaderBlockJZlibCompressor.java} (95%) rename codec-http/src/main/java/io/netty/handler/codec/spdy/{SpdyJZlibDecoder.java => SpdyHeaderBlockJZlibDecompressor.java} (94%) rename codec-http/src/main/java/io/netty/handler/codec/spdy/{SpdyZlibEncoder.java => SpdyHeaderBlockZlibCompressor.java} (92%) diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHeaderBlockCompressor.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHeaderBlockCompressor.java index 69b823d405..d52e7e17d9 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHeaderBlockCompressor.java +++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHeaderBlockCompressor.java @@ -37,11 +37,14 @@ abstract class SpdyHeaderBlockCompressor { USE_ZLIB = java7; } - static SpdyHeaderBlockCompressor newInstance(int compressionLevel, int windowBits, int memLevel) { + static SpdyHeaderBlockCompressor newInstance( + int compressionLevel, int windowBits, int memLevel) { + if (USE_ZLIB) { - return new SpdyZlibEncoder(compressionLevel); + return new SpdyHeaderBlockZlibCompressor(compressionLevel); } else { - return new SpdyJZlibEncoder(compressionLevel, windowBits, memLevel); + return new SpdyHeaderBlockJZlibCompressor( + compressionLevel, windowBits, memLevel); } } diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHeaderBlockDecompressor.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHeaderBlockDecompressor.java index 76dc1acdf1..119ef46454 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHeaderBlockDecompressor.java +++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHeaderBlockDecompressor.java @@ -20,7 +20,7 @@ import io.netty.buffer.ChannelBuffer; abstract class SpdyHeaderBlockDecompressor { static SpdyHeaderBlockDecompressor newInstance() { - return new SpdyJZlibDecoder(); + return new SpdyHeaderBlockJZlibDecompressor(); } abstract void setInput(ChannelBuffer compressed); diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyJZlibEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHeaderBlockJZlibCompressor.java similarity index 95% rename from codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyJZlibEncoder.java rename to codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHeaderBlockJZlibCompressor.java index c76d08b13b..dc6e7db1ff 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyJZlibEncoder.java +++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHeaderBlockJZlibCompressor.java @@ -22,11 +22,11 @@ import io.netty.handler.codec.compression.CompressionException; import io.netty.util.internal.jzlib.JZlib; import io.netty.util.internal.jzlib.ZStream; -class SpdyJZlibEncoder extends SpdyHeaderBlockCompressor { +class SpdyHeaderBlockJZlibCompressor extends SpdyHeaderBlockCompressor { private final ZStream z = new ZStream(); - public SpdyJZlibEncoder(int compressionLevel, int windowBits, int memLevel) { + public SpdyHeaderBlockJZlibCompressor(int compressionLevel, int windowBits, int memLevel) { if (compressionLevel < 0 || compressionLevel > 9) { throw new IllegalArgumentException( "compressionLevel: " + compressionLevel + " (expected: 0-9)"); diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyJZlibDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHeaderBlockJZlibDecompressor.java similarity index 94% rename from codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyJZlibDecoder.java rename to codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHeaderBlockJZlibDecompressor.java index 30063d5285..21593aba40 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyJZlibDecoder.java +++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHeaderBlockJZlibDecompressor.java @@ -22,12 +22,12 @@ import io.netty.util.internal.jzlib.ZStream; import static io.netty.handler.codec.spdy.SpdyCodecUtil.*; -class SpdyJZlibDecoder extends SpdyHeaderBlockDecompressor { +class SpdyHeaderBlockJZlibDecompressor extends SpdyHeaderBlockDecompressor { private final byte[] out = new byte[8192]; private final ZStream z = new ZStream(); - public SpdyJZlibDecoder() { + public SpdyHeaderBlockJZlibDecompressor() { int resultCode; resultCode = z.inflateInit(JZlib.W_ZLIB); if (resultCode != JZlib.Z_OK) { diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyZlibEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHeaderBlockZlibCompressor.java similarity index 92% rename from codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyZlibEncoder.java rename to codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHeaderBlockZlibCompressor.java index a57b9b7bf0..d00434b120 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyZlibEncoder.java +++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHeaderBlockZlibCompressor.java @@ -21,12 +21,12 @@ import io.netty.buffer.ChannelBuffer; import static io.netty.handler.codec.spdy.SpdyCodecUtil.*; -class SpdyZlibEncoder extends SpdyHeaderBlockCompressor { +class SpdyHeaderBlockZlibCompressor extends SpdyHeaderBlockCompressor { private final byte[] out = new byte[8192]; private final Deflater compressor; - public SpdyZlibEncoder(int compressionLevel) { + public SpdyHeaderBlockZlibCompressor(int compressionLevel) { if (compressionLevel < 0 || compressionLevel > 9) { throw new IllegalArgumentException( "compressionLevel: " + compressionLevel + " (expected: 0-9)");