[Java] Tidy up after merge of PR #819.

Author: mjpt777

sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/java/JavaGenerator.java

@@ -2074,8 +2074,7 @@ else if (encoding.primitiveType() == PrimitiveType.UINT8)
                 Generators.toUpperFirstChar(propertyName),
                 generateArrayFieldNotPresentCondition(propertyToken.version(), indent),
                 fieldLength,
-                offset
-            );
+                offset);
 
             new Formatter(sb).format("\n" +
                 indent + "    public int get%s(final %s dst, final int dstOffset, final int length)\n" +
@@ -2089,8 +2088,7 @@ else if (encoding.primitiveType() == PrimitiveType.UINT8)
                 fqMutableBuffer,
                 generateArrayFieldNotPresentCondition(propertyToken.version(), indent),
                 fieldLength,
-                offset
-            );
+                offset);
 
             new Formatter(sb).format("\n" +
                 indent + "    public void wrap%s(final %s wrapBuffer)\n" +
@@ -2103,8 +2101,7 @@ else if (encoding.primitiveType() == PrimitiveType.UINT8)
                 readOnlyBuffer,
                 fieldLength,
                 generateWrapFieldNotPresentCondition(propertyToken.version(), indent),
-                offset
-            );
+                offset);
         }
 
         return sb;

sbe-tool/src/test/java/uk/co/real_logic/sbe/generation/java/FixedSizeDataGeneratorTest.java

@@ -166,7 +166,7 @@ private Class<?> compile(final String className) throws Exception
     private Object getTestMessage2Encoder(final UnsafeBuffer buffer) throws Exception
     {
         final Object encoder = compile("TestMessage2Encoder").getConstructor().newInstance();
-        return wrap(0, encoder, buffer, BUFFER_CLASS);
+        return wrap(encoder, buffer);
     }
 
     private Object getTestMessage2Decoder(final UnsafeBuffer buffer, final Object encoder) throws Exception
@@ -186,15 +186,13 @@ private static Object wrap(
         return decoder;
     }
 
-    private static Object wrap(
-        final int bufferOffset, final Object flyweight, final MutableDirectBuffer buffer, final Class<?> bufferClass)
-        throws Exception
+    private static Object wrap(final Object flyweight, final UnsafeBuffer buffer) throws Exception
     {
         flyweight
             .getClass()
-            .getDeclaredMethod("wrap", bufferClass, int.class)
-            .invoke(flyweight, buffer, bufferOffset);
+            .getDeclaredMethod("wrap", BUFFER_CLASS, int.class)
+            .invoke(flyweight, buffer, 0);
+
         return flyweight;
     }
-
 }

sbe-tool/src/test/java/uk/co/real_logic/sbe/generation/java/ReflectionUtil.java

@@ -19,7 +19,7 @@
 import org.agrona.MutableDirectBuffer;
 import uk.co.real_logic.sbe.generation.Generators;
 
-public final class ReflectionUtil
+final class ReflectionUtil
 {
     static int getSbeSchemaVersion(final Object encoder) throws Exception
     {
@@ -90,12 +90,12 @@ static boolean getCruiseControl(final Object extras) throws Exception
         return (boolean)extras.getClass().getMethod("cruiseControl").invoke(extras);
     }
 
-    public static int getCapacity(final Object flyweight) throws Exception
+    static int getCapacity(final Object flyweight) throws Exception
     {
         return getInt(flyweight, "capacity");
     }
 
-    public static void setCapacity(final Object flyweight, final int value) throws Exception
+    static void setCapacity(final Object flyweight, final int value) throws Exception
     {
         flyweight
             .getClass()
@@ -156,10 +156,7 @@ static int getDirectBuffer(
             .invoke(decoder, dst, dstOffset, length);
     }
 
-    static void wrapDirectBuffer(
-        final Object decoder,
-        final String name,
-        final DirectBuffer dst) throws Exception
+    static void wrapDirectBuffer(final Object decoder, final String name, final DirectBuffer dst) throws Exception
     {
         decoder
             .getClass()

sbe-tool/src/test/java/uk/co/real_logic/sbe/generation/java/SchemaExtensionTest.java

@@ -38,6 +38,7 @@
 import static uk.co.real_logic.sbe.generation.java.ReflectionUtil.*;
 import static uk.co.real_logic.sbe.xml.XmlSchemaParser.parse;
 
+@SuppressWarnings("MethodLength")
 public class SchemaExtensionTest
 {
     private static final Class<?> BUFFER_CLASS = MutableDirectBuffer.class;
@@ -63,7 +64,6 @@ public void setup() throws Exception
         generator().generate();
     }
 
-    @SuppressWarnings("MethodLength")
     @Test
     public void testMessage1() throws Exception
     {
@@ -185,7 +185,6 @@ public void testMessage1() throws Exception
         }
     }
 
-    @SuppressWarnings("MethodLength")
     @Test
     public void testMessage2() throws Exception
     {
@@ -454,19 +453,18 @@ private static Object wrap(
         return decoder;
     }
 
-    private static void wrap(
-        final int bufferOffset, final Object flyweight, final MutableDirectBuffer buffer, final Class<?> bufferClass)
+    private static void wrap(final Object flyweight, final UnsafeBuffer buffer, final Class<?> bufferClass)
         throws Exception
     {
         flyweight
             .getClass()
             .getDeclaredMethod("wrap", bufferClass, int.class)
-            .invoke(flyweight, buffer, bufferOffset);
+            .invoke(flyweight, buffer, 0);
     }
 
     private static Object wrap(final UnsafeBuffer buffer, final Object encoder) throws Exception
     {
-        wrap(0, encoder, buffer, BUFFER_CLASS);
+        wrap(encoder, buffer, BUFFER_CLASS);
 
         return encoder;
     }