[Java] Fix up CSharp naming references and some warnings.

Author: mjpt777

README.md

@@ -3,7 +3,7 @@ Simple Binary Encoding (SBE)
 
 [SBE](https://github.com/FIXTradingCommunity/fix-simple-binary-encoding) is an OSI layer 6 presentation for 
 encoding and decoding binary application messages for low-latency financial applications. This repository contains 
-the reference implementations in Java, C++, Golang, and Csharp.
+the reference implementations in Java, C++, Golang, and C#.
 
 Further details on the background and usage of SBE can be found on the
 [Wiki](https://github.com/real-logic/simple-binary-encoding/wiki).
@@ -138,7 +138,7 @@ First build using Gradle to generate the SBE jar and then use it to
 generate the C# code used for testing and the examples.
 
  $ ./gradlew
- $ ./gradlew generateCsharpCodecs
+ $ ./gradlew generateCSharpCodecs
 
 You can then use the [Visual Studio 2017 Community solution](https://github.com/real-logic/simple-binary-encoding/blob/master/csharp/csharp.sln) to build and explore the
 example. This solution also builds some tests which can be run via the provided

build.gradle

@@ -524,14 +524,14 @@ task generateGolangCodecs {
  'generateGolangCodecsWithXSD'
 }
 
-task(generateCsharpCodecs, type:JavaExec) {
+task(generateCSharpCodecs, type:JavaExec) {
  main = 'uk.co.real_logic.sbe.SbeTool'
  classpath = project(':sbe-all').sourceSets.main.runtimeClasspath
  systemProperties(
  'sbe.output.dir': 'csharp/sbe-generated',
- 'sbe.target.language': 'uk.co.real_logic.sbe.generation.csharp.Csharp',
+ 'sbe.target.language': 'uk.co.real_logic.sbe.generation.csharp.CSharp',
  'sbe.validation.xsd': validationXsdPath)
- args = [ 
+ args = [
  'sbe-tool/src/test/resources/FixBinary.xml',
  'sbe-tool/src/test/resources/issue435.xml',
  'sbe-tool/src/test/resources/since-deprecated-test-schema.xml',

csharp/.nuget/sbe-tool.sh

@@ -37,6 +37,6 @@ if [ ! -f $SCHEMA ]; then echo no schema at $SCHEMA; exit 1; fi
 java \
 -Dsbe.output.dir=$OUTPUTDIR \
 -Dsbe.generate.ir="false" \
--Dsbe.target.language="uk.co.real_logic.sbe.generation.csharp.Csharp" \
+-Dsbe.target.language="uk.co.real_logic.sbe.generation.csharp.CSharp" \
 -jar $SBE_JAR \
 $SCHEMA

csharp/README.md

@@ -19,7 +19,7 @@ The Java code that performs the generation of C# code is
 [here](https://github.com/real-logic/simple-binary-encoding/tree/master/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/csharp).
 
  $ ./gradlew # Will build sbe-tool jar
- $ ./gradlew generateCsharpCodecs # will generate the test, benchmark, and example C# code
+ $ ./gradlew generateCSharpCodecs # will generate the test, benchmark, and example C# code
 
 The [Visual Studio 2017 Community
 solution](https://github.com/real-logic/simple-binary-encoding/blob/master/csharp/csharp.sln) provides the projects:
@@ -46,7 +46,7 @@ Want to build things yourself?
 
 For now you can:
  * build the SBE csharp generator using `gradlew`
- * generate the csharp codecs using `gradlew GenerateCsharpCodecs`
+ * generate the csharp codecs using `gradlew GenerateCSharpCodecs`
  * Use the [Visual Studio 2017 Community solution](https://github.com/real-logic/simple-binary-encoding/blob/master/csharp/csharp.sln) to build the solution, run the unit tests, examples and benchmarks
  * Use the bash script [runtests.sh](https://github.com/real-logic/simple-binary-encoding/blob/master/csharp/runtests.sh) to run the tests
  * Build the nuget package via [do-release.sh](https://github.com/real-logic/simple-binary-encoding/blob/master/csharp/.nuget/do-release.sh) although this remains a largely manual process.

sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/csharp/Csharp.java renamed to sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/csharp/CSharp.java

@@ -21,7 +21,7 @@
 
 import java.io.IOException;
 
-public class Csharp implements TargetCodeGenerator
+public class CSharp implements TargetCodeGenerator
 {
  public CodeGenerator newInstance(final Ir ir, final String outputDir) throws IOException
  {

sbe-tool/src/main/java/uk/co/real_logic/sbe/util/ValidationUtil.java

@@ -27,30 +27,27 @@ public class ValidationUtil
 {
  private static final Pattern PATTERN = Pattern.compile("\\.");
 
- private static final Set<String> CPP_KEYWORDS = new HashSet<>(
- Arrays.asList(new String[]
- {
- "alignas", "and", "and_eq", "asm", "auto",
- "bitand", "bitor", "bool", "break", "case",
- "catch", "char", "class", "compl", "const",
- "const_cast", "continue", "char16_t", "char32_t", "default",
- "delete", "do", "double", "dynamic_cast", "else",
- "enum", "explicit", "export", "extern", "false",
- "float", "for", "friend", "goto", "if",
- "inline", "int", "long", "mutable", "namespace",
- "new", "not", "not_eq", "noexcept", "operator",
- "or", "or_eq", "private", "protected", "public",
- "register", "reinterpret_cast", "return", "short", "signed",
- "sizeof", "static", "static_cast", "struct", "switch",
- "template", "this", "throw", "true", "try",
- "typedef", "typeid", "typename", "union", "unsigned",
- "using", "virtual", "void", "volatile", "wchar_t",
- "while", "xor", "xor_eq", "override",
- // since C++11
- "alignof", "constexpr", "decltype", "nullptr", "static_assert", "thread_local",
- // since C++11 have special meaning, so avoid
- "final"
- }));
+ private static final Set<String> CPP_KEYWORDS = new HashSet<>(Arrays.asList(
+ "alignas", "and", "and_eq", "asm", "auto",
+ "bitand", "bitor", "bool", "break", "case",
+ "catch", "char", "class", "compl", "const",
+ "const_cast", "continue", "char16_t", "char32_t", "default",
+ "delete", "do", "double", "dynamic_cast", "else",
+ "enum", "explicit", "export", "extern", "false",
+ "float", "for", "friend", "goto", "if",
+ "inline", "int", "long", "mutable", "namespace",
+ "new", "not", "not_eq", "noexcept", "operator",
+ "or", "or_eq", "private", "protected", "public",
+ "register", "reinterpret_cast", "return", "short", "signed",
+ "sizeof", "static", "static_cast", "struct", "switch",
+ "template", "this", "throw", "true", "try",
+ "typedef", "typeid", "typename", "union", "unsigned",
+ "using", "virtual", "void", "volatile", "wchar_t",
+ "while", "xor", "xor_eq", "override",
+ // since C++11
+ "alignof", "constexpr", "decltype", "nullptr", "static_assert", "thread_local",
+ // since C++11 have special meaning, so avoid
+ "final"));
 
  /**
  * Check value for validity of usage as a C++ identifier. A programmatic variable
@@ -116,21 +113,18 @@ private static boolean isSbeCppIdentifierPart(final char c)
  return Character.isLetterOrDigit(c) || c == '_';
  }
 
- private static final Set<String> JAVA_KEYWORDS = new HashSet<>(
- Arrays.asList(new String[]
- {
- "abstract", "assert", "boolean", "break", "byte",
- "case", "catch", "char", "class", "const",
- "continue", "default", "do", "double", "else",
- "enum", "extends", "final", "finally", "float",
- "for", "goto", "if", "implements", "import",
- "instanceof", "int", "interface", "long", "native",
- "new", "package", "private", "protected", "public",
- "return", "short", "static", "strictfp", "super",
- "switch", "synchronized", "this", "throw", "throws",
- "transient", "try", "void", "volatile", "while",
- "null", "true", "false", "_"
- }));
+ private static final Set<String> JAVA_KEYWORDS = new HashSet<>(Arrays.asList(
+ "abstract", "assert", "boolean", "break", "byte",
+ "case", "catch", "char", "class", "const",
+ "continue", "default", "do", "double", "else",
+ "enum", "extends", "final", "finally", "float",
+ "for", "goto", "if", "implements", "import",
+ "instanceof", "int", "interface", "long", "native",
+ "new", "package", "private", "protected", "public",
+ "return", "short", "static", "strictfp", "super",
+ "switch", "synchronized", "this", "throw", "throws",
+ "transient", "try", "void", "volatile", "while",
+ "null", "true", "false", "_"));
 
  /**
  * Check string for validity of usage as a Java identifier. Avoiding keywords.
@@ -199,29 +193,26 @@ private static boolean isJavaIdentifier(final String token)
  return true;
  }
 
- private static final Set<String> GOLANG_KEYWORDS = new HashSet<>(
- Arrays.asList(new String[]
- {
- /* https://golang.org/ref/spec#Keywords */
- "break", "default", "func", "interface", "select",
- "case", "defer", "go", "map", "struct",
- "chan", "else", "goto", "package", "switch",
- "const", "fallthrough", "if", "range", "type",
- "continue", "for", "import", "return", "var",
-
- /* https://golang.org/ref/spec#Predeclared_identifiers */
- /* types */
- "bool", "byte", "complex64", "complex128", "error", "float32", "float64",
- "int", "int8", "int16", "int32", "int64", "rune", "string",
- "uint", "uint8", "uint16", "uint32", "uint64", "uintptr",
- /* constants */
- "true", "false", "iota",
- /* zero value */
- "nil",
- /* functions */
- "append", "cap", "close", "complex", "copy", "delete", "imag", "len",
- "make", "new", "panic", "print", "println", "real", "recover"
- }));
+ /* https://golang.org/ref/spec#Keywords */
+ private static final Set<String> GOLANG_KEYWORDS = new HashSet<>(Arrays.asList(
+ "break", "default", "func", "interface", "select",
+ "case", "defer", "go", "map", "struct",
+ "chan", "else", "goto", "package", "switch",
+ "const", "fallthrough", "if", "range", "type",
+ "continue", "for", "import", "return", "var",
+
+ /* https://golang.org/ref/spec#Predeclared_identifiers */
+ /* types */
+ "bool", "byte", "complex64", "complex128", "error", "float32", "float64",
+ "int", "int8", "int16", "int32", "int64", "rune", "string",
+ "uint", "uint8", "uint16", "uint32", "uint64", "uintptr",
+ /* constants */
+ "true", "false", "iota",
+ /* zero value */
+ "nil",
+ /* functions */
+ "append", "cap", "close", "complex", "copy", "delete", "imag", "len",
+ "make", "new", "panic", "print", "println", "real", "recover"));
 
  /**
  * "Check" value for validity of usage as a golang identifier. From:
@@ -291,36 +282,33 @@ private static boolean isSbeGolangIdentifierPart(final char c)
  return Character.isLetterOrDigit(c) || c == '_';
  }
 
- private static final Set<String> CSHARP_KEYWORDS = new HashSet<>(
- Arrays.asList(new String[]
- {
- /**
- * https://docs.microsoft.com/en-gb/dotnet/articles/csharp/language-reference/keywords/index
- * Note this does not include the contextual keywords
- * Note "virtual" is no longer but was in early versions of C#
- */
- "abstract", "as", "base", "bool", "break",
- "byte", "case", "catch", "char", "checked",
- "class", "const", "continue", "decimal", "default",
- "delegate", "do", "double", "else", "enum",
- "event", "explicit", "extern", "false", "finally",
- "fixed", "float", "for", "foreach", "goto",
- "if", "implicit", "in", "int", "interface",
- "internal", "is", "lock", "long", "namespace",
- "new", "null", "object", "operator", "out",
- "override", "params", "private", "protected", "public",
- "readonly", "ref", "return", "sbyte", "sealed",
- "short", "sizeof", "stackalloc", "static", "string",
- "struct", "switch", "this", "throw", "true",
- "try", "typeof", "uint", "ulong", "unchecked",
- "unsafe", "ushort", "using", "using static", "virtual",
- "void", "volatile", "while"
- }));
+ /**
+ * https://docs.microsoft.com/en-gb/dotnet/articles/csharp/language-reference/keywords/index
+ * Note this does not include the contextual keywords
+ * Note "virtual" is no longer but was in early versions of C#
+ */
+ private static final Set<String> CSHARP_KEYWORDS = new HashSet<>(Arrays.asList(
+ "abstract", "as", "base", "bool", "break",
+ "byte", "case", "catch", "char", "checked",
+ "class", "const", "continue", "decimal", "default",
+ "delegate", "do", "double", "else", "enum",
+ "event", "explicit", "extern", "false", "finally",
+ "fixed", "float", "for", "foreach", "goto",
+ "if", "implicit", "in", "int", "interface",
+ "internal", "is", "lock", "long", "namespace",
+ "new", "null", "object", "operator", "out",
+ "override", "params", "private", "protected", "public",
+ "readonly", "ref", "return", "sbyte", "sealed",
+ "short", "sizeof", "stackalloc", "static", "string",
+ "struct", "switch", "this", "throw", "true",
+ "try", "typeof", "uint", "ulong", "unchecked",
+ "unsafe", "ushort", "using", "using static", "virtual",
+ "void", "volatile", "while"));
 
  /**
  * "Check" value for validity of usage as a csharp identifier.
  * https://msdn.microsoft.com/en-us/library/aa664670(v=vs.71).aspx
- ( Which basically boils down to
+ * ( Which basically boils down to
  *
  * first subsequent*
  * first is { @ | letter | underscore }
@@ -338,11 +326,11 @@ private static boolean isSbeGolangIdentifierPart(final char c)
  * @param value to check
  * @return true for validity as a csharp name. false if not.
  */
- public static boolean isSbeCsharpName(final String value)
+ public static boolean isSbeCSharpName(final String value)
  {
- if (possibleCsharpKeyword(value))
+ if (possibleCSharpKeyword(value))
  {
- if (isCsharpKeyword(value))
+ if (isCSharpKeyword(value))
  {
  return false;
  }
@@ -355,23 +343,23 @@ public static boolean isSbeCsharpName(final String value)
  return true;
  }
 
- public static boolean isCsharpKeyword(final String token)
+ public static boolean isCSharpKeyword(final String token)
  {
  return CSHARP_KEYWORDS.contains(token);
  }
 
- private static boolean possibleCsharpKeyword(final String value)
+ private static boolean possibleCSharpKeyword(final String value)
  {
  for (int i = 0, size = value.length(); i < size; i++)
  {
  final char c = value.charAt(i);
 
- if (i == 0 && isSbeCsharpIdentifierStart(c))
+ if (i == 0 && isSbeCSharpIdentifierStart(c))
  {
  continue;
  }
 
- if (isSbeCsharpIdentifierPart(c))
+ if (isSbeCSharpIdentifierPart(c))
  {
  continue;
  }
@@ -382,14 +370,14 @@ private static boolean possibleCsharpKeyword(final String value)
  return true;
  }
 
- private static boolean isSbeCsharpIdentifierStart(final char c)
+ private static boolean isSbeCSharpIdentifierStart(final char c)
  {
  return Character.isLetter(c) || c == '_' || c == '@';
  }
 
- private static boolean isSbeCsharpIdentifierPart(final char c)
+ private static boolean isSbeCSharpIdentifierPart(final char c)
  {
- if (isSbeCsharpIdentifierStart(c))
+ if (isSbeCSharpIdentifierStart(c))
  {
  return true;
  }
@@ -406,5 +394,4 @@ private static boolean isSbeCsharpIdentifierPart(final char c)
  return false;
  }
  }
-
 }

sbe-tool/src/main/java/uk/co/real_logic/sbe/xml/XmlSchemaParser.java

@@ -315,9 +315,10 @@ public static void checkForValidName(final Node node, final String name)
  {
  handleWarning(node, "name is not valid for Golang: " + name);
  }
- if (!ValidationUtil.isSbeCsharpName(name))
+
+ if (!ValidationUtil.isSbeCSharpName(name))
  {
- handleWarning(node, "name is not valid for Csharp: " + name);
+ handleWarning(node, "name is not valid for C#: " + name);
  }
  }