From 42fab4a3ad66f7fa8933f1a98a60998d55fb7776 Mon Sep 17 00:00:00 2001
From: Jordan Halterman <jordan.halterman@gmail.com>
Date: Thu, 5 Mar 2015 00:26:52 -0800
Subject: [PATCH] Move hash functions to io module.

---
 io/pom.xml                                    |  9 ++++
 .../kuujo/copycat/io/util/BloomFilter.java    |  4 --
 .../copycat/io/util}/CityHashFunction.java    |  2 +-
 .../kuujo/copycat/io/util}/HashFunction.java  |  2 +-
 .../kuujo/copycat/io/util}/HashFunctions.java |  2 +-
 .../copycat/io/util}/Murmur3HashFunction.java |  2 +-
 util/pom.xml                                  | 12 ------
 .../net/kuujo/copycat/util/BitSetTest.java    | 42 -------------------
 .../kuujo/copycat/util/BloomFilterTest.java   | 40 ------------------
 9 files changed, 13 insertions(+), 102 deletions(-)
 rename {util/src/main/java/net/kuujo/copycat/util/hash => io/src/main/java/net/kuujo/copycat/io/util}/CityHashFunction.java (96%)
 rename {util/src/main/java/net/kuujo/copycat/util/hash => io/src/main/java/net/kuujo/copycat/io/util}/HashFunction.java (97%)
 rename {util/src/main/java/net/kuujo/copycat/util/hash => io/src/main/java/net/kuujo/copycat/io/util}/HashFunctions.java (97%)
 rename {util/src/main/java/net/kuujo/copycat/util/hash => io/src/main/java/net/kuujo/copycat/io/util}/Murmur3HashFunction.java (96%)
 delete mode 100644 util/src/test/java/net/kuujo/copycat/util/BitSetTest.java
 delete mode 100644 util/src/test/java/net/kuujo/copycat/util/BloomFilterTest.java

diff --git a/io/pom.xml b/io/pom.xml
index c18f29200f..580a2972e6 100644
--- 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
index 1f988ce4bd..4ba75f44c7 100644
--- 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/util/src/main/java/net/kuujo/copycat/util/hash/CityHashFunction.java b/io/src/main/java/net/kuujo/copycat/io/util/CityHashFunction.java
similarity index 96%
rename from util/src/main/java/net/kuujo/copycat/util/hash/CityHashFunction.java
rename to io/src/main/java/net/kuujo/copycat/io/util/CityHashFunction.java
index f0200a88e2..788325b4eb 100644
--- a/util/src/main/java/net/kuujo/copycat/util/hash/CityHashFunction.java
+++ b/io/src/main/java/net/kuujo/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/util/src/main/java/net/kuujo/copycat/util/hash/HashFunction.java b/io/src/main/java/net/kuujo/copycat/io/util/HashFunction.java
similarity index 97%
rename from util/src/main/java/net/kuujo/copycat/util/hash/HashFunction.java
rename to io/src/main/java/net/kuujo/copycat/io/util/HashFunction.java
index 2ebd400dd4..731d87484a 100644
--- a/util/src/main/java/net/kuujo/copycat/util/hash/HashFunction.java
+++ b/io/src/main/java/net/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/util/src/main/java/net/kuujo/copycat/util/hash/HashFunctions.java b/io/src/main/java/net/kuujo/copycat/io/util/HashFunctions.java
similarity index 97%
rename from util/src/main/java/net/kuujo/copycat/util/hash/HashFunctions.java
rename to io/src/main/java/net/kuujo/copycat/io/util/HashFunctions.java
index c3d41bfe2c..bb6ace976b 100644
--- a/util/src/main/java/net/kuujo/copycat/util/hash/HashFunctions.java
+++ b/io/src/main/java/net/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/util/src/main/java/net/kuujo/copycat/util/hash/Murmur3HashFunction.java b/io/src/main/java/net/kuujo/copycat/io/util/Murmur3HashFunction.java
similarity index 96%
rename from util/src/main/java/net/kuujo/copycat/util/hash/Murmur3HashFunction.java
rename to io/src/main/java/net/kuujo/copycat/io/util/Murmur3HashFunction.java
index 3e1376232e..56c14eda0f 100644
--- a/util/src/main/java/net/kuujo/copycat/util/hash/Murmur3HashFunction.java
+++ b/io/src/main/java/net/kuujo/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
index c372d50e92..67d1ab0771 100644
--- 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
deleted file mode 100644
index 9a9f3df6f2..0000000000
--- a/util/src/test/java/net/kuujo/copycat/util/BitSetTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2015 the original author or authors.
- *
- * Licensed 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.
- */
-package net.kuujo.copycat.util;
-
-import net.kuujo.copycat.util.hash.DirectBitSet;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-/**
- * Direct memory bit set test.
- *
- * @author <a href="http://github.com/kuujo">Jordan Halterman</a>
- */
-@Test
-public class BitSetTest {
-
-  /**
-   * Tests the bit set.
-   */
-  public void testBitSet() {
-    DirectBitSet bits = new DirectBitSet(1024);
-    bits.set(10);
-    bits.set(20);
-    Assert.assertTrue(bits.get(10));
-    Assert.assertTrue(bits.get(20));
-    Assert.assertFalse(bits.get(30));
-  }
-
-}
diff --git a/util/src/test/java/net/kuujo/copycat/util/BloomFilterTest.java b/util/src/test/java/net/kuujo/copycat/util/BloomFilterTest.java
deleted file mode 100644
index 8f1571f14c..0000000000
--- a/util/src/test/java/net/kuujo/copycat/util/BloomFilterTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2015 the original author or authors.
- *
- * Licensed 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.
- */
-package net.kuujo.copycat.util;
-
-import net.kuujo.copycat.util.hash.BloomFilter;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-/**
- * Bloom filter test.
- *
- * @author <a href="http://github.com/kuujo">Jordan Halterman</a>
- */
-@Test
-public class BloomFilterTest {
-
-  /**
-   * Tests adding an element to a bloom filter and then checking that the filter contains that element.
-   */
-  public void testAddContains() {
-    BloomFilter<String> filter = new BloomFilter<>(.1, 100);
-    filter.add("Hello world!");
-    Assert.assertTrue(filter.contains("Hello world!"));
-    Assert.assertFalse(filter.contains("Hello world again!"));
-  }
-
-}