ChronicleQueue V4, initial code for builder

OpenHFT · Aug 14, 2015 · a63368c · a63368c
1 parent 8b2f3e1
commit a63368c
Show file tree

Hide file tree

Showing 5 changed files with 137 additions and 84 deletions.
diff --git a/chronicle-queue/src/main/java/net/openhft/chronicle/queue/ChronicleQueueBuilder.java b/chronicle-queue/src/main/java/net/openhft/chronicle/queue/ChronicleQueueBuilder.java
@@ -15,85 +15,15 @@
  */
 package net.openhft.chronicle.queue;
 
-import net.openhft.chronicle.wire.BinaryWire;
-import net.openhft.chronicle.wire.TextWire;
-import net.openhft.chronicle.wire.Wire;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.File;
 import java.io.IOException;
 
 /**
  * Created by peter.lawrey on 30/01/15.
  */
-public class ChronicleQueueBuilder implements Cloneable {
+public interface ChronicleQueueBuilder extends Cloneable {
-    private String name;
-    private long blockSize;
-    private Class<? extends Wire> wireType;
-
-    public ChronicleQueueBuilder(File name) {
-        this(name.getAbsolutePath());
-    }
-
-    public ChronicleQueueBuilder(String name) {
-        this.name = name;
-        this.blockSize = 64L << 20;
-        this.wireType = BinaryWire.class;
-    }
-
-    public String name() {
-        return this.name;
-    }
-
-    public ChronicleQueueBuilder blockSize(int blockSize) {
-        this.blockSize = blockSize;
-        return this;
-    }
-
-    public long blockSize() {
-        return this.blockSize;
-    }
-
-    public ChronicleQueueBuilder wireType(Class<? extends Wire> wireType) {
-        this.wireType = wireType;
-        return this;
-    }
-
-    public Class<? extends Wire> wireType() {
-        return this.wireType;
-    }
 
     @NotNull
-    public ChronicleQueue build() throws IOException {
+    public ChronicleQueue build() throws IOException;
-        throw new UnsupportedOperationException("Not yet implemented");
-    }
-
-    @NotNull
-    @SuppressWarnings("CloneDoesntDeclareCloneNotSupportedException")
-    @Override
-    public ChronicleQueueBuilder clone() {
-        try {
-            return (ChronicleQueueBuilder) super.clone();
-        } catch (CloneNotSupportedException e) {
-            throw new AssertionError(e);
-        }
-    }
-
-    public static ChronicleQueueBuilder binary(File name) {
-        return binary(name.getAbsolutePath());
-    }
-
-    public static ChronicleQueueBuilder binary(String name) {
-        return new ChronicleQueueBuilder(name)
-                .wireType(BinaryWire.class);
-    }
-
-    public static ChronicleQueueBuilder text(File name) {
-        return text(name.getAbsolutePath());
-    }
-
-    public static ChronicleQueueBuilder text(String name) {
-        return new ChronicleQueueBuilder(name)
-                .wireType(TextWire.class);
-    }
 }
diff --git a/...le-queue/src/main/java/net/openhft/chronicle/queue/impl/AbstractChronicleQueueFormat.java b/...le-queue/src/main/java/net/openhft/chronicle/queue/impl/AbstractChronicleQueueFormat.java
@@ -0,0 +1,33 @@
+/*
+ *     Copyright (C) 2015  higherfrequencytrading.com
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU Lesser General Public License for more details.
+ *
+ *     You should have received a copy of the GNU Lesser General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.openhft.chronicle.queue.impl;
+
+import net.openhft.chronicle.wire.WireIn;
+import net.openhft.chronicle.wire.WireOut;
+
+public abstract class AbstractChronicleQueueFormat implements ChronicleQueueFormat {
+
+    @Override
+    public void readMarshallable(WireIn wireIn) throws IllegalStateException {
+        throw new UnsupportedOperationException("Not implemented");
+    }
+
+    @Override
+    public void writeMarshallable(WireOut wireOut) {
+        throw new UnsupportedOperationException("Not implemented");
+    }
+}
diff --git a/...cle-queue/src/main/java/net/openhft/chronicle/queue/impl/single/SingleChronicleQueue.java b/...cle-queue/src/main/java/net/openhft/chronicle/queue/impl/single/SingleChronicleQueue.java
@@ -18,5 +18,5 @@
 
 import net.openhft.chronicle.queue.impl.AbstractChronicleQueue;
 
-public class SingleChronicleQueue extends AbstractChronicleQueue {
+class SingleChronicleQueue extends AbstractChronicleQueue {
 }
diff --git a/...ue/src/main/java/net/openhft/chronicle/queue/impl/single/SingleChronicleQueueBuilder.java b/...ue/src/main/java/net/openhft/chronicle/queue/impl/single/SingleChronicleQueueBuilder.java
@@ -0,0 +1,99 @@
+/*
+ *     Copyright (C) 2015  higherfrequencytrading.com
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU Lesser General Public License for more details.
+ *
+ *     You should have received a copy of the GNU Lesser General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.openhft.chronicle.queue.impl.single;
+
+import net.openhft.chronicle.queue.ChronicleQueue;
+import net.openhft.chronicle.queue.ChronicleQueueBuilder;
+import net.openhft.chronicle.wire.BinaryWire;
+import net.openhft.chronicle.wire.TextWire;
+import net.openhft.chronicle.wire.Wire;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.File;
+import java.io.IOException;
+
+public class SingleChronicleQueueBuilder implements ChronicleQueueBuilder {
+    private String name;
+    private long blockSize;
+    private Class<? extends Wire> wireType;
+
+    public SingleChronicleQueueBuilder(File name) {
+        this(name.getAbsolutePath());
+    }
+
+    public SingleChronicleQueueBuilder(String name) {
+        this.name = name;
+        this.blockSize = 64L << 20;
+        this.wireType = BinaryWire.class;
+    }
+
+    public String name() {
+        return this.name;
+    }
+
+    public SingleChronicleQueueBuilder blockSize(int blockSize) {
+        this.blockSize = blockSize;
+        return this;
+    }
+
+    public long blockSize() {
+        return this.blockSize;
+    }
+
+    public SingleChronicleQueueBuilder wireType(Class<? extends Wire> wireType) {
+        this.wireType = wireType;
+        return this;
+    }
+
+    public Class<? extends Wire> wireType() {
+        return this.wireType;
+    }
+
+    @NotNull
+    public ChronicleQueue build() throws IOException {
+        throw new UnsupportedOperationException("Not yet implemented");
+    }
+
+    @NotNull
+    @SuppressWarnings("CloneDoesntDeclareCloneNotSupportedException")
+    @Override
+    public SingleChronicleQueueBuilder clone() {
+        try {
+            return (SingleChronicleQueueBuilder) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new AssertionError(e);
+        }
+    }
+
+    public static SingleChronicleQueueBuilder binary(File name) {
+        return binary(name.getAbsolutePath());
+    }
+
+    public static SingleChronicleQueueBuilder binary(String name) {
+        return new SingleChronicleQueueBuilder(name)
+                .wireType(BinaryWire.class);
+    }
+
+    public static SingleChronicleQueueBuilder text(File name) {
+        return text(name.getAbsolutePath());
+    }
+
+    public static SingleChronicleQueueBuilder text(String name) {
+        return new SingleChronicleQueueBuilder(name)
+                .wireType(TextWire.class);
+    }
+}
diff --git a/...eue/src/main/java/net/openhft/chronicle/queue/impl/single/SingleChronicleQueueFormat.java b/...eue/src/main/java/net/openhft/chronicle/queue/impl/single/SingleChronicleQueueFormat.java
@@ -15,16 +15,7 @@
  */
 package net.openhft.chronicle.queue.impl.single;
 
-import net.openhft.chronicle.queue.impl.ChronicleQueueFormat;
+import net.openhft.chronicle.queue.impl.AbstractChronicleQueueFormat;
-import net.openhft.chronicle.wire.WireIn;
-import net.openhft.chronicle.wire.WireOut;
 
-public class SingleChronicleQueueFormat implements ChronicleQueueFormat {
+class SingleChronicleQueueFormat extends AbstractChronicleQueueFormat {
-    @Override
-    public void readMarshallable(WireIn wireIn) throws IllegalStateException {
-    }
-
-    @Override
-    public void writeMarshallable(WireOut wireOut) {
-    }
 }