Use primitive int/boolean where possible in the Java client.

pkg/analysis_server/tool/spec/codegen_java.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /**
  * Tools for Java code generation.
  */
 library CodegenJava;
 
 import 'package:html5lib/dom.dart' as dom;
@@ skipping 15 matching lines @@
   static const Map<String, String> _variableRenames = const {
     'default': 'defaultSdk'
   };
 
   /**
    * Type references in the spec that are named something else in Java.
    */
   static const Map<String, String> _typeRenames = const {
     // TODO (jwren) in some situations we want to use Boolean/Integer while
     // other situations we want to use boolean/int...
-    'bool': 'Boolean',
-    'int': 'Integer',
+    'bool': 'boolean',
+    'int': 'int',
     'FilePath': 'String',
     'DebugContextId': 'String',
     'object': 'Object',
     'Override': 'OverrideMember',
   };
 
   /**
    * Visitor used to produce doc comments.
    */
   final ToHtmlVisitor toHtmlVisitor;
@@ skipping 82 matching lines @@
         }
         writeln();
       });
       writeln('}');
     } finally {
       _state = oldState;
     }
   }
 
   /**
+   * Return a Java type for the given [TypeObjectField].
+   */
+  String javaFieldType(TypeObjectField field) {
+    return javaType(field.type, field.optional);
+  }
+
+  /**
    * Convert the given [TypeDecl] to a Java type.
    */
-  String javaType(TypeDecl type) {
+  String javaType(TypeDecl type, [bool optional = false]) {
     if (type is TypeReference) {
       TypeReference resolvedType = resolveTypeReferenceChain(type);
       String typeName = resolvedType.typeName;
       if (_typeRenames.containsKey(typeName)) {
-        return _typeRenames[typeName];
-      } else {
-        return typeName;
+        typeName = _typeRenames[typeName];
+        if (optional) {
+          if (typeName == 'boolean') {
+            typeName = 'Boolean';
+          } else if (typeName == 'int') {
+            typeName = 'Integer';
+          }
+        }
       }
+      return typeName;
     } else if (type is TypeList) {
       if (isPrimitive(type.itemType)) {
         return '${javaType(type.itemType)}[]';
       } else {
         return 'List<${javaType(type.itemType)}>';
       }
     } else if (type is TypeMap) {
       return 'Map<${javaType(type.keyType)}, ${javaType(type.valueType)}>';
     } else if (type is TypeUnion) {
       return 'Object';
     } else {
       throw new Exception("Can't make type buildable");
     }
   }
 
   /**
    * Return true iff the passed [TypeDecl] will represent a primitive Java type.
    */
   bool isPrimitive(TypeDecl type) {
     if (type is TypeReference) {
       String typeStr = javaType(type);
-      return typeStr == 'Integer' || typeStr == 'boolean';
+      return typeStr == 'int' || typeStr == 'boolean';
     }
     return false;
   }
 
   /**
    * Return true iff the passed [TypeDecl] is a type declared in the spec_input.
    */
   bool isDeclaredInSpec(TypeDecl type) {
 //    TypeReference resolvedType = super.resolveTypeReferenceChain(type);
 //    if(resolvedType is TypeObject) {
 //      return truye;
 //    }
     if (type is TypeReference) {
       return api.types.containsKey(type.typeName) && javaType(type) != 'String';
     }
     return false;
   }
-  
+
   /**
    * Return true iff the passed [TypeDecl] will be represented as Object in Java.
    */
   bool isObject(TypeDecl type) {
     String typeStr = javaType(type);
     return typeStr == 'Object';
   }
 
   /**
    * Return true iff the passed [TypeDecl] will represent an array in Java.
@@ skipping 79 matching lines @@
  * Create a [GeneratedFile] that creates Java code and outputs it to [path].
  * [path] uses Posix-style path separators regardless of the OS.
  */
 GeneratedFile javaGeneratedFile(String path, CodegenJavaVisitor
     createVisitor(Api api)) {
   return new GeneratedFile(path, () {
     CodegenJavaVisitor visitor = createVisitor(readApi());
     return visitor.collectCode(visitor.visitApi);
   });
 }