[pigeon] java non null void

packages/pigeon/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 15.0.3
+
+* [java] Fixes `Void` result type bug.
+
 ## 15.0.2
 
 * Prevents optional and non-positional parameters in Flutter APIs.

packages/pigeon/lib/generator_tools.dart

@@ -13,7 +13,7 @@ import 'ast.dart';
 /// The current version of pigeon.
 ///
 /// This must match the version in pubspec.yaml.
-const String pigeonVersion = '15.0.2';
+const String pigeonVersion = '15.0.3';
 
 /// Read all the content from [stdin] to a String.
 String readStdin() {

packages/pigeon/lib/java_generator.dart

@@ -449,7 +449,9 @@ class JavaGenerator extends StructuredGenerator<JavaOptions> {
 
       for (final Method func in api.methods) {
         final String resultType =
-            func.returnType.isNullable ? 'NullableResult' : 'Result';
+            func.returnType.isNullable || func.returnType.isVoid
+                ? 'NullableResult'
+                : 'Result';
         final String returnType = func.returnType.isVoid
             ? 'Void'
             : _javaTypeForDartType(func.returnType);
@@ -634,7 +636,9 @@ class JavaGenerator extends StructuredGenerator<JavaOptions> {
   void _writeInterfaceMethod(JavaOptions generatorOptions, Root root,
       Indent indent, Api api, final Method method) {
     final String resultType =
-        method.returnType.isNullable ? 'NullableResult' : 'Result';
+        method.returnType.isNullable || method.returnType.isVoid
+            ? 'NullableResult'
+            : 'Result';
     final String nullableType = method.isAsynchronous
         ? ''
         : _nullabilityAnnotationFromType(method.returnType);
@@ -749,7 +753,9 @@ class JavaGenerator extends StructuredGenerator<JavaOptions> {
                     : '.index';
               }
               final String resultType =
-                  method.returnType.isNullable ? 'NullableResult' : 'Result';
+                  method.returnType.isNullable || method.returnType.isVoid
+                      ? 'NullableResult'
+                      : 'Result';
               const String resultName = 'resultCallback';
               indent.format('''
 $resultType<$returnType> $resultName =

packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/main/java/com/example/alternate_language_test_plugin/AlternateLanguageTestPlugin.java

@@ -208,7 +208,7 @@ public void throwErrorFromVoid() {
   }
 
   @Override
-  public void noopAsync(@NonNull Result<Void> result) {
+  public void noopAsync(@NonNull NullableResult<Void> result) {
     result.success(null);
   }
 
@@ -218,7 +218,7 @@ public void throwAsyncError(@NonNull NullableResult<Object> result) {
   }
 
   @Override
-  public void throwAsyncErrorFromVoid(@NonNull Result<Void> result) {
+  public void throwAsyncErrorFromVoid(@NonNull NullableResult<Void> result) {
     result.error(new RuntimeException("An error"));
   }
 
@@ -338,7 +338,7 @@ public void echoAsyncNullableEnum(
   }
 
   @Override
-  public void callFlutterNoop(@NonNull Result<Void> result) {
+  public void callFlutterNoop(@NonNull NullableResult<Void> result) {
     flutterApi.noop(result);
   }
 
@@ -348,7 +348,7 @@ public void callFlutterThrowError(@NonNull NullableResult<Object> result) {
   }
 
   @Override
-  public void callFlutterThrowErrorFromVoid(@NonNull Result<Void> result) {
+  public void callFlutterThrowErrorFromVoid(@NonNull NullableResult<Void> result) {
     flutterApi.throwErrorFromVoid(result);
   }
 

packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/main/java/com/example/alternate_language_test_plugin/CoreTests.java

@@ -1139,7 +1139,7 @@ AllNullableTypes sendMultipleNullableTypes(
      * A no-op function taking no arguments and returning no value, to sanity test basic
      * asynchronous calling.
      */
-    void noopAsync(@NonNull Result<Void> result);
+    void noopAsync(@NonNull NullableResult<Void> result);
     /** Returns passed in int asynchronously. */
     void echoAsyncInt(@NonNull Long anInt, @NonNull Result<Long> result);
     /** Returns passed in double asynchronously. */
@@ -1162,7 +1162,7 @@ void echoAsyncMap(
     /** Responds with an error from an async function returning a value. */
     void throwAsyncError(@NonNull NullableResult<Object> result);
     /** Responds with an error from an async void function. */
-    void throwAsyncErrorFromVoid(@NonNull Result<Void> result);
+    void throwAsyncErrorFromVoid(@NonNull NullableResult<Void> result);
     /** Responds with a Flutter error from an async function returning a value. */
     void throwAsyncFlutterError(@NonNull NullableResult<Object> result);
     /** Returns the passed object, to test async serialization and deserialization. */
@@ -1192,11 +1192,11 @@ void echoAsyncNullableMap(
     /** Returns the passed enum, to test asynchronous serialization and deserialization. */
     void echoAsyncNullableEnum(@Nullable AnEnum anEnum, @NonNull NullableResult<AnEnum> result);
 
-    void callFlutterNoop(@NonNull Result<Void> result);
+    void callFlutterNoop(@NonNull NullableResult<Void> result);
 
     void callFlutterThrowError(@NonNull NullableResult<Object> result);
 
-    void callFlutterThrowErrorFromVoid(@NonNull Result<Void> result);
+    void callFlutterThrowErrorFromVoid(@NonNull NullableResult<Void> result);
 
     void callFlutterEchoAllTypes(@NonNull AllTypes everything, @NonNull Result<AllTypes> result);
 
@@ -2097,8 +2097,8 @@ static void setUp(
           channel.setMessageHandler(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<Object>();
-                Result<Void> resultCallback =
-                    new Result<Void>() {
+                NullableResult<Void> resultCallback =
+                    new NullableResult<Void>() {
                       public void success(Void result) {
                         wrapped.add(0, null);
                         reply.reply(wrapped);
@@ -2434,8 +2434,8 @@ public void error(Throwable error) {
           channel.setMessageHandler(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<Object>();
-                Result<Void> resultCallback =
-                    new Result<Void>() {
+                NullableResult<Void> resultCallback =
+                    new NullableResult<Void>() {
                       public void success(Void result) {
                         wrapped.add(0, null);
                         reply.reply(wrapped);
@@ -2834,8 +2834,8 @@ public void error(Throwable error) {
           channel.setMessageHandler(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<Object>();
-                Result<Void> resultCallback =
-                    new Result<Void>() {
+                NullableResult<Void> resultCallback =
+                    new NullableResult<Void>() {
                       public void success(Void result) {
                         wrapped.add(0, null);
                         reply.reply(wrapped);
@@ -2892,8 +2892,8 @@ public void error(Throwable error) {
           channel.setMessageHandler(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<Object>();
-                Result<Void> resultCallback =
-                    new Result<Void>() {
+                NullableResult<Void> resultCallback =
+                    new NullableResult<Void>() {
                       public void success(Void result) {
                         wrapped.add(0, null);
                         reply.reply(wrapped);
@@ -3574,7 +3574,7 @@ public FlutterIntegrationCoreApi(@NonNull BinaryMessenger argBinaryMessenger) {
     /**
      * A no-op function taking no arguments and returning no value, to sanity test basic calling.
      */
-    public void noop(@NonNull Result<Void> result) {
+    public void noop(@NonNull NullableResult<Void> result) {
       final String channelName =
           "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noop";
       BasicMessageChannel<Object> channel =
@@ -3626,7 +3626,7 @@ public void throwError(@NonNull NullableResult<Object> result) {
           });
     }
     /** Responds with an error from an async void function. */
-    public void throwErrorFromVoid(@NonNull Result<Void> result) {
+    public void throwErrorFromVoid(@NonNull NullableResult<Void> result) {
       final String channelName =
           "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwErrorFromVoid";
       BasicMessageChannel<Object> channel =
@@ -4251,7 +4251,7 @@ public void echoNullableEnum(
      * A no-op function taking no arguments and returning no value, to sanity test basic
      * asynchronous calling.
      */
-    public void noopAsync(@NonNull Result<Void> result) {
+    public void noopAsync(@NonNull NullableResult<Void> result) {
       final String channelName =
           "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noopAsync";
       BasicMessageChannel<Object> channel =
@@ -4358,7 +4358,7 @@ public interface HostSmallApi {
 
     void echo(@NonNull String aString, @NonNull Result<String> result);
 
-    void voidVoid(@NonNull Result<Void> result);
+    void voidVoid(@NonNull NullableResult<Void> result);
 
     /** The codec used by HostSmallApi. */
     static @NonNull MessageCodec<Object> getCodec() {
@@ -4407,8 +4407,8 @@ public void error(Throwable error) {
           channel.setMessageHandler(
               (message, reply) -> {
                 ArrayList<Object> wrapped = new ArrayList<Object>();
-                Result<Void> resultCallback =
-                    new Result<Void>() {
+                NullableResult<Void> resultCallback =
+                    new NullableResult<Void>() {
                       public void success(Void result) {
                         wrapped.add(0, null);
                         reply.reply(wrapped);

packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/test/java/com/example/alternate_language_test_plugin/AsyncTest.java

@@ -24,7 +24,7 @@ public void echo(@NonNull String value, Result<String> result) {
     }
 
     @Override
-    public void voidVoid(Result<Void> result) {
+    public void voidVoid(NullableResult<Void> result) {
       result.success(null);
     }
   }
@@ -36,7 +36,7 @@ public void echo(@NonNull String value, Result<String> result) {
     }
 
     @Override
-    public void voidVoid(Result<Void> result) {
+    public void voidVoid(NullableResult<Void> result) {
       result.error(new Exception("error"));
     }
   }

packages/pigeon/pubspec.yaml

@@ -2,7 +2,7 @@ name: pigeon
 description: Code generator tool to make communication between Flutter and the host platform type-safe and easier.
 repository: https://github.com/flutter/packages/tree/main/packages/pigeon
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+pigeon%22
-version: 15.0.2 # This must match the version in lib/generator_tools.dart
+version: 15.0.3 # This must match the version in lib/generator_tools.dart
 
 environment:
   sdk: ">=3.0.0 <4.0.0"

packages/pigeon/test/java_generator_test.dart

@@ -397,7 +397,7 @@ void main() {
     expect(
         code,
         contains(
-            'public void doSomething(@NonNull Input arg0Arg, @NonNull Result<Void> result)'));
+            'public void doSomething(@NonNull Input arg0Arg, @NonNull NullableResult<Void> result)'));
     expect(code, contains('result.success(null);'));
   });
 
@@ -1307,7 +1307,7 @@ void main() {
     expect(
         code,
         contains(
-            'public void doit(@Nullable Long fooArg, @NonNull Result<Void> result) {'));
+            'public void doit(@Nullable Long fooArg, @NonNull NullableResult<Void> result) {'));
   });
 
   test('background platform channel', () {