[Pigeon] Fixed primitive datatypes for java. (flutter#119)

* [Pigeon] Fixed primitive datatypes for java.
MauScheff · Mar 19, 2020 · bbdaf80 · bbdaf80
1 parent 2463514
commit bbdaf80
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 14 deletions.
diff --git a/packages/pigeon/CHANGELOG.md b/packages/pigeon/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.1.0-experimental.4
+
+* Fixed primitive types for Android Java.
+
 ## 0.1.0-experimental.3
 
 * Added support for for Android Java.

diff --git a/packages/pigeon/lib/generator_tools.dart b/packages/pigeon/lib/generator_tools.dart
@@ -113,15 +113,15 @@ class HostDatatype {
 /// `builtinResolver` will return the host datatype for the Dart datatype for
 /// builtin types.  `customResolver` can modify the datatype of custom types.
 HostDatatype getHostDatatype(
-    Field field,
-    List<Class> classes,
-    String Function(String) builtinResolver,
-    String Function(String) customResolver) {
+    Field field, List<Class> classes, String Function(String) builtinResolver,
+    {String Function(String) customResolver}) {
   final String datatype = builtinResolver(field.dataType);
   if (datatype == null) {
     if (classes.map((Class x) => x.name).contains(field.dataType)) {
-      return HostDatatype(
-          datatype: customResolver(field.dataType), isBuiltin: false);
+      final String customName = customResolver != null
+          ? customResolver(field.dataType)
+          : field.dataType;
+      return HostDatatype(datatype: customName, isBuiltin: false);
     } else {
       return null;
     }

diff --git a/packages/pigeon/lib/java_generator.dart b/packages/pigeon/lib/java_generator.dart
@@ -175,8 +175,8 @@ void generateJava(JavaOptions options, Root root, StringSink sink) {
       indent.write('public static class ${klass.name} ');
       indent.scoped('{', '}', () {
         for (Field field in klass.fields) {
-          final HostDatatype hostDatatype = getHostDatatype(
-              field, root.classes, _javaTypeForDartType, (String x) => x);
+          final HostDatatype hostDatatype =
+              getHostDatatype(field, root.classes, _javaTypeForDartType);
           indent.writeln('private ${hostDatatype.datatype} ${field.name};');
           indent.writeln(
               'public ${hostDatatype.datatype} ${_makeGetter(field)}() { return ${field.name}; }');
@@ -197,8 +197,10 @@ void generateJava(JavaOptions options, Root root, StringSink sink) {
         indent.scoped('{', '}', () {
           indent.writeln('${klass.name} fromMapResult = new ${klass.name}();');
           for (Field field in klass.fields) {
+            final HostDatatype hostDatatype =
+                getHostDatatype(field, root.classes, _javaTypeForDartType);
             indent.writeln(
-                'fromMapResult.${field.name} = (${field.dataType})map.get("${field.name}");');
+                'fromMapResult.${field.name} = (${hostDatatype.datatype})map.get("${field.name}");');
           }
           indent.writeln('return fromMapResult;');
         });

diff --git a/packages/pigeon/lib/objc_generator.dart b/packages/pigeon/lib/objc_generator.dart
@@ -84,10 +84,8 @@ void generateObjcHeader(ObjcOptions options, Root root, StringSink sink) {
         '@interface ${_className(options.prefix, klass.name)} : NSObject ');
     for (Field field in klass.fields) {
       final HostDatatype hostDatatype = getHostDatatype(
-          field,
-          root.classes,
-          _objcTypeForDartType,
-          (String x) => '${_className(options.prefix, x)} *');
+          field, root.classes, _objcTypeForDartType,
+          customResolver: (String x) => '${_className(options.prefix, x)} *');
       final String propertyType = hostDatatype.isBuiltin
           ? _propertyTypeForDartType(field.dataType)
           : 'strong';

diff --git a/packages/pigeon/pigeons/message.dart b/packages/pigeon/pigeons/message.dart
@@ -6,6 +6,8 @@ import 'package:pigeon/pigeon_lib.dart';
 
 class SearchRequest {
   String query;
+  int anInt;
+  bool aBool;
 }
 
 class SearchReply {

diff --git a/packages/pigeon/pubspec.yaml b/packages/pigeon/pubspec.yaml
@@ -1,5 +1,5 @@
 name: pigeon
-version: 0.1.0-experimental.3
+version: 0.1.0-experimental.4
 description: Code generator tool to make communication between Flutter and the host platform type-safe and easier.
 homepage: https://github.com/flutter/packages/tree/master/packages/pigeon
 dependencies: