[Java] Basic type should be treated the same as more complex types when generating IR regarding description and deprecation.

Author: mjpt777

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

@@ -161,7 +161,7 @@ private void addAllFields(final List<Field> fieldList)
         {
             final Type type = field.type();
 
-            if (type == null)
+            if (null == type)
             {
                 addFieldSignal(field, Signal.BEGIN_GROUP);
                 add(field.dimensionType(), 0, field);
@@ -219,7 +219,7 @@ private void add(final CompositeType type, final int currOffset, final Field fie
                 .semanticType(semanticTypeOf(type, field))
                 .build());
 
-        if (field != null)
+        if (null != field)
         {
             builder.version(Math.max(field.sinceVersion(), type.sinceVersion()));
         }
@@ -281,7 +281,7 @@ private void add(final EnumType type, final int offset, final Field field)
             .description(type.description())
             .encoding(encodingBuilder.build());
 
-        if (field != null)
+        if (null != field)
         {
             builder.version(Math.max(field.sinceVersion(), type.sinceVersion()));
         }
@@ -333,7 +333,7 @@ private void add(final SetType type, final int offset, final Field field)
                 .primitiveType(encodingType)
                 .build());
 
-        if (field != null)
+        if (null != field)
         {
             builder.version(Math.max(field.sinceVersion(), type.sinceVersion()));
         }
@@ -391,16 +391,9 @@ private void add(final EncodedDataType type, final int offset, final Field field
             .deprecated(type.deprecated())
             .offset(offset);
 
-        if (field != null && !(field.type() instanceof CompositeType))
+        if (null != field && !(field.type() instanceof CompositeType))
         {
             tokenBuilder.version(Math.max(field.sinceVersion(), type.sinceVersion()));
-            tokenBuilder.deprecated(field.deprecated());
-
-            final String description = field.description();
-            if (null != description && description.length() > 0)
-            {
-                tokenBuilder.description(description);
-            }
         }
 
         switch (type.presence())