[Java] Apply property formatting to primitive types in composites. Issue #582.

Author: mjpt777

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

@@ -56,6 +56,11 @@ public static void forEachField(final List<Token> tokens, final BiConsumer<Token
      */
     public static String toUpperFirstChar(final String s)
     {
+        if (Character.isUpperCase(s.charAt(0)))
+        {
+            return s;
+        }
+
         return Character.toUpperCase(s.charAt(0)) + s.substring(1);
     }
 
@@ -67,6 +72,11 @@ public static String toUpperFirstChar(final String s)
      */
     public static String toLowerFirstChar(final String s)
     {
+        if (Character.isLowerCase(s.charAt(0)))
+        {
+            return s;
+        }
+
         return Character.toLowerCase(s.charAt(0)) + s.substring(1);
     }
 }

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

@@ -1561,17 +1561,18 @@ private CharSequence generatePrimitiveDecoder(
         final String indent)
     {
         final StringBuilder sb = new StringBuilder();
+        final String formattedPropertyName = formatPropertyName(propertyName);
 
-        sb.append(generatePrimitiveFieldMetaData(propertyName, encodingToken, indent));
+        sb.append(generatePrimitiveFieldMetaData(formattedPropertyName, encodingToken, indent));
 
         if (encodingToken.isConstantEncoding())
         {
-            sb.append(generateConstPropertyMethods(propertyName, encodingToken, indent));
+            sb.append(generateConstPropertyMethods(formattedPropertyName, encodingToken, indent));
         }
         else
         {
             sb.append(generatePrimitivePropertyDecodeMethods(
-                inComposite, propertyName, propertyToken, encodingToken, indent));
+                inComposite, formattedPropertyName, propertyToken, encodingToken, indent));
         }
 
         return sb;
@@ -1581,16 +1582,18 @@ private CharSequence generatePrimitiveEncoder(
         final String containingClassName, final String propertyName, final Token token, final String indent)
     {
         final StringBuilder sb = new StringBuilder();
+        final String formattedPropertyName = formatPropertyName(propertyName);
 
-        sb.append(generatePrimitiveFieldMetaData(propertyName, token, indent));
+        sb.append(generatePrimitiveFieldMetaData(formattedPropertyName, token, indent));
 
         if (!token.isConstantEncoding())
         {
-            sb.append(generatePrimitivePropertyEncodeMethods(containingClassName, propertyName, token, indent));
+            sb.append(generatePrimitivePropertyEncodeMethods(
+                containingClassName, formattedPropertyName, token, indent));
         }
         else
         {
-            sb.append(generateConstPropertyMethods(propertyName, token, indent));
+            sb.append(generateConstPropertyMethods(formattedPropertyName, token, indent));
         }
 
         return sb;
@@ -2383,8 +2386,8 @@ private CharSequence generateEncoderFields(
 
                 generateFieldIdMethod(sb, fieldToken, indent);
                 generateFieldSinceVersionMethod(sb, fieldToken, indent);
-                generateEncodingOffsetMethod(sb, fieldToken.name(), fieldToken.offset(), indent);
-                generateEncodingLengthMethod(sb, fieldToken.name(), typeToken.encodedLength(), indent);
+                generateEncodingOffsetMethod(sb, propertyName, fieldToken.offset(), indent);
+                generateEncodingLengthMethod(sb, propertyName, typeToken.encodedLength(), indent);
                 generateFieldMetaAttributeMethod(sb, fieldToken, indent);
 
                 switch (typeToken.signal())
@@ -2425,8 +2428,8 @@ private CharSequence generateDecoderFields(final List<Token> tokens, final Strin
 
                 generateFieldIdMethod(sb, fieldToken, indent);
                 generateFieldSinceVersionMethod(sb, fieldToken, indent);
-                generateEncodingOffsetMethod(sb, fieldToken.name(), fieldToken.offset(), indent);
-                generateEncodingLengthMethod(sb, fieldToken.name(), typeToken.encodedLength(), indent);
+                generateEncodingOffsetMethod(sb, propertyName, fieldToken.offset(), indent);
+                generateEncodingLengthMethod(sb, propertyName, typeToken.encodedLength(), indent);
                 generateFieldMetaAttributeMethod(sb, fieldToken, indent);
 
                 switch (typeToken.signal())

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

@@ -168,7 +168,6 @@ public static String formatClassName(final String value)
         return Generators.toUpperFirstChar(value);
     }
 
-
     /**
      * Shortcut to append a line of generated code
      *