From e353540d47ff5bbd03cc5eca4930f6440bcce4bc Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Wed, 19 Dec 2012 18:12:18 +0900 Subject: [PATCH] Move snappy codec to netty-codec --- codec-snappy/pom.xml | 43 ------------------- .../compression/snappy/package-info.java | 20 --------- .../handler/codec/compression}/Snappy.java | 3 +- .../compression}/SnappyChecksumUtil.java | 3 +- .../compression}/SnappyFramedDecoder.java | 13 +++--- .../compression}/SnappyFramedEncoder.java | 4 +- .../codec/compression/package-info.java | 5 ++- .../compression}/SnappyChecksumUtilTest.java | 11 ++--- .../compression}/SnappyFramedDecoderTest.java | 8 ++-- .../compression}/SnappyFramedEncoderTest.java | 7 ++- .../codec/compression}/SnappyTest.java | 15 +++---- 11 files changed, 29 insertions(+), 103 deletions(-) delete mode 100644 codec-snappy/pom.xml delete mode 100644 codec-snappy/src/main/java/io/netty/handler/codec/compression/snappy/package-info.java rename {codec-snappy/src/main/java/io/netty/handler/codec/compression/snappy => codec/src/main/java/io/netty/handler/codec/compression}/Snappy.java (99%) rename {codec-snappy/src/main/java/io/netty/handler/codec/compression/snappy => codec/src/main/java/io/netty/handler/codec/compression}/SnappyChecksumUtil.java (96%) rename {codec-snappy/src/main/java/io/netty/handler/codec/compression/snappy => codec/src/main/java/io/netty/handler/codec/compression}/SnappyFramedDecoder.java (97%) rename {codec-snappy/src/main/java/io/netty/handler/codec/compression/snappy => codec/src/main/java/io/netty/handler/codec/compression}/SnappyFramedEncoder.java (96%) rename {codec-snappy/src/test/java/io/netty/handler/codec/compression/snappy => codec/src/test/java/io/netty/handler/codec/compression}/SnappyChecksumUtilTest.java (86%) rename {codec-snappy/src/test/java/io/netty/handler/codec/compression/snappy => codec/src/test/java/io/netty/handler/codec/compression}/SnappyFramedDecoderTest.java (97%) rename {codec-snappy/src/test/java/io/netty/handler/codec/compression/snappy => codec/src/test/java/io/netty/handler/codec/compression}/SnappyFramedEncoderTest.java (96%) rename {codec-snappy/src/test/java/io/netty/handler/codec/compression/snappy => codec/src/test/java/io/netty/handler/codec/compression}/SnappyTest.java (92%) diff --git a/codec-snappy/pom.xml b/codec-snappy/pom.xml deleted file mode 100644 index ff0cfc0fdb..0000000000 --- a/codec-snappy/pom.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - 4.0.0 - - io.netty - netty-parent - 4.0.0.Beta1-SNAPSHOT - - - netty-codec-snappy - jar - - Netty/Codec/Snappy - - - - ${project.groupId} - netty-codec - ${project.version} - - - ${project.groupId} - netty-handler - ${project.version} - - - diff --git a/codec-snappy/src/main/java/io/netty/handler/codec/compression/snappy/package-info.java b/codec-snappy/src/main/java/io/netty/handler/codec/compression/snappy/package-info.java deleted file mode 100644 index 17b6069924..0000000000 --- a/codec-snappy/src/main/java/io/netty/handler/codec/compression/snappy/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012 The Netty Project - * - * The Netty Project licenses this file to you under the Apache License, - * version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ - -/** - * Encoder and decoder for the Snappy compression protocol. - */ -package io.netty.handler.codec.compression.snappy; diff --git a/codec-snappy/src/main/java/io/netty/handler/codec/compression/snappy/Snappy.java b/codec/src/main/java/io/netty/handler/codec/compression/Snappy.java similarity index 99% rename from codec-snappy/src/main/java/io/netty/handler/codec/compression/snappy/Snappy.java rename to codec/src/main/java/io/netty/handler/codec/compression/Snappy.java index a87e490966..a3c3caaf5b 100644 --- a/codec-snappy/src/main/java/io/netty/handler/codec/compression/snappy/Snappy.java +++ b/codec/src/main/java/io/netty/handler/codec/compression/Snappy.java @@ -13,10 +13,9 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.handler.codec.compression.snappy; +package io.netty.handler.codec.compression; import io.netty.buffer.ByteBuf; -import io.netty.handler.codec.compression.CompressionException; /** * Uncompresses an input {@link ByteBuf} encoded with Snappy compression into an diff --git a/codec-snappy/src/main/java/io/netty/handler/codec/compression/snappy/SnappyChecksumUtil.java b/codec/src/main/java/io/netty/handler/codec/compression/SnappyChecksumUtil.java similarity index 96% rename from codec-snappy/src/main/java/io/netty/handler/codec/compression/snappy/SnappyChecksumUtil.java rename to codec/src/main/java/io/netty/handler/codec/compression/SnappyChecksumUtil.java index 8050dd9fdd..7209b514b4 100644 --- a/codec-snappy/src/main/java/io/netty/handler/codec/compression/snappy/SnappyChecksumUtil.java +++ b/codec/src/main/java/io/netty/handler/codec/compression/SnappyChecksumUtil.java @@ -13,10 +13,9 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.handler.codec.compression.snappy; +package io.netty.handler.codec.compression; import io.netty.buffer.ByteBuf; -import io.netty.handler.codec.compression.CompressionException; import java.util.zip.CRC32; diff --git a/codec-snappy/src/main/java/io/netty/handler/codec/compression/snappy/SnappyFramedDecoder.java b/codec/src/main/java/io/netty/handler/codec/compression/SnappyFramedDecoder.java similarity index 97% rename from codec-snappy/src/main/java/io/netty/handler/codec/compression/snappy/SnappyFramedDecoder.java rename to codec/src/main/java/io/netty/handler/codec/compression/SnappyFramedDecoder.java index 226fd99f4d..0d24ab10db 100644 --- a/codec-snappy/src/main/java/io/netty/handler/codec/compression/snappy/SnappyFramedDecoder.java +++ b/codec/src/main/java/io/netty/handler/codec/compression/SnappyFramedDecoder.java @@ -13,17 +13,16 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.handler.codec.compression.snappy; - -import java.nio.charset.Charset; -import java.util.Arrays; - -import static io.netty.handler.codec.compression.snappy.SnappyChecksumUtil.validateChecksum; +package io.netty.handler.codec.compression; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.ByteToByteDecoder; -import io.netty.handler.codec.compression.CompressionException; + +import java.nio.charset.Charset; +import java.util.Arrays; + +import static io.netty.handler.codec.compression.SnappyChecksumUtil.*; /** * Uncompresses a {@link ByteBuf} encoded with the Snappy framing format. diff --git a/codec-snappy/src/main/java/io/netty/handler/codec/compression/snappy/SnappyFramedEncoder.java b/codec/src/main/java/io/netty/handler/codec/compression/SnappyFramedEncoder.java similarity index 96% rename from codec-snappy/src/main/java/io/netty/handler/codec/compression/snappy/SnappyFramedEncoder.java rename to codec/src/main/java/io/netty/handler/codec/compression/SnappyFramedEncoder.java index a467bd8d7f..4e6a5b1502 100644 --- a/codec-snappy/src/main/java/io/netty/handler/codec/compression/snappy/SnappyFramedEncoder.java +++ b/codec/src/main/java/io/netty/handler/codec/compression/SnappyFramedEncoder.java @@ -13,13 +13,13 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.handler.codec.compression.snappy; +package io.netty.handler.codec.compression; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.ByteToByteEncoder; -import static io.netty.handler.codec.compression.snappy.SnappyChecksumUtil.*; +import static io.netty.handler.codec.compression.SnappyChecksumUtil.*; /** * Compresses a {@link ByteBuf} using the Snappy framing format. diff --git a/codec/src/main/java/io/netty/handler/codec/compression/package-info.java b/codec/src/main/java/io/netty/handler/codec/compression/package-info.java index 7adfd0a34c..a0f3d8576c 100644 --- a/codec/src/main/java/io/netty/handler/codec/compression/package-info.java +++ b/codec/src/main/java/io/netty/handler/codec/compression/package-info.java @@ -16,8 +16,9 @@ /** * Encoder and decoder which compresses and decompresses {@link io.netty.buffer.ByteBuf}s - * in a compression format such as zlib - * and gzip. + * in a compression format such as zlib, + * gzip, and + * Snappy. * * @apiviz.exclude \.codec\.(?!compression)[a-z0-9]+\. * @apiviz.exclude ^java\.lang\. diff --git a/codec-snappy/src/test/java/io/netty/handler/codec/compression/snappy/SnappyChecksumUtilTest.java b/codec/src/test/java/io/netty/handler/codec/compression/SnappyChecksumUtilTest.java similarity index 86% rename from codec-snappy/src/test/java/io/netty/handler/codec/compression/snappy/SnappyChecksumUtilTest.java rename to codec/src/test/java/io/netty/handler/codec/compression/SnappyChecksumUtilTest.java index f10684ef37..9fbe70528d 100644 --- a/codec-snappy/src/test/java/io/netty/handler/codec/compression/snappy/SnappyChecksumUtilTest.java +++ b/codec/src/test/java/io/netty/handler/codec/compression/SnappyChecksumUtilTest.java @@ -13,18 +13,15 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.handler.codec.compression.snappy; - -import static org.junit.Assert.assertEquals; - -import static io.netty.handler.codec.compression.snappy.SnappyChecksumUtil.*; +package io.netty.handler.codec.compression; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; -import io.netty.handler.codec.compression.CompressionException; - import org.junit.Test; +import static io.netty.handler.codec.compression.SnappyChecksumUtil.*; +import static org.junit.Assert.*; + public class SnappyChecksumUtilTest { @Test public void testCalculateChecksum() { diff --git a/codec-snappy/src/test/java/io/netty/handler/codec/compression/snappy/SnappyFramedDecoderTest.java b/codec/src/test/java/io/netty/handler/codec/compression/SnappyFramedDecoderTest.java similarity index 97% rename from codec-snappy/src/test/java/io/netty/handler/codec/compression/snappy/SnappyFramedDecoderTest.java rename to codec/src/test/java/io/netty/handler/codec/compression/SnappyFramedDecoderTest.java index 1a1c08b32c..06d43781f9 100644 --- a/codec-snappy/src/test/java/io/netty/handler/codec/compression/snappy/SnappyFramedDecoderTest.java +++ b/codec/src/test/java/io/netty/handler/codec/compression/SnappyFramedDecoderTest.java @@ -13,16 +13,14 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.handler.codec.compression.snappy; - -import static org.junit.Assert.*; +package io.netty.handler.codec.compression; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; -import io.netty.handler.codec.compression.CompressionException; - import org.junit.Test; +import static org.junit.Assert.*; + public class SnappyFramedDecoderTest { private final SnappyFramedDecoder decoder = new SnappyFramedDecoder(); diff --git a/codec-snappy/src/test/java/io/netty/handler/codec/compression/snappy/SnappyFramedEncoderTest.java b/codec/src/test/java/io/netty/handler/codec/compression/SnappyFramedEncoderTest.java similarity index 96% rename from codec-snappy/src/test/java/io/netty/handler/codec/compression/snappy/SnappyFramedEncoderTest.java rename to codec/src/test/java/io/netty/handler/codec/compression/SnappyFramedEncoderTest.java index 1009befdaf..0cfe810355 100644 --- a/codec-snappy/src/test/java/io/netty/handler/codec/compression/snappy/SnappyFramedEncoderTest.java +++ b/codec/src/test/java/io/netty/handler/codec/compression/SnappyFramedEncoderTest.java @@ -13,15 +13,14 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.handler.codec.compression.snappy; - -import static org.junit.Assert.assertArrayEquals; +package io.netty.handler.codec.compression; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; - import org.junit.Test; +import static org.junit.Assert.*; + public class SnappyFramedEncoderTest { private final SnappyFramedEncoder encoder = new SnappyFramedEncoder(); diff --git a/codec-snappy/src/test/java/io/netty/handler/codec/compression/snappy/SnappyTest.java b/codec/src/test/java/io/netty/handler/codec/compression/SnappyTest.java similarity index 92% rename from codec-snappy/src/test/java/io/netty/handler/codec/compression/snappy/SnappyTest.java rename to codec/src/test/java/io/netty/handler/codec/compression/SnappyTest.java index ee6f62f338..87591e0d0e 100644 --- a/codec-snappy/src/test/java/io/netty/handler/codec/compression/snappy/SnappyTest.java +++ b/codec/src/test/java/io/netty/handler/codec/compression/SnappyTest.java @@ -13,15 +13,12 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.handler.codec.compression.snappy; - -import static org.junit.Assert.assertArrayEquals; +package io.netty.handler.codec.compression; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; -import io.netty.handler.codec.compression.CompressionException; - import org.junit.After; +import org.junit.Assert; import org.junit.Test; public class SnappyTest { @@ -46,7 +43,7 @@ public class SnappyTest { byte[] expected = { 0x6e, 0x65, 0x74, 0x74, 0x79 }; - assertArrayEquals("Literal was not decoded correctly", expected, out.array()); + Assert.assertArrayEquals("Literal was not decoded correctly", expected, out.array()); } @Test @@ -65,7 +62,7 @@ public class SnappyTest { byte[] expected = { 0x6e, 0x65, 0x74, 0x74, 0x79, 0x6e, 0x65, 0x74, 0x74, 0x79 }; - assertArrayEquals("Copy was not decoded correctly", expected, out.array()); + Assert.assertArrayEquals("Copy was not decoded correctly", expected, out.array()); } @Test(expected = CompressionException.class) @@ -118,7 +115,7 @@ public class SnappyTest { 0x04 << 2, // literal tag + length 0x6e, 0x65, 0x74, 0x74, 0x79 // "netty" }; - assertArrayEquals("Encoded literal was invalid", expected, out.array()); + Assert.assertArrayEquals("Encoded literal was invalid", expected, out.array()); } @Test @@ -168,6 +165,6 @@ public class SnappyTest { 0x15, 0x4c }; - assertArrayEquals("Encoded result was incorrect", expected, out.array()); + Assert.assertArrayEquals("Encoded result was incorrect", expected, out.array()); } }