Generate a toJson method onto our generated types, int is now represented as the wrapped Integer in…

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 13 matching lines @@
    * reserved words in Java.
    */
   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 while other
-    // situations we want to use boolean...
+    // TODO (jwren) in some situations we want to use Boolean/Integer while
+    // other situations we want to use boolean/int...
     'bool': 'Boolean',
+    'int': 'Integer',
     'FilePath': 'String',
     'DebugContextId': 'String',
     'object': 'Object',
     'Override': 'OverrideMember',
   };
 
   /**
    * Visitor used to produce doc comments.
    */
   final ToHtmlVisitor toHtmlVisitor;
@@ skipping 59 matching lines @@
       indent(() {
         // fields
         List<String> allFields = _state.publicFields.values.toList();
         allFields.addAll(_state.privateFields.values.toList());
         for (String field in allFields) {
           writeln();
           write(field);
         }
 
         // constructors
-        List<String> allConstructors =_state.constructors.values.toList();
+        List<String> allConstructors = _state.constructors.values.toList();
         for (String constructor in allConstructors) {
           writeln();
           write(constructor);
         }
 
         // methods (ordered by method name)
         List<String> allMethods =
             _valuesSortedByKey(_state.publicMethods).toList();
         allMethods.addAll(_valuesSortedByKey(_state.privateMethods));
         for (String method in allMethods) {
@@ skipping 34 matching lines @@
       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 == 'int' || typeStr == 'boolean';
+      return typeStr == 'Integer' || typeStr == 'boolean';
     }
     return false;
   }
 
   /**
+   * Return true iff the passed [TypeDecl] is a type declared in the spec_input.
+   */
+  bool isDeclaredInSpec(TypeDecl type) {
+    if (type is TypeReference) {

[Paul Berry, 2014/08/19 20:51:12]

You could also do:

if (type is TypeReference) {
  return api.types.containsKey(type.typeName);
}
return false;

[jwren, 2014/08/20 20:51:21]

Acknowledged.

+      String typeStr = javaType(type);
+      return typeStr != 'Integer' && typeStr != 'Boolean' && typeStr != 'String';
+    }
+    return false;
+  }
+  
+  /**
+   * Return true iff the passed [TypeDecl] will be represented as Object in Java.
+   */
+  bool isObject(TypeDecl type) {
+    if (type is TypeReference) {
+      String typeStr = javaType(type);
+      return typeStr == 'Object';
+    }
+    return true;
+  }
+
+  /**
    * Return true iff the passed [TypeDecl] will represent an array in Java.
    */
   bool isList(TypeDecl type) {
     return type is TypeList && !isPrimitive(type.itemType);
   }
 
   /**
    * Return true iff the passed [TypeDecl] will represent an array in Java.
    */
   bool isArray(TypeDecl type) {
@@ skipping 70 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);
   });
 }