Merge remote-tracking branch 'origin/master'

Author: mjpt777

examples/csharp/Otf/car_example_serialized_ir.bin

@@ -10,6 +10,7 @@ public class Car
  public const ushort TemplateId = (ushort)1;
  public const byte TemplateVersion = (byte)0;
  public const ushort BlockLength = (ushort)45;
+ public const string SematicType = "";
 
  private readonly Car _parentMessage;
  private DirectBuffer _buffer;
@@ -577,9 +578,9 @@ public static string OctaneRatingMetaAttribute(MetaAttribute metaAttribute)
 
  public const byte OctaneRatingNullVal = (byte)255;
 
- public const byte OctaneRatingMinVal = (byte)0;
+ public const byte OctaneRatingMinVal = (byte)90;
 
- public const byte OctaneRatingMaxVal = (byte)254;
+ public const byte OctaneRatingMaxVal = (byte)110;
 
  public byte OctaneRating
  {

examples/csharp/generated_stub/generated/Car.cs

@@ -10,6 +10,7 @@ public class FrameCodec
  public const ushort TemplateId = (ushort)1;
  public const byte TemplateVersion = (byte)0;
  public const ushort BlockLength = (ushort)8;
+ public const string SematicType = "";
 
  private readonly FrameCodec _parentMessage;
  private DirectBuffer _buffer;

main/csharp/ir/generated/FrameCodec.cs

@@ -10,6 +10,7 @@ public class TokenCodec
  public const ushort TemplateId = (ushort)2;
  public const byte TemplateVersion = (byte)0;
  public const ushort BlockLength = (ushort)20;
+ public const string SematicType = "";
 
  private readonly TokenCodec _parentMessage;
  private DirectBuffer _buffer;

main/csharp/ir/generated/TokenCodec.cs

@@ -108,7 +108,7 @@ public void generate() throws IOException
  {
  out.append(generateFileHeader(ir.applicableNamespace()));
  out.append(generateClassDeclaration(className));
- out.append(generateMessageFlyweightCode(className, msgToken.size(), msgToken.version(), msgToken.schemaId()));
+ out.append(generateMessageFlyweightCode(className, msgToken));
 
  final List<Token> messageBody = tokens.subList(1, tokens.size() - 1);
  int offset = 0;
@@ -928,19 +928,18 @@ private CharSequence generateFixedFlyweightCode(final int size)
  );
  }
 
- private CharSequence generateMessageFlyweightCode(final String className,
- final int blockLength,
- final int version,
- final int schemaId)
+ private CharSequence generateMessageFlyweightCode(final String className, final Token token)
  {
  final String blockLengthType = cSharpTypeName(ir.headerStructure().blockLengthType());
  final String templateIdType = cSharpTypeName(ir.headerStructure().templateIdType());
  final String templateVersionType = cSharpTypeName(ir.headerStructure().templateVersionType());
+ final String semanticType = token.encoding().semanticType() == null ? "" : token.encoding().semanticType();
 
  return String.format(
  " public const %s TemplateId = %s;\n" +
  " public const %s TemplateVersion = %s;\n" +
- " public const %s BlockLength = %s;\n\n" +
+ " public const %s BlockLength = %s;\n" +
+ " public const string SematicType = \"%s\";\n\n" +
  " private readonly %s _parentMessage;\n" +
  " private DirectBuffer _buffer;\n" +
  " private int _offset;\n" +
@@ -990,11 +989,12 @@ private CharSequence generateMessageFlyweightCode(final String className,
  " }\n" +
  " }\n\n",
  templateIdType,
- generateLiteral(ir.headerStructure().templateIdType(), Integer.toString(schemaId)),
+ generateLiteral(ir.headerStructure().templateIdType(), Integer.toString(token.schemaId())),
  templateVersionType,
- generateLiteral(ir.headerStructure().templateVersionType(), Integer.toString(version)),
+ generateLiteral(ir.headerStructure().templateVersionType(), Integer.toString(token.version())),
  blockLengthType,
- generateLiteral(ir.headerStructure().blockLengthType(), Integer.toString(blockLength)),
+ generateLiteral(ir.headerStructure().blockLengthType(), Integer.toString(token.size())),
+ semanticType,
  className,
  className
  );

main/java/uk/co/real_logic/sbe/generation/csharp/CSharpGenerator.java

@@ -1,5 +1,8 @@
 This file contains the list of commits of Java ported to .NET (most recent at the TOP)
 
+94eead5798df8f7c2d7f4ccbb5692ce8856872a5
+[Java]: Added semanticType() method to the java generated message stubs. Enhancement #72.
+
 63931461c7f520deda6faa24ae6aef0c07417360
 Added support for having a sbe.target.namespace system property override the package in the schema . Enhancement #63.