Fixes #511

OpenHFT · Sep 3, 2018 · 92e0c79 · 92e0c79
1 parent dd9b988
commit 92e0c79
Show file tree

Hide file tree

Showing 28 changed files with 748 additions and 1,341 deletions.
diff --git a/...-sandbox/src/main/java/net/openhft/chronicle/engine/client/internal/QueueWireHandler.java b/...-sandbox/src/main/java/net/openhft/chronicle/engine/client/internal/QueueWireHandler.java
@@ -23,7 +23,6 @@
 import net.openhft.chronicle.engine.client.internal.ClientWiredChronicleQueueStateless.EventId;
 import net.openhft.chronicle.network.event.EventGroup;
 import net.openhft.chronicle.queue.ChronicleQueue;
-import net.openhft.chronicle.queue.ChronicleQueueBuilder;
 import net.openhft.chronicle.queue.ExcerptAppender;
 import net.openhft.chronicle.queue.ExcerptTailer;
 import org.slf4j.Logger;
@@ -195,7 +194,7 @@ private ChronicleQueue getQueue(StringBuilder cspText) {
             queue = fileNameToChronicle.computeIfAbsent
                     (filename, s -> {
                         try {
-                            return new ChronicleQueueBuilder(filename).build();
+                            return net.openhft.chronicle.queue.impl.single.SingleChronicleQueueBuilder.single(filename).build();
                         } catch (IOException e) {
                             e.printStackTrace();
                         }

diff --git a/...icle-sandbox/src/test/java/net/openhft/chronicle/queue/impl/SingleChronicleQueueTest.java b/...icle-sandbox/src/test/java/net/openhft/chronicle/queue/impl/SingleChronicleQueueTest.java
@@ -18,7 +18,6 @@
 package net.openhft.chronicle.queue.impl;
 
 import net.openhft.chronicle.queue.ChronicleQueue;
-import net.openhft.chronicle.queue.ChronicleQueueBuilder;
 import net.openhft.chronicle.queue.ExcerptAppender;
 import net.openhft.chronicle.queue.ExcerptTailer;
 import net.openhft.chronicle.wire.BinaryWire;

diff --git a/chronicle-sandbox/src/test/java/net/openhft/chronicle/queue/impl/ZipBytesRingBufferTest.java b/chronicle-sandbox/src/test/java/net/openhft/chronicle/queue/impl/ZipBytesRingBufferTest.java
@@ -20,7 +20,6 @@
 
 import net.openhft.chronicle.bytes.Bytes;
 import net.openhft.chronicle.bytes.NativeBytesStore;
-import net.openhft.chronicle.queue.ChronicleQueueBuilder;
 import net.openhft.chronicle.queue.impl.ringbuffer.BytesRingBuffer;
 import org.junit.Assert;
 import org.junit.Ignore;

diff --git a/src/main/java/net/openhft/chronicle/queue/BenchmarkMain.java b/src/main/java/net/openhft/chronicle/queue/BenchmarkMain.java
@@ -7,6 +7,7 @@
 import net.openhft.chronicle.core.OS;
 import net.openhft.chronicle.core.io.IOTools;
 import net.openhft.chronicle.core.util.Histogram;
+import net.openhft.chronicle.queue.impl.single.SingleChronicleQueueBuilder;
 import net.openhft.chronicle.threads.Pauser;
 import net.openhft.chronicle.wire.DocumentContext;
 import net.openhft.chronicle.wire.Wire;
@@ -173,7 +174,7 @@ private static void runInner(Histogram transportTime, Histogram readTime, Excerp
 
     @NotNull
     private static ChronicleQueue createQueue(String path) {
-        return ChronicleQueueBuilder.single(path).blockSize(1 << 30)
+        return SingleChronicleQueueBuilder.single(path).blockSize(1 << 30)
                 .pauserSupplier(Pauser::timedBusy)
                 .build();
     }

diff --git a/src/main/java/net/openhft/chronicle/queue/ChronicleQueue.java b/src/main/java/net/openhft/chronicle/queue/ChronicleQueue.java
@@ -170,12 +170,6 @@ default <T> VanillaMethodWriterBuilder<T> methodWriterBuilder(@NotNull Class<T>
                 new BinaryMethodWriterInvocationHandler(false, this::acquireAppender));
     }
 
-    default int numberOfReferences(final File queueFile) {
-        Jvm.warn().on(ChronicleQueue.class, "File-reference counting is only supported in Chronicle Queue Enterprise. " +
-                "If you would like to use this feature, please contact sales@chronicle.software for more information.");
-        return 0;
-    }
-
     RollCycle rollCycle();
 
     TimeProvider time();

diff --git a/src/main/java/net/openhft/chronicle/queue/ChronicleQueueBuilder.java b/src/main/java/net/openhft/chronicle/queue/ChronicleQueueBuilder.java