Merge remote-tracking branch 'origin/master'

Author: peter-lawrey

chronicle/src/main/java/com/higherfrequencytrading/chronicle/impl/ChronicleBuilder.java

@@ -0,0 +1,84 @@
+package com.higherfrequencytrading.chronicle.impl;
+
+import com.higherfrequencytrading.chronicle.tools.ChronicleTools;
+
+import java.io.IOException;
+import java.nio.ByteOrder;
+
+/**
+ * @author [email protected]
+ * @since 2013-06-30
+ */
+public class ChronicleBuilder {
+
+  public static IndexedChronicleBuilder newIndexedChronicleBuilder(String basePath) {
+    return new IndexedChronicleBuilder(basePath);
+  }
+
+  public static IntIndexedChronicleBuilder newIntIndexedChronicleBuilder(String basePath) {
+    return new IntIndexedChronicleBuilder(basePath);
+  }
+
+  public static class IndexedChronicleBuilder {
+
+    protected String basePath;
+    protected int dataBitSizeHint =
+        ChronicleTools.is64Bit() ? IndexedChronicle.DEFAULT_DATA_BITS_SIZE : IndexedChronicle.DEFAULT_DATA_BITS_SIZE32;
+    protected ByteOrder byteOrder = ByteOrder.nativeOrder();
+    protected boolean minimiseByteBuffers = !ChronicleTools.is64Bit();
+    protected boolean synchronousMode = false;
+    protected boolean useUnsafe = false;
+
+    public IndexedChronicleBuilder(String basePath) {
+      this.basePath = basePath;
+    }
+
+    public IndexedChronicleBuilder dataBitSizeHint(int dataBitSizeHint) {
+      this.dataBitSizeHint = dataBitSizeHint;
+      return this;
+    }
+
+    public IndexedChronicleBuilder byteOrder(ByteOrder byteOrder) {
+      this.byteOrder = byteOrder;
+      return this;
+    }
+
+    public IndexedChronicleBuilder minimiseByteBuffers(boolean minimiseByteBuffers) {
+      this.minimiseByteBuffers = minimiseByteBuffers;
+      return this;
+    }
+
+    public IndexedChronicleBuilder useSynchronousMode(boolean synchronousMode) {
+      this.synchronousMode = synchronousMode;
+      return this;
+    }
+
+    public IndexedChronicleBuilder useUnsafe(boolean useUnsafe) {
+      this.useUnsafe = useUnsafe;
+      return this;
+    }
+
+    public IndexedChronicle build() throws IOException {
+      IndexedChronicle indexedChronicle =
+          new IndexedChronicle(basePath, dataBitSizeHint, byteOrder, minimiseByteBuffers, synchronousMode);
+      indexedChronicle.useUnsafe(useUnsafe);
+      return indexedChronicle;
+    }
+  }
+
+  public static class IntIndexedChronicleBuilder extends IndexedChronicleBuilder {
+
+    public IntIndexedChronicleBuilder(String basePath) {
+      super(basePath);
+    }
+
+    @Override
+    public IntIndexedChronicle build() throws IOException {
+      IntIndexedChronicle intIndexedChronicle = new IntIndexedChronicle(basePath, dataBitSizeHint, byteOrder);
+      intIndexedChronicle.useUnsafe(useUnsafe);
+      return intIndexedChronicle;
+    }
+  }
+
+
+}

chronicle/src/test/java/com/higherfrequencytrading/chronicle/impl/IndexedChronicleTest.java

@@ -47,9 +47,12 @@ public void rewritibleEntries() throws IOException {
 
     private void doRewriteableEntries(boolean useUnsafe, boolean minimiseByteBuffers, boolean synchronousMode) throws IOException {
         String basePath = TMP + File.separator + "deleteme.ict";
-        IndexedChronicle tsc = new IndexedChronicle(basePath, IndexedChronicle.DEFAULT_DATA_BITS_SIZE32,
-                ByteOrder.nativeOrder(), minimiseByteBuffers, synchronousMode);
-        tsc.useUnsafe(useUnsafe);
+        IndexedChronicle tsc = ChronicleBuilder.newIndexedChronicleBuilder(basePath)
+            .dataBitSizeHint(IndexedChronicle.DEFAULT_DATA_BITS_SIZE32)
+            .minimiseByteBuffers(minimiseByteBuffers)
+            .useSynchronousMode(synchronousMode)
+            .useUnsafe(useUnsafe).build();
+
         deleteOnExit(basePath);
 
         tsc.clear();