Modify libraries to use the MutableDirectBuffer/DirectBuffer interface

Author: RichardWarburton

main/java/uk/co/real_logic/sbe/codec/java/CodecUtil.java

@@ -15,24 +15,27 @@
  */
 package uk.co.real_logic.sbe.codec.java;
 
+import uk.co.real_logic.agrona.DirectBuffer;
+import uk.co.real_logic.agrona.MutableDirectBuffer;
+
 import java.nio.ByteOrder;
 
 public class CodecUtil
 {
  /**
- * Put a character to a {@link DirectBuffer} at the given index.
+ * Put a character to a {@link MutableDirectBuffer} at the given index.
  *
  * @param buffer to which the value should be written.
  * @param index from which to begin writing.
  * @param value to be be written.
  */
- public static void charPut(final DirectBuffer buffer, final int index, final byte value)
+ public static void charPut(final MutableDirectBuffer buffer, final int index, final byte value)
  {
  buffer.putByte(index, value);
  }
 
  /**
- * Put an array into a {@link DirectBuffer} at the given index.
+ * Put an array into a {@link MutableDirectBuffer} at the given index.
  *
  * @param buffer to which the value should be written.
  * @param index from which to begin writing.
@@ -41,25 +44,25 @@ public static void charPut(final DirectBuffer buffer, final int index, final byt
  * @param length of the src buffer to copy.
  */
  public static void charsPut(
- final DirectBuffer buffer, final int index, final byte[] src, final int offset, final int length)
+ final MutableDirectBuffer buffer, final int index, final byte[] src, final int offset, final int length)
  {
  buffer.putBytes(index, src, offset, length);
  }
 
  /**
- * Put a 8-bit integer to a {@link DirectBuffer} at the given index.
+ * Put a 8-bit integer to a {@link MutableDirectBuffer} at the given index.
  *
  * @param buffer to which the value should be written.
  * @param index from which to begin writing.
  * @param value to be be written.
  */
- public static void int8Put(final DirectBuffer buffer, final int index, final byte value)
+ public static void int8Put(final MutableDirectBuffer buffer, final int index, final byte value)
  {
  buffer.putByte(index, value);
  }
 
  /**
- * Put an array into a {@link DirectBuffer} at the given index.
+ * Put an array into a {@link MutableDirectBuffer} at the given index.
  *
  * @param buffer to which the value should be written.
  * @param index from which to begin writing.
@@ -68,98 +71,98 @@ public static void int8Put(final DirectBuffer buffer, final int index, final byt
  * @param length of the src buffer to copy.
  */
  public static void int8sPut(
- final DirectBuffer buffer, final int index, final byte[] src, final int offset, final int length)
+ final MutableDirectBuffer buffer, final int index, final byte[] src, final int offset, final int length)
  {
  buffer.putBytes(index, src, offset, length);
  }
 
  /**
- * Put a 16-bit integer to a {@link DirectBuffer} at the given index.
+ * Put a 16-bit integer to a {@link MutableDirectBuffer} at the given index.
  *
  * @param buffer to which the value should be written.
  * @param index from which to begin writing.
  * @param value to be be written.
  * @param byteOrder for the buffer encoding
  */
- public static void int16Put(final DirectBuffer buffer, final int index, final short value, final ByteOrder byteOrder)
+ public static void int16Put(final MutableDirectBuffer buffer, final int index, final short value, final ByteOrder byteOrder)
  {
  buffer.putShort(index, value, byteOrder);
  }
 
  /**
- * Put a 32-bit integer to a {@link DirectBuffer} at the given index.
+ * Put a 32-bit integer to a {@link MutableDirectBuffer} at the given index.
  *
  * @param buffer to which the value should be written.
  * @param index from which to begin writing.
  * @param value to be be written.
  * @param byteOrder for the buffer encoding
  */
- public static void int32Put(final DirectBuffer buffer, final int index, final int value, final ByteOrder byteOrder)
+ public static void int32Put(final MutableDirectBuffer buffer, final int index, final int value, final ByteOrder byteOrder)
  {
  buffer.putInt(index, value, byteOrder);
  }
 
  /**
- * Put a 64-bit integer to a {@link DirectBuffer} at the given index.
+ * Put a 64-bit integer to a {@link MutableDirectBuffer} at the given index.
  *
  * @param buffer to which the value should be written.
  * @param index from which to begin writing.
  * @param value to be be written.
  * @param byteOrder for the buffer encoding
  */
- public static void int64Put(final DirectBuffer buffer, final int index, final long value, final ByteOrder byteOrder)
+ public static void int64Put(final MutableDirectBuffer buffer, final int index, final long value, final ByteOrder byteOrder)
  {
  buffer.putLong(index, value, byteOrder);
  }
 
  /**
- * Put a 8-bit signed integer to a {@link DirectBuffer} at the given index.
+ * Put a 8-bit signed integer to a {@link MutableDirectBuffer} at the given index.
  *
  * @param buffer to which the value should be written.
  * @param index from which to begin writing.
  * @param value to be be written.
  * @throws IllegalArgumentException if the number is negative
  */
- public static void uint8Put(final DirectBuffer buffer, final int index, final short value)
+ public static void uint8Put(final MutableDirectBuffer buffer, final int index, final short value)
  {
  buffer.putByte(index, (byte)value);
  }
 
  /**
- * Put a 16-bit signed integer to a {@link DirectBuffer} at the given index.
+ * Put a 16-bit signed integer to a {@link MutableDirectBuffer} at the given index.
  *
  * @param buffer to which the value should be written.
  * @param index from which to begin writing.
  * @param value to be be written.
  * @param byteOrder for the buffer encoding
  */
- public static void uint16Put(final DirectBuffer buffer, final int index, final int value, final ByteOrder byteOrder)
+ public static void uint16Put(final MutableDirectBuffer buffer, final int index, final int value, final ByteOrder byteOrder)
  {
  buffer.putShort(index, (short)value, byteOrder);
  }
 
  /**
- * Put a 32-bit signed integer to a {@link DirectBuffer} at the given index.
+ * Put a 32-bit signed integer to a {@link MutableDirectBuffer} at the given index.
  *
  * @param buffer to which the value should be written.
  * @param index from which to begin writing.
  * @param value to be be written.
  * @param byteOrder for the buffer encoding
  */
- public static void uint32Put(final DirectBuffer buffer, final int index, final long value, final ByteOrder byteOrder)
+ public static void uint32Put(final MutableDirectBuffer buffer, final int index, final long value, final ByteOrder byteOrder)
  {
  buffer.putInt(index, (int)value, byteOrder);
  }
 
  /**
- * Put a 64-bit signed integer to a {@link DirectBuffer} at the given index.
+ * Put a 64-bit signed integer to a {@link MutableDirectBuffer} at the given index.
  *
  * @param buffer to which the value should be written.
  * @param index from which to begin writing.
  * @param value to be be written.
  * @param byteOrder for the buffer encoding
  */
- public static void uint64Put(final DirectBuffer buffer, final int index, final long value, final ByteOrder byteOrder)
+ public static void uint64Put(final MutableDirectBuffer buffer, final int index, final long value, final ByteOrder byteOrder)
  {
  buffer.putLong(index, value, byteOrder);
  }
@@ -172,7 +175,7 @@ public static void uint64Put(final DirectBuffer buffer, final int index, final l
  * @param value to be be written.
  * @param byteOrder for the buffer encoding
  */
- public static void floatPut(final DirectBuffer buffer, final int index, final float value, final ByteOrder byteOrder)
+ public static void floatPut(final MutableDirectBuffer buffer, final int index, final float value, final ByteOrder byteOrder)
  {
  buffer.putFloat(index, value, byteOrder);
  }
@@ -185,7 +188,7 @@ public static void floatPut(final DirectBuffer buffer, final int index, final fl
  * @param value to be be written.
  * @param byteOrder for the buffer encoding
  */
- public static void doublePut(final DirectBuffer buffer, final int index, final double value, final ByteOrder byteOrder)
+ public static void doublePut(final MutableDirectBuffer buffer, final int index, final double value, final ByteOrder byteOrder)
  {
  buffer.putDouble(index, value, byteOrder);
  }
@@ -379,7 +382,7 @@ public static boolean uint8GetChoice(final DirectBuffer buffer, final int index,
  * @param bitIndex bit index to set.
  * @param switchOn true sets bit to 1 and false sets it to 0.
  */
- public static void uint8PutChoice(final DirectBuffer buffer, final int index, final int bitIndex, boolean switchOn)
+ public static void uint8PutChoice(final MutableDirectBuffer buffer, final int index, final int bitIndex, boolean switchOn)
  {
  byte bits = buffer.getByte(index);
  bits = (byte)(switchOn ? bits | (1 << bitIndex) : bits & ~(1 << bitIndex));
@@ -411,7 +414,7 @@ public static boolean uint16GetChoice(
  * @param byteOrder for the buffer encoding
  */
  public static void uint16PutChoice(
- final DirectBuffer buffer, final int index, final int bitIndex, final boolean switchOn, final ByteOrder byteOrder)
+ final MutableDirectBuffer buffer, final int index, final int bitIndex, final boolean switchOn, final ByteOrder byteOrder)
  {
  short bits = buffer.getShort(index, byteOrder);
  bits = (short)(switchOn ? bits | (1 << bitIndex) : bits & ~(1 << bitIndex));
@@ -443,7 +446,7 @@ public static boolean uint32GetChoice(
  * @param byteOrder for the buffer encoding
  */
  public static void uint32PutChoice(
- final DirectBuffer buffer, final int index, final int bitIndex, final boolean switchOn, final ByteOrder byteOrder)
+ final MutableDirectBuffer buffer, final int index, final int bitIndex, final boolean switchOn, final ByteOrder byteOrder)
  {
  int bits = buffer.getInt(index, byteOrder);
  bits = switchOn ? bits | (1 << bitIndex) : bits & ~(1 << bitIndex);
@@ -475,7 +478,7 @@ public static boolean uint64GetChoice(
  * @param byteOrder for the buffer encoding
  */
  public static void uint64PutChoice(
- final DirectBuffer buffer, final int index, final int bitIndex, final boolean switchOn, final ByteOrder byteOrder)
+ final MutableDirectBuffer buffer, final int index, final int bitIndex, final boolean switchOn, final ByteOrder byteOrder)
  {
  long bits = buffer.getLong(index, byteOrder);
  bits = switchOn ? bits | (1L << bitIndex) : bits & ~(1L << bitIndex);

main/java/uk/co/real_logic/sbe/generation/TargetCodeGenerator.java

@@ -15,8 +15,8 @@
  */
 package uk.co.real_logic.sbe.generation;
 
+import uk.co.real_logic.agrona.concurrent.UnsafeBuffer;
 import uk.co.real_logic.sbe.SbeTool;
-import uk.co.real_logic.sbe.codec.java.DirectBuffer;
 import uk.co.real_logic.sbe.generation.cpp98.Cpp98Generator;
 import uk.co.real_logic.sbe.generation.cpp98.NamespaceOutputManager;
 import uk.co.real_logic.sbe.generation.csharp.CSharpGenerator;
@@ -50,7 +50,7 @@ public CodeGenerator newInstance(final Ir ir, final String outputDir)
  throws IOException
  {
  return new JavaGenerator(ir,
- System.getProperty(SbeTool.JAVA_BUFFER, DirectBuffer.class.getName()),
+ System.getProperty(SbeTool.JAVA_BUFFER, UnsafeBuffer.class.getName()),
  new PackageOutputManager(outputDir, ir.applicableNamespace()));
  }
  },

main/java/uk/co/real_logic/sbe/generation/java/JavaGenerator.java

@@ -15,11 +15,15 @@
  */
 package uk.co.real_logic.sbe.generation.java;
 
+import uk.co.real_logic.agrona.DirectBuffer;
+import uk.co.real_logic.agrona.MutableDirectBuffer;
 import uk.co.real_logic.sbe.PrimitiveType;
-import uk.co.real_logic.sbe.codec.java.DirectBuffer;
 import uk.co.real_logic.sbe.generation.CodeGenerator;
 import uk.co.real_logic.sbe.generation.OutputManager;
-import uk.co.real_logic.sbe.ir.*;
+import uk.co.real_logic.sbe.ir.Encoding;
+import uk.co.real_logic.sbe.ir.Ir;
+import uk.co.real_logic.sbe.ir.Signal;
+import uk.co.real_logic.sbe.ir.Token;
 import uk.co.real_logic.sbe.util.Verify;
 
 import java.io.IOException;
@@ -59,7 +63,7 @@ private String validateBufferImplementation(final String fullyQualifiedBufferImp
  try
  {
  final Class<?> cls = Class.forName(fullyQualifiedBufferImplementation);
- if (!cls.isAssignableFrom(DirectBuffer.class))
+ if (!cls.isAssignableFrom(MutableDirectBuffer.class))
  {
  throw new IllegalArgumentException(
  fullyQualifiedBufferImplementation + " doesn't implement " + DirectBuffer.class.getName());
@@ -1529,4 +1533,4 @@ private String generateLiteral(final PrimitiveType type, final String value)
 
  return literal;
  }
-}
+}

main/java/uk/co/real_logic/sbe/ir/IrDecoder.java

@@ -15,13 +15,16 @@
  */
 package uk.co.real_logic.sbe.ir;
 
+import uk.co.real_logic.agrona.MutableDirectBuffer;
+import uk.co.real_logic.agrona.concurrent.UnsafeBuffer;
 import uk.co.real_logic.sbe.PrimitiveType;
-import uk.co.real_logic.sbe.codec.java.DirectBuffer;
 import uk.co.real_logic.sbe.ir.generated.FrameCodec;
-
 import uk.co.real_logic.sbe.ir.generated.TokenCodec;
 
-import java.io.*;
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
 import java.nio.MappedByteBuffer;
 import java.nio.channels.FileChannel;
@@ -35,7 +38,7 @@ public class IrDecoder implements Closeable
  private static final int CAPACITY = 4096;
 
  private final FileChannel channel;
- private final DirectBuffer directBuffer;
+ private final MutableDirectBuffer directBuffer;
  private final FrameCodec frameCodec = new FrameCodec();
  private final TokenCodec tokenCodec = new TokenCodec();
  private int offset;
@@ -47,15 +50,15 @@ public class IrDecoder implements Closeable
  private int irId;
  private int irVersion = 0;
  private final byte[] valArray = new byte[CAPACITY];
- private final DirectBuffer valBuffer = new DirectBuffer(valArray);
+ private final MutableDirectBuffer valBuffer = new UnsafeBuffer(valArray);
  private final byte[] buffer = new byte[1024];
 
  public IrDecoder(final String fileName)
  throws IOException
  {
  channel = new RandomAccessFile(fileName, "r").getChannel();
  final MappedByteBuffer buffer = channel.map(FileChannel.MapMode.READ_ONLY, 0, channel.size());
- directBuffer = new DirectBuffer(buffer);
+ directBuffer = new UnsafeBuffer(buffer);
  size = channel.size();
  offset = 0;
  }
@@ -64,7 +67,7 @@ public IrDecoder(final ByteBuffer buffer)
  {
  channel = null;
  size = buffer.limit();
- directBuffer = new DirectBuffer(buffer);
+ directBuffer = new UnsafeBuffer(buffer);
  offset = 0;
  }
 

main/java/uk/co/real_logic/sbe/ir/IrEncoder.java

@@ -15,8 +15,9 @@
  */
 package uk.co.real_logic.sbe.ir;
 
+import uk.co.real_logic.agrona.MutableDirectBuffer;
+import uk.co.real_logic.agrona.concurrent.UnsafeBuffer;
 import uk.co.real_logic.sbe.PrimitiveType;
-import uk.co.real_logic.sbe.codec.java.DirectBuffer;
 import uk.co.real_logic.sbe.ir.generated.FrameCodec;
 import uk.co.real_logic.sbe.ir.generated.TokenCodec;
 import uk.co.real_logic.sbe.util.Verify;
@@ -35,12 +36,12 @@ public class IrEncoder implements Closeable
  private final FileChannel channel;
  private final ByteBuffer resultBuffer;
  private final ByteBuffer buffer;
- private final DirectBuffer directBuffer;
+ private final MutableDirectBuffer directBuffer;
  private final Ir ir;
  private final FrameCodec frameCodec = new FrameCodec();
  private final TokenCodec tokenCodec = new TokenCodec();
  private final byte[] valArray = new byte[CAPACITY];
- private final DirectBuffer valBuffer = new DirectBuffer(valArray);
+ private final UnsafeBuffer valBuffer = new UnsafeBuffer(valArray);
  private int totalSize = 0;
 
  public IrEncoder(final String fileName, final Ir ir)
@@ -49,7 +50,7 @@ public IrEncoder(final String fileName, final Ir ir)
  channel = new FileOutputStream(fileName).getChannel();
  resultBuffer = null;
  buffer = ByteBuffer.allocateDirect(CAPACITY);
- directBuffer = new DirectBuffer(buffer);
+ directBuffer = new UnsafeBuffer(buffer);
  this.ir = ir;
  }
 
@@ -58,7 +59,7 @@ public IrEncoder(final ByteBuffer buffer, final Ir ir)
  channel = null;
  resultBuffer = buffer;
  this.buffer = ByteBuffer.allocateDirect(CAPACITY);
- directBuffer = new DirectBuffer(this.buffer);
+ directBuffer = new UnsafeBuffer(this.buffer);
  this.ir = ir;
  }