Dart: Futures -> Callbacks.

mojo/dart/packages/_mojo_for_test_only/lib/mojo/examples/echo.mojom.dart

 // WARNING: DO NOT EDIT. This file was generated by a program.
 // See $MOJO_SDK/tools/bindings/mojom_bindings_generator.py.
 
 library echo_mojom;
 import 'dart:async';
 import 'dart:collection';
 import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
 import 'package:mojo/bindings.dart' as bindings;
 import 'package:mojo/core.dart' as core;
 import 'package:mojo/mojo/bindings/types/mojom_types.mojom.dart' as mojom_types;
 import 'package:mojo/mojo/bindings/types/service_describer.mojom.dart' as service_describer;
 
 
 
 class _EchoEchoStringParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   String value = null;
 
   _EchoEchoStringParams() : super(kVersions.last.size);
 
+  _EchoEchoStringParams.init(
+    String this.value
+  ) : super(kVersions.last.size);
+
   static _EchoEchoStringParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static _EchoEchoStringParams decode(bindings.Decoder decoder0) {
@@ skipping 52 matching lines @@
 
 
 class EchoEchoStringResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   String value = null;
 
   EchoEchoStringResponseParams() : super(kVersions.last.size);
 
+  EchoEchoStringResponseParams.init(
+    String this.value
+  ) : super(kVersions.last.size);
+
   static EchoEchoStringResponseParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static EchoEchoStringResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 46 matching lines @@
   Map toJson() {
     Map map = new Map();
     map["value"] = value;
     return map;
   }
 }
 
 const int _echoMethodEchoStringName = 0;
 
 class _EchoServiceDescription implements service_describer.ServiceDescription {
-  dynamic getTopLevelInterface([Function responseFactory]){
+  void getTopLevelInterface(Function responder){
     var interfaceTypeKey = getRuntimeTypeInfo().services["mojo::examples::Echo"];
     var userDefinedType = getAllMojomTypeDefinitions()[interfaceTypeKey];
-    return responseFactory(userDefinedType.interfaceType);
+    responder(userDefinedType.interfaceType);
   }
 
-  dynamic getTypeDefinition(String typeKey, [Function responseFactory]) =>
-    responseFactory(getAllMojomTypeDefinitions()[typeKey]);
+  void getTypeDefinition(String typeKey, Function responder) {
+    responder(getAllMojomTypeDefinitions()[typeKey]);
+  }
 
-  dynamic getAllTypeDefinitions([Function responseFactory]) =>
-    responseFactory(getAllMojomTypeDefinitions());
+  void getAllTypeDefinitions(Function responder) {
+    responder(getAllMojomTypeDefinitions());
+  }
 }
 
 abstract class Echo {
   static const String serviceName = "mojo::examples::Echo";
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _EchoServiceDescription();
     }
     return _cachedServiceDescription;
   }
 
   static EchoProxy connectToService(
       bindings.ServiceConnector s, String url, [String serviceName]) {
     EchoProxy p = new EchoProxy.unbound();
     String name = serviceName ?? Echo.serviceName;
     if ((name == null) || name.isEmpty) {
       throw new core.MojoApiError(
           "If an interface has no ServiceName, then one must be provided.");
     }
     s.connectToService(url, p, name);
     return p;
   }
-  dynamic echoString(String value,[Function responseFactory = null]);
+  void echoString(String value,void callback(String value));
 }
 
 abstract class EchoInterface
     implements bindings.MojoInterface<Echo>,
                Echo {
   factory EchoInterface([Echo impl]) =>
       new EchoStub.unbound(impl);
 
   factory EchoInterface.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint,
@@ skipping 29 matching lines @@
 
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _echoMethodEchoStringName:
         var r = EchoEchoStringResponseParams.deserialize(
             message.payload);
         if (!message.header.hasRequestId) {
           proxyError("Expected a message with a valid request Id.");
           return;
         }
-        Completer c = completerMap[message.header.requestId];
-        if (c == null) {
+        Function callback = callbackMap[message.header.requestId];
+        if (callback == null) {
           proxyError(
               "Message had unknown request Id: ${message.header.requestId}");
           return;
         }
-        completerMap.remove(message.header.requestId);
-        if (c.isCompleted) {
-          proxyError("Response completer already completed");
-          return;
-        }
-        c.complete(r);
+        callbackMap.remove(message.header.requestId);
+        callback(r.value );
         break;
       default:
         proxyError("Unexpected message type: ${message.header.type}");
         close(immediate: true);
         break;
     }
   }
 
   @override
   String toString() {
@@ skipping 24 matching lines @@
     return newMockedProxy;
   }
 
   static EchoProxy newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For EchoProxy"));
     return new EchoProxy.fromEndpoint(endpoint);
   }
 
 
-  dynamic echoString(String value,[Function responseFactory = null]) {
+  void echoString(String value,void callback(String value)) {
     if (impl != null) {
-      return new Future(() => impl.echoString(value,_EchoStubControl._echoEchoStringResponseParamsFactory));
+      impl.echoString(value,callback);
+      return;
     }
     var params = new _EchoEchoStringParams();
     params.value = value;
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _echoMethodEchoStringName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
 }
 
 class _EchoStubControl
     extends bindings.StubMessageHandler
     implements bindings.StubControl<Echo> {
   Echo _impl;
 
   _EchoStubControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [Echo impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _EchoStubControl.fromHandle(
       core.MojoHandle handle, [Echo impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _EchoStubControl.unbound([this._impl]) : super.unbound();
 
   String get serviceName => Echo.serviceName;
 
 
-  static EchoEchoStringResponseParams _echoEchoStringResponseParamsFactory(String value) {
-    var result = new EchoEchoStringResponseParams();
-    result.value = value;
-    return result;
+  Function _echoEchoStringResponseParamsResponder(
+      int requestId) {
+  return (String value) {
+      var result = new EchoEchoStringResponseParams();
+      result.value = value;
+      sendResponse(buildResponseWithId(
+          result,
+          _echoMethodEchoStringName,
+          requestId,
+          bindings.MessageHeader.kMessageIsResponse));
+    };
   }
 
-  dynamic handleMessage(bindings.ServiceMessage message) {
+  void handleMessage(bindings.ServiceMessage message) {
     if (bindings.ControlMessageHandler.isControlMessage(message)) {
-      return bindings.ControlMessageHandler.handleMessage(this,
-                                                          0,
-                                                          message);
+      bindings.ControlMessageHandler.handleMessage(
+          this, 0, message);
+      return;
     }
     if (_impl == null) {
       throw new core.MojoApiError("$this has no implementation set");
     }
     switch (message.header.type) {
       case _echoMethodEchoStringName:
         var params = _EchoEchoStringParams.deserialize(
             message.payload);
-        var response = _impl.echoString(params.value,_echoEchoStringResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _echoMethodEchoStringName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _echoMethodEchoStringName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.echoString(params.value, _echoEchoStringResponseParamsResponder(message.header.requestId));
         break;
       default:
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   Echo get impl => _impl;
   set impl(Echo d) {
     if (d == null) {
       throw new core.MojoApiError("$this: Cannot set a null implementation");
     }
     if (isBound && (_impl == null)) {
       beginHandlingEvents();
     }
@@ skipping 33 matching lines @@
       core.MojoHandle handle, [Echo impl])
       : super(new _EchoStubControl.fromHandle(handle, impl));
 
   static EchoStub newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For EchoStub"));
     return new EchoStub.fromEndpoint(endpoint);
   }
 
 
-  dynamic echoString(String value,[Function responseFactory = null]) {
-    return impl.echoString(value,responseFactory);
+  void echoString(String value,void callback(String value)) {
+    return impl.echoString(value,callback);
   }
 }
 
 
 mojom_types.RuntimeTypeInfo getRuntimeTypeInfo() => _runtimeTypeInfo ??
     _initRuntimeTypeInfo();
 
 Map<String, mojom_types.UserDefinedType> getAllMojomTypeDefinitions() {
   return getRuntimeTypeInfo().typeMap;
 }
 
 var _runtimeTypeInfo;
 mojom_types.RuntimeTypeInfo  _initRuntimeTypeInfo() {
   // serializedRuntimeTypeInfo contains the bytes of the Mojo serialization of
   // a mojom_types.RuntimeTypeInfo struct describing the Mojom types in this
   // file. The string contains the base64 encoding of the gzip-compressed bytes.
-  var serializedRuntimeTypeInfo = "H4sIAAAJbogC/5JggAABKN0BpdHFLZD4jEDMAeXLALEIEOfmZ+VbWaVWJOYW5KQWW1m5JmfkY1OvDMTSQBwSGeAa7+0aaQXSqAfTpwfThmG/Aw77STGPEaqfGUm/BpRWgNIejBA6AUozoNkPC4cZUHoBlP4PBRsYsAN0dytgCWd2JHFhIOYG4uDUorLM5FS/xNxUosKbB4hZgBjGlwJiIah6LMGCEc6cQMwFxJZAbAjE+hn5uan6RaUp+bmZealF+iBz9IuLkvVhZumnAs0CE3oguVwi0wW6vTA+DzSccIUbenydgNFM2OMLBgzQ+KC4wiYOA0LQcAC5N7ikKDMvHXt4gdQwUSG80NMD3F+MxPsHBCxw+AeWDhD+0S1KLSxNLS7B7i8YoNRf6PHngKM8ucBAHCA2XjVw6OcFYlYgLkvMKU3FEZ+iVPI3A1JaRg8HCSQ3MSKpp3U6kIaWLSjpoLggP684dTQdoKUDjQFMB4AAAAD//1YHjLGYBwAA";
+  var serializedRuntimeTypeInfo = "H4sIAAAJbogC/5JggAABKN0BpdHFLZD4jEDMAeXLALEIEOfmZ+VbWaVWJOYW5KQWW1m5JmfkY1OvDMTSQBwSGeAa7+0aaQXSqAfTpwfThmG/Aw77STGPEaqfGUm/BpRWgNIBjBA6A0ozoNkPC4cZUHoBlP4PBRsYsAN0dytgCWd2JHFhIOYG4uDUorLM5FS/xNxUosKbB4hZgBjGlwJiIah6LMGCEc6cQMwF0g/EtkCsX1pcpJ+Tn5yYo5+en5+ek6qfkZ+bql9VlKgPMtJIv7goWR9mrn4q0FwwoQeSzCXCvej2w/g80PDCFX7o8XYBSj9gwh5vMGCAxgfFGTZxGBCChQfQvcElRZl56djDDaSGiYrhhp4+YP67wUi8v0DAAoe/YOkC4S/dotTC0tTiEuz+gwFq+Q89Ph1wlDM3GIgDxMazBg79vEDMCsRliTmlqTjiV5TK/mdASuPo4SGB5DZGJPW0ThfS0LIHJV0UF+TnFaeOpgsc6UJjEKQLQAAAAP//GmHdL8gHAAA=";
 
   // Deserialize RuntimeTypeInfo
   var bytes = BASE64.decode(serializedRuntimeTypeInfo);
   var unzippedBytes = new ZLibDecoder().convert(bytes);
   var bdata = new ByteData.view(unzippedBytes.buffer);
   var message = new bindings.Message(bdata, null, unzippedBytes.length, 0);
   _runtimeTypeInfo = mojom_types.RuntimeTypeInfo.deserialize(message);
   return _runtimeTypeInfo;
 }