From dd15d3f41aa74d8ca894fb522abf57055abd5269 Mon Sep 17 00:00:00 2001
From: Rob Austin <rob.austin@boundedbuffer>
Date: Fri, 10 Oct 2014 18:30:26 +0100
Subject: [PATCH] HCOLL-164 moved it to the set package

---
 .../{map => set}/ChronicleSetBuilder.java      | 18 +++++-------------
 .../{map => set}/ChronicleSetBuilderTest.java  |  2 +-
 .../SetForTCPSocketReplicationTest3way.java    |  3 ++-
 3 files changed, 8 insertions(+), 15 deletions(-)
 rename src/main/java/net/openhft/chronicle/{map => set}/ChronicleSetBuilder.java (96%)
 rename src/test/java/net/openhft/chronicle/{map => set}/ChronicleSetBuilderTest.java (92%)
 rename src/test/java/net/openhft/chronicle/{map => set}/SetForTCPSocketReplicationTest3way.java (98%)

diff --git a/src/main/java/net/openhft/chronicle/map/ChronicleSetBuilder.java b/src/main/java/net/openhft/chronicle/set/ChronicleSetBuilder.java
similarity index 96%
rename from src/main/java/net/openhft/chronicle/map/ChronicleSetBuilder.java
rename to src/main/java/net/openhft/chronicle/set/ChronicleSetBuilder.java
index ed9f0182b..2d0b89a9d 100644
--- a/src/main/java/net/openhft/chronicle/map/ChronicleSetBuilder.java
+++ b/src/main/java/net/openhft/chronicle/set/ChronicleSetBuilder.java
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-package net.openhft.chronicle.map;
+package net.openhft.chronicle.set;
 
+import net.openhft.chronicle.map.*;
 import net.openhft.lang.io.serialization.BytesMarshaller;
 import net.openhft.lang.io.serialization.BytesMarshallerFactory;
 import net.openhft.lang.io.serialization.ObjectSerializer;
@@ -30,14 +31,13 @@ import java.util.Iterator;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import static net.openhft.chronicle.map.Objects.builderEquals;
 
 public class ChronicleSetBuilder<E> implements Cloneable {
 
     private ChronicleMapBuilder<E, Void> chronicleMapBuilder;
 
     ChronicleSetBuilder(Class<E> keyClass) {
-        chronicleMapBuilder = new ChronicleMapBuilder<E, Void>(keyClass, Void.class);
+        chronicleMapBuilder = ChronicleMapBuilder.of(keyClass, Void.class);
     }
 
     public static <K> ChronicleSetBuilder<K> of(Class<K> keyClass) {
@@ -261,7 +261,7 @@ public class ChronicleSetBuilder<E> implements Cloneable {
     @SuppressWarnings("EqualsWhichDoesntCheckParameterClass")
     @Override
     public boolean equals(Object o) {
-        return builderEquals(this, o);
+        return chronicleMapBuilder.equals(o);
     }
 
     @Override
@@ -306,14 +306,6 @@ public class ChronicleSetBuilder<E> implements Cloneable {
         return this;
     }
 
-    /**
-     * For testing
-     */
-    ChronicleSetBuilder<E> forceReplicatedImpl() {
-        chronicleMapBuilder.forceReplicatedImpl();
-        return this;
-    }
-
     public ChronicleSetBuilder<E> keyMarshaller(@NotNull BytesMarshaller<E> keyMarshaller) {
         chronicleMapBuilder.keyMarshaller(keyMarshaller);
         return this;
@@ -377,7 +369,7 @@ public class ChronicleSetBuilder<E> implements Cloneable {
         }
 
         public boolean add(E e) {
-            return m.put(e, (Void)null) == null;
+            return m.put(e, (Void) null) == null;
         }
 
         public Iterator<E> iterator() {
diff --git a/src/test/java/net/openhft/chronicle/map/ChronicleSetBuilderTest.java b/src/test/java/net/openhft/chronicle/set/ChronicleSetBuilderTest.java
similarity index 92%
rename from src/test/java/net/openhft/chronicle/map/ChronicleSetBuilderTest.java
rename to src/test/java/net/openhft/chronicle/set/ChronicleSetBuilderTest.java
index d07183eed..fbfc46d15 100644
--- a/src/test/java/net/openhft/chronicle/map/ChronicleSetBuilderTest.java
+++ b/src/test/java/net/openhft/chronicle/set/ChronicleSetBuilderTest.java
@@ -1,4 +1,4 @@
-package net.openhft.chronicle.map;
+package net.openhft.chronicle.set;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/net/openhft/chronicle/map/SetForTCPSocketReplicationTest3way.java b/src/test/java/net/openhft/chronicle/set/SetForTCPSocketReplicationTest3way.java
similarity index 98%
rename from src/test/java/net/openhft/chronicle/map/SetForTCPSocketReplicationTest3way.java
rename to src/test/java/net/openhft/chronicle/set/SetForTCPSocketReplicationTest3way.java
index fe1ce5692..c62a03e5c 100644
--- a/src/test/java/net/openhft/chronicle/map/SetForTCPSocketReplicationTest3way.java
+++ b/src/test/java/net/openhft/chronicle/set/SetForTCPSocketReplicationTest3way.java
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-package net.openhft.chronicle.map;
+package net.openhft.chronicle.set;
 
+import net.openhft.chronicle.map.ChronicleSet;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;