[Java] Tidy up after merge of PR aeron-io#877.

Author: mjpt777

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

@@ -60,10 +60,10 @@ void generate() throws IOException
  final ArrayList<String> modules = new ArrayList<>();
  Files.walk(outputManager.getSrcDirPath())
  .filter(Files::isRegularFile)
- .map(path -> path.getFileName().toString())
- .filter(fileName -> fileName.endsWith(".rs"))
- .filter(fileName -> !fileName.equals("lib.rs"))
- .map(fileName -> fileName.substring(0, fileName.length() - 3))
+ .map((path) -> path.getFileName().toString())
+ .filter((fileName) -> fileName.endsWith(".rs"))
+ .filter((fileName) -> !fileName.equals("lib.rs"))
+ .map((fileName) -> fileName.substring(0, fileName.length() - 3))
  .forEach(modules::add);
 
  // add modules

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

@@ -119,7 +119,6 @@ void appendTo(final Appendable dest) throws IOException
  dest.append(sb);
  }
 
- @Override
  public SubGroup addSubGroup(final String name, final int level, final Token groupToken)
  {
  final SubGroup subGroup = new SubGroup(name, level, groupToken);

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

@@ -33,10 +33,11 @@
 import java.util.Set;
 
 import static java.lang.String.format;
-import static uk.co.real_logic.sbe.generation.rust.RustGenerator.CodecType.Decoder;
-import static uk.co.real_logic.sbe.generation.rust.RustGenerator.CodecType.Encoder;
 import static uk.co.real_logic.sbe.generation.rust.RustUtil.*;
-import static uk.co.real_logic.sbe.ir.GenerationUtil.*;
+import static uk.co.real_logic.sbe.ir.GenerationUtil.collectFields;
+import static uk.co.real_logic.sbe.ir.GenerationUtil.collectGroups;
+import static uk.co.real_logic.sbe.ir.GenerationUtil.collectVarData;
+import static uk.co.real_logic.sbe.ir.GenerationUtil.getMessageBody;
 import static uk.co.real_logic.sbe.ir.Signal.BEGIN_ENUM;
 import static uk.co.real_logic.sbe.ir.Signal.BEGIN_SET;
 
@@ -53,15 +54,15 @@ enum CodecType
  {
  Decoder
  {
- @Override String bufType()
+ String bufType()
  {
  return READ_BUF_TYPE;
  }
  },
 
  Encoder
  {
- @Override String bufType()
+ String bufType()
  {
  return WRITE_BUF_TYPE;
  }
@@ -81,8 +82,8 @@ interface ParentDef
  /**
  * Create a new Rust language {@link CodeGenerator}.
  *
- * @param ir  for the messages and types.
- * @param outputManager  for generating the codecs to.
+ * @param ir for the messages and types.
+ * @param outputManager for generating the codecs to.
  */
  public RustGenerator(
  final Ir ir,
@@ -227,9 +228,9 @@ static void generateEncoderFields(
  break;
  }
  }
- catch (final IOException e)
+ catch (final IOException ex)
  {
- throw new RuntimeException(e);
+ throw new RuntimeException(ex);
  }
  });
  }
@@ -1465,6 +1466,4 @@ private static void appendConstAccessor(
  indent(writer, level + 1, rustExpression + "\n");
  indent(writer, level, "}\n\n");
  }
-
-
 }

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

@@ -44,6 +44,7 @@ static File createDir(final String dirName)
  {
  throw new IllegalStateException("Unable to create directory: " + dirName);
  }
+
  return dir;
  }
 
@@ -77,7 +78,6 @@ public RustOutputManager(final String baseDirName, final String packageName)
  * @return a {@link java.io.Writer} to which the source code should be written.
  * @throws IOException if an issue occurs when creating the file.
  */
- @Override
  public Writer createOutput(final String name) throws IOException
  {
  final String fileName = toLowerSnakeCase(name) + ".rs";
@@ -102,5 +102,4 @@ Path getSrcDirPath()
  {
  return srcDir.toPath();
  }
-
 }

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

@@ -32,13 +32,12 @@
 import static uk.co.real_logic.sbe.generation.rust.RustGenerator.CodecType.Encoder;
 
 /**
- *
+ * Utility method for Rust codec generation.
  */
 public class RustUtil
 {
  static final String INDENT = " ";
- public static final Map<PrimitiveType, String> TYPE_NAME_BY_PRIMITIVE_TYPE_MAP =
- new EnumMap<>(PrimitiveType.class);
+ static final Map<PrimitiveType, String> TYPE_NAME_BY_PRIMITIVE_TYPE_MAP = new EnumMap<>(PrimitiveType.class);
 
  static
  {

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

@@ -41,7 +41,6 @@ class SubGroup implements RustGenerator.ParentDef
  this.groupToken = groupToken;
  }
 
- @Override
  public SubGroup addSubGroup(final String name, final int level, final Token groupToken)
  {
  final SubGroup subGroup = new SubGroup(name, level, groupToken);