Move hash functions to io module.

atomix · Mar 5, 2015 · 42fab4a · 42fab4a
1 parent 1b307a3
commit 42fab4a
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 102 deletions.
diff --git a/io/pom.xml b/io/pom.xml
@@ -26,12 +26,21 @@
   <artifactId>copycat-io</artifactId>
   <name>Copycat I/O</name>
 
+  <properties>
+    <hash.version>0.2</hash.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>net.kuujo.copycat</groupId>
       <artifactId>copycat-util</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>net.openhft</groupId>
+      <artifactId>zero-allocation-hashing</artifactId>
+      <version>${hash.version}</version>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/io/src/main/java/net/kuujo/copycat/io/util/BloomFilter.java b/io/src/main/java/net/kuujo/copycat/io/util/BloomFilter.java
@@ -15,10 +15,6 @@
  */
 package net.kuujo.copycat.io.util;
 
-import net.kuujo.copycat.util.hash.CityHashFunction;
-import net.kuujo.copycat.util.hash.HashFunction;
-import net.kuujo.copycat.util.hash.Murmur3HashFunction;
-
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.Objects;

diff --git a/...o/copycat/util/hash/CityHashFunction.java → ...ujo/copycat/io/util/CityHashFunction.java b/...o/copycat/util/hash/CityHashFunction.java → ...ujo/copycat/io/util/CityHashFunction.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.kuujo.copycat.util.hash;
+package net.kuujo.copycat.io.util;
 
 import net.openhft.hashing.LongHashFunction;
 

diff --git a/...kuujo/copycat/util/hash/HashFunction.java → ...t/kuujo/copycat/io/util/HashFunction.java b/...kuujo/copycat/util/hash/HashFunction.java → ...t/kuujo/copycat/io/util/HashFunction.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.kuujo.copycat.util.hash;
+package net.kuujo.copycat.io.util;
 
 import net.kuujo.copycat.util.internal.Buffers;
 

diff --git a/...uujo/copycat/util/hash/HashFunctions.java → .../kuujo/copycat/io/util/HashFunctions.java b/...uujo/copycat/util/hash/HashFunctions.java → .../kuujo/copycat/io/util/HashFunctions.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.kuujo.copycat.util.hash;
+package net.kuujo.copycat.io.util;
 
 /**
  * Hash function constants.

diff --git a/...opycat/util/hash/Murmur3HashFunction.java → .../copycat/io/util/Murmur3HashFunction.java b/...opycat/util/hash/Murmur3HashFunction.java → .../copycat/io/util/Murmur3HashFunction.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.kuujo.copycat.util.hash;
+package net.kuujo.copycat.io.util;
 
 import net.openhft.hashing.LongHashFunction;
 

diff --git a/util/pom.xml b/util/pom.xml
@@ -26,18 +26,6 @@
   <artifactId>copycat-util</artifactId>
   <name>Copycat Utilities</name>
 
-  <properties>
-    <hash.version>0.2</hash.version>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>net.openhft</groupId>
-      <artifactId>zero-allocation-hashing</artifactId>
-      <version>${hash.version}</version>
-    </dependency>
-  </dependencies>
-
   <build>
     <plugins>
       <!-- This plugin forces the generation of jar containing streaming test classes, so that the tests 

diff --git a/util/src/test/java/net/kuujo/copycat/util/BitSetTest.java b/util/src/test/java/net/kuujo/copycat/util/BitSetTest.java
diff --git a/util/src/test/java/net/kuujo/copycat/util/BloomFilterTest.java b/util/src/test/java/net/kuujo/copycat/util/BloomFilterTest.java