[Java] Remove usage of CodecUtil in the Java OTF.

Author: mjpt777

sbe-samples/src/main/java/uk/co/real_logic/sbe/examples/ExampleTokenListener.java

@@ -21,6 +21,7 @@
 import uk.co.real_logic.sbe.ir.Encoding;
 import uk.co.real_logic.sbe.ir.Token;
 import uk.co.real_logic.sbe.otf.TokenListener;
+import uk.co.real_logic.sbe.otf.Util;
 
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
@@ -207,7 +208,7 @@ private long readEncodingAsLong(
  return constOrNotPresentValue.longValue();
  }
 
- return getLong(buffer, bufferIndex, typeToken.encoding());
+ return Util.getLong(buffer, bufferIndex, typeToken.encoding());
  }
 
  private static PrimitiveValue constOrNotPresentValue(final Token token, final int actingVersion)
@@ -279,42 +280,6 @@ private static void mapEncodingToString(
  }
  }
 
- private static long getLong(final DirectBuffer buffer, final int index, final Encoding encoding)
- {
- switch (encoding.primitiveType())
- {
- case CHAR:
- return CodecUtil.charGet(buffer, index);
-
- case INT8:
- return CodecUtil.int8Get(buffer, index);
-
- case INT16:
- return CodecUtil.int16Get(buffer, index, encoding.byteOrder());
-
- case INT32:
- return CodecUtil.int32Get(buffer, index, encoding.byteOrder());
-
- case INT64:
- return CodecUtil.int64Get(buffer, index, encoding.byteOrder());
-
- case UINT8:
- return CodecUtil.uint8Get(buffer, index);
-
- case UINT16:
- return CodecUtil.uint16Get(buffer, index, encoding.byteOrder());
-
- case UINT32:
- return CodecUtil.uint32Get(buffer, index, encoding.byteOrder());
-
- case UINT64:
- return CodecUtil.uint64Get(buffer, index, encoding.byteOrder());
-
- default:
- throw new IllegalArgumentException("Unsupported type for long: " + encoding.primitiveType());
- }
- }
-
  private void printScope()
  {
  final Iterator<String> i = namedScope.descendingIterator();

sbe-tool/src/main/java/uk/co/real_logic/sbe/otf/OtfMessageDecoder.java

@@ -169,8 +169,11 @@ private static int decodeVarData(
  if (Signal.BEGIN_VAR_DATA == token.signal())
  {
  final Token lengthToken = tokens.get(i + 2);
- final int length = getInt(buffer, bufferIndex + lengthToken.offset(),
- lengthToken.encoding().primitiveType(), lengthToken.encoding().byteOrder());
+ final int length = getInt(
+ buffer,
+ bufferIndex + lengthToken.offset(),
+ lengthToken.encoding().primitiveType(),
+ lengthToken.encoding().byteOrder());
 
  final Token varDataToken = tokens.get(i + 3);
  bufferIndex += varDataToken.offset();

sbe-tool/src/main/java/uk/co/real_logic/sbe/otf/Util.java

@@ -18,6 +18,7 @@
 import uk.co.real_logic.agrona.DirectBuffer;
 import uk.co.real_logic.sbe.PrimitiveType;
 import uk.co.real_logic.sbe.codec.java.CodecUtil;
+import uk.co.real_logic.sbe.ir.Encoding;
 
 import java.nio.ByteOrder;
 
@@ -27,35 +28,79 @@
 public class Util
 {
  /**
- * Get an integer value from a buffer at a given index.
+ * Get an integer value from a buffer at a given index for a {@link PrimitiveType}.
  *
- * @param buffer  from which to read.
- * @param bufferIndex at which he integer should be read.
- * @param type  of the integer encoded in the buffer.
- * @param byteOrder  of the integer in the buffer.
+ * @param buffer from which to read.
+ * @param index  at which he integer should be read.
+ * @param type of the integer encoded in the buffer.
+ * @param byteOrder of the integer in the buffer.
  * @return the value of the encoded integer.
  */
- static int getInt(final DirectBuffer buffer, final int bufferIndex, final PrimitiveType type, final ByteOrder byteOrder)
+ public static int getInt(final DirectBuffer buffer, final int index, final PrimitiveType type, final ByteOrder byteOrder)
  {
  switch (type)
  {
  case INT8:
- return CodecUtil.int8Get(buffer, bufferIndex);
+ return buffer.getByte(index);
 
  case UINT8:
- return CodecUtil.uint8Get(buffer, bufferIndex);
+ return (short)(buffer.getByte(index) & 0xFF);
 
  case INT16:
- return CodecUtil.int16Get(buffer, bufferIndex, byteOrder);
+ return buffer.getShort(index, byteOrder);
 
  case UINT16:
- return CodecUtil.uint16Get(buffer, bufferIndex, byteOrder);
+ return buffer.getShort(index, byteOrder) & 0xFFFF;
 
  case INT32:
- return CodecUtil.int32Get(buffer, bufferIndex, byteOrder);
+ return buffer.getInt(index, byteOrder);
 
  default:
  throw new IllegalArgumentException("Unsupported type: " + type);
  }
  }
+
+ /**
+ * Get a long value from a buffer at a given index for a given {@link Encoding}.
+ *
+ * @param buffer from which to read.
+ * @param index at which he integer should be read.
+ * @param encoding of the value.
+ * @return the value of the encoded long.
+ */
+ public static long getLong(final DirectBuffer buffer, final int index, final Encoding encoding)
+ {
+ switch (encoding.primitiveType())
+ {
+ case CHAR:
+ return buffer.getByte(index);
+
+ case INT8:
+ return buffer.getByte(index);
+
+ case INT16:
+ return buffer.getShort(index, encoding.byteOrder());
+
+ case INT32:
+ return buffer.getInt(index, encoding.byteOrder());
+
+ case INT64:
+ return buffer.getLong(index, encoding.byteOrder());
+
+ case UINT8:
+ return (short)(buffer.getByte(index) & 0xFF);
+
+ case UINT16:
+ return buffer.getShort(index, encoding.byteOrder()) & 0xFFFF;
+
+ case UINT32:
+ return buffer.getInt(index, encoding.byteOrder()) & 0xFFFF_FFFFL;
+
+ case UINT64:
+ return buffer.getLong(index, encoding.byteOrder());
+
+ default:
+ throw new IllegalArgumentException("Unsupported type for long: " + encoding.primitiveType());
+ }
+ }
 }