[Java] Check for var data when requiring imports needs to consider nested var data in groups.

Author: mjpt777

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

@@ -171,6 +171,7 @@ public void generate() throws IOException
         {
             final Token msgToken = tokens.get(0);
             final List<Token> messageBody = getMessageBody(tokens);
+            final boolean hasVarData = -1 != findSignal(messageBody, Signal.BEGIN_VAR_DATA);
 
             int i = 0;
             final List<Token> fields = new ArrayList<>();
@@ -182,21 +183,25 @@ public void generate() throws IOException
             final List<Token> varData = new ArrayList<>();
             collectVarData(messageBody, i, varData);
 
-            generateDecoder(fields, groups, varData, msgToken);
-            generateEncoder(fields, groups, varData, msgToken);
+            generateDecoder(msgToken, fields, groups, varData, hasVarData);
+            generateEncoder(msgToken, fields, groups, varData, hasVarData);
         }
     }
 
     private void generateEncoder(
-        final List<Token> fields, final List<Token> groups, final List<Token> varData, final Token msgToken)
+        final Token msgToken,
+        final List<Token> fields,
+        final List<Token> groups,
+        final List<Token> varData,
+        final boolean hasVarData)
         throws IOException
     {
         final String className = formatClassName(encoderName(msgToken.name()));
         final String implementsString = implementsInterface(MessageEncoderFlyweight.class.getSimpleName());
 
         try (Writer out = outputManager.createOutput(className))
         {
-            out.append(generateMainHeader(ir.applicableNamespace(), ENCODER, !varData.isEmpty()));
+            out.append(generateMainHeader(ir.applicableNamespace(), ENCODER, hasVarData));
 
             generateAnnotations(BASE_INDENT, className, groups, out, 0, this::encoderName);
             out.append(generateDeclaration(className, implementsString, msgToken));
@@ -215,15 +220,19 @@ private void generateEncoder(
     }
 
     private void generateDecoder(
-        final List<Token> fields, final List<Token> groups, final List<Token> varData, final Token msgToken)
+        final Token msgToken,
+        final List<Token> fields,
+        final List<Token> groups,
+        final List<Token> varData,
+        final boolean hasVarData)
         throws IOException
     {
         final String className = formatClassName(decoderName(msgToken.name()));
         final String implementsString = implementsInterface(MessageDecoderFlyweight.class.getSimpleName());
 
         try (Writer out = outputManager.createOutput(className))
         {
-            out.append(generateMainHeader(ir.applicableNamespace(), DECODER, !varData.isEmpty()));
+            out.append(generateMainHeader(ir.applicableNamespace(), DECODER, hasVarData));
 
             generateAnnotations(BASE_INDENT, className, groups, out, 0, this::decoderName);
             out.append(generateDeclaration(className, implementsString, msgToken));

sbe-tool/src/main/java/uk/co/real_logic/sbe/ir/GenerationUtil.java

@@ -107,4 +107,17 @@ public static List<String> findSubGroupNames(final List<Token> tokens)
 
         return groupNames;
     }
+
+    public static int findSignal(final List<Token> tokens, final Signal signal)
+    {
+        for (int i = 0, endIndex = tokens.size() - 1; i < endIndex; i++)
+        {
+            if (signal == tokens.get(i).signal())
+            {
+                return i;
+            }
+        }
+
+        return -1;
+    }
 }