[Java] Extract the eachField iterator from the JavaGenerator to the JavaUtil class.

Author: mjpt777

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

@@ -27,7 +27,6 @@
 import java.io.Writer;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.function.BiConsumer;
 import java.util.function.Function;
 
 import static uk.co.real_logic.sbe.SbeTool.JAVA_INTERFACE_PACKAGE;
@@ -2191,7 +2190,7 @@ private CharSequence generateEncoderFields(
  {
  final StringBuilder sb = new StringBuilder();
 
- eachField(
+ forEachField(
  tokens,
  (fieldToken, typeToken) ->
  {
@@ -2228,7 +2227,7 @@ private CharSequence generateDecoderFields(final List<Token> tokens, final Strin
  {
  final StringBuilder sb = new StringBuilder();
 
- eachField(
+ forEachField(
  tokens,
  (fieldToken, typeToken) ->
  {
@@ -2264,24 +2263,6 @@ private CharSequence generateDecoderFields(final List<Token> tokens, final Strin
  return sb;
  }
 
- public static void eachField(final List<Token> tokens, final BiConsumer<Token, Token> consumer)
- {
- for (int i = 0, size = tokens.size(); i < size;)
- {
- final Token fieldToken = tokens.get(i);
- if (fieldToken.signal() == Signal.BEGIN_FIELD)
- {
- final Token encodingToken = tokens.get(i + 1);
- consumer.accept(fieldToken, encodingToken);
- i += fieldToken.componentTokenCount();
- }
- else
- {
- ++i;
- }
- }
- }
-
  private static void generateFieldIdMethod(final StringBuilder sb, final Token token, final String indent)
  {
  sb.append(String.format(

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

@@ -17,14 +17,18 @@
 
 import uk.co.real_logic.sbe.PrimitiveType;
 import uk.co.real_logic.sbe.SbeTool;
+import uk.co.real_logic.sbe.ir.Signal;
+import uk.co.real_logic.sbe.ir.Token;
 import uk.co.real_logic.sbe.util.ValidationUtil;
 
 import java.lang.reflect.Field;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.EnumMap;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.function.BiConsumer;
 
 import static java.lang.reflect.Modifier.STATIC;
 
@@ -270,4 +274,29 @@ public static String generateLiteral(final PrimitiveType type, final String valu
 
  return literal;
  }
+
+ /**
+ * For each field found in a list of field {@link Token}s take the field token and following type token to
+ * a {@link BiConsumer}.
+ *
+ * @param tokens to be iterated over.
+ * @param consumer to for the field and encoding token pair.
+ */
+ public static void forEachField(final List<Token> tokens, final BiConsumer<Token, Token> consumer)
+ {
+ for (int i = 0, size = tokens.size(); i < size;)
+ {
+ final Token fieldToken = tokens.get(i);
+ if (fieldToken.signal() == Signal.BEGIN_FIELD)
+ {
+ final Token typeToken = tokens.get(i + 1);
+ consumer.accept(fieldToken, typeToken);
+ i += fieldToken.componentTokenCount();
+ }
+ else
+ {
+ ++i;
+ }
+ }
+ }
 }

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

@@ -5,7 +5,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static uk.co.real_logic.sbe.generation.java.JavaGenerator.eachField;
+import static uk.co.real_logic.sbe.generation.java.JavaUtil.forEachField;
 
 final class NamedToken
 {
@@ -21,7 +21,7 @@ final class NamedToken
  static List<NamedToken> gatherNamedFieldTokens(final List<Token> fields)
  {
  final List<NamedToken> namedTokens = new ArrayList<>();
- eachField(fields, (f, t) -> namedTokens.add(new NamedToken(f.name(), t)));
+ forEachField(fields, (f, t) -> namedTokens.add(new NamedToken(f.name(), t)));
  return namedTokens;
  }
 }