Dart: Futures -> Callbacks.

mojo/dart/packages/mojo_services/lib/mojo/tcp_bound_socket.mojom.dart

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 library tcp_bound_socket_mojom;
 import 'dart:async';
 import 'package:mojo/bindings.dart' as bindings;
 import 'package:mojo/core.dart' as core;
 import 'package:mojo/mojo/bindings/types/service_describer.mojom.dart' as service_describer;
 import 'package:mojo/mojo/network_error.mojom.dart' as network_error_mojom;
 import 'package:mojo_services/mojo/net_address.mojom.dart' as net_address_mojom;
 import 'package:mojo_services/mojo/tcp_connected_socket.mojom.dart' as tcp_connected_socket_mojom;
 import 'package:mojo_services/mojo/tcp_server_socket.mojom.dart' as tcp_server_socket_mojom;
 
 
 
 class _TcpBoundSocketStartListeningParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   tcp_server_socket_mojom.TcpServerSocketInterfaceRequest server = null;
 
   _TcpBoundSocketStartListeningParams() : super(kVersions.last.size);
 
+  _TcpBoundSocketStartListeningParams.init(
+    tcp_server_socket_mojom.TcpServerSocketInterfaceRequest this.server
+  ) : super(kVersions.last.size);
+
   static _TcpBoundSocketStartListeningParams 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 _TcpBoundSocketStartListeningParams decode(bindings.Decoder decoder0) {
@@ skipping 51 matching lines @@
 
 
 class TcpBoundSocketStartListeningResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   network_error_mojom.NetworkError result = null;
 
   TcpBoundSocketStartListeningResponseParams() : super(kVersions.last.size);
 
+  TcpBoundSocketStartListeningResponseParams.init(
+    network_error_mojom.NetworkError this.result
+  ) : super(kVersions.last.size);
+
   static TcpBoundSocketStartListeningResponseParams 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 TcpBoundSocketStartListeningResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 56 matching lines @@
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(32, 0)
   ];
   net_address_mojom.NetAddress remoteAddress = null;
   core.MojoDataPipeConsumer sendStream = null;
   core.MojoDataPipeProducer receiveStream = null;
   tcp_connected_socket_mojom.TcpConnectedSocketInterfaceRequest clientSocket = null;
 
   _TcpBoundSocketConnectParams() : super(kVersions.last.size);
 
+  _TcpBoundSocketConnectParams.init(
+    net_address_mojom.NetAddress this.remoteAddress, 
+    core.MojoDataPipeConsumer this.sendStream, 
+    core.MojoDataPipeProducer this.receiveStream, 
+    tcp_connected_socket_mojom.TcpConnectedSocketInterfaceRequest this.clientSocket
+  ) : super(kVersions.last.size);
+
   static _TcpBoundSocketConnectParams 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 _TcpBoundSocketConnectParams decode(bindings.Decoder decoder0) {
@@ skipping 88 matching lines @@
 
 
 class TcpBoundSocketConnectResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   network_error_mojom.NetworkError result = null;
 
   TcpBoundSocketConnectResponseParams() : super(kVersions.last.size);
 
+  TcpBoundSocketConnectResponseParams.init(
+    network_error_mojom.NetworkError this.result
+  ) : super(kVersions.last.size);
+
   static TcpBoundSocketConnectResponseParams 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 TcpBoundSocketConnectResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 48 matching lines @@
     Map map = new Map();
     map["result"] = result;
     return map;
   }
 }
 
 const int _tcpBoundSocketMethodStartListeningName = 0;
 const int _tcpBoundSocketMethodConnectName = 1;
 
 class _TcpBoundSocketServiceDescription implements service_describer.ServiceDescription {
-  dynamic getTopLevelInterface([Function responseFactory]) =>
-      responseFactory(null);
+  void getTopLevelInterface(Function responder) {
+    responder(null);
+  }
 
-  dynamic getTypeDefinition(String typeKey, [Function responseFactory]) =>
-      responseFactory(null);
+  void getTypeDefinition(String typeKey, Function responder) {
+    responder(null);
+  }
 
-  dynamic getAllTypeDefinitions([Function responseFactory]) =>
-      responseFactory(null);
+  void getAllTypeDefinitions(Function responder) {
+    responder(null);
+  }
 }
 
 abstract class TcpBoundSocket {
   static const String serviceName = null;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _TcpBoundSocketServiceDescription();
     }
     return _cachedServiceDescription;
   }
 
   static TcpBoundSocketProxy connectToService(
       bindings.ServiceConnector s, String url, [String serviceName]) {
     TcpBoundSocketProxy p = new TcpBoundSocketProxy.unbound();
     String name = serviceName ?? TcpBoundSocket.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 startListening(tcp_server_socket_mojom.TcpServerSocketInterfaceRequest server,[Function responseFactory = null]);
-  dynamic connect(net_address_mojom.NetAddress remoteAddress,core.MojoDataPipeConsumer sendStream,core.MojoDataPipeProducer receiveStream,tcp_connected_socket_mojom.TcpConnectedSocketInterfaceRequest clientSocket,[Function responseFactory = null]);
+  void startListening(tcp_server_socket_mojom.TcpServerSocketInterfaceRequest server,void callback(network_error_mojom.NetworkError result));
+  void connect(net_address_mojom.NetAddress remoteAddress,core.MojoDataPipeConsumer sendStream,core.MojoDataPipeProducer receiveStream,tcp_connected_socket_mojom.TcpConnectedSocketInterfaceRequest clientSocket,void callback(network_error_mojom.NetworkError result));
 }
 
 abstract class TcpBoundSocketInterface
     implements bindings.MojoInterface<TcpBoundSocket>,
                TcpBoundSocket {
   factory TcpBoundSocketInterface([TcpBoundSocket impl]) =>
       new TcpBoundSocketStub.unbound(impl);
 
   factory TcpBoundSocketInterface.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint,
@@ skipping 29 matching lines @@
 
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _tcpBoundSocketMethodStartListeningName:
         var r = TcpBoundSocketStartListeningResponseParams.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.result );
         break;
       case _tcpBoundSocketMethodConnectName:
         var r = TcpBoundSocketConnectResponseParams.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.result );
         break;
       default:
         proxyError("Unexpected message type: ${message.header.type}");
         close(immediate: true);
         break;
     }
   }
 
   @override
   String toString() {
@@ skipping 24 matching lines @@
     return newMockedProxy;
   }
 
   static TcpBoundSocketProxy newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For TcpBoundSocketProxy"));
     return new TcpBoundSocketProxy.fromEndpoint(endpoint);
   }
 
 
-  dynamic startListening(tcp_server_socket_mojom.TcpServerSocketInterfaceRequest server,[Function responseFactory = null]) {
+  void startListening(tcp_server_socket_mojom.TcpServerSocketInterfaceRequest server,void callback(network_error_mojom.NetworkError result)) {
     if (impl != null) {
-      return new Future(() => impl.startListening(server,_TcpBoundSocketStubControl._tcpBoundSocketStartListeningResponseParamsFactory));
+      impl.startListening(server,callback);
+      return;
     }
     var params = new _TcpBoundSocketStartListeningParams();
     params.server = server;
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _tcpBoundSocketMethodStartListeningName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
-  dynamic connect(net_address_mojom.NetAddress remoteAddress,core.MojoDataPipeConsumer sendStream,core.MojoDataPipeProducer receiveStream,tcp_connected_socket_mojom.TcpConnectedSocketInterfaceRequest clientSocket,[Function responseFactory = null]) {
+  void connect(net_address_mojom.NetAddress remoteAddress,core.MojoDataPipeConsumer sendStream,core.MojoDataPipeProducer receiveStream,tcp_connected_socket_mojom.TcpConnectedSocketInterfaceRequest clientSocket,void callback(network_error_mojom.NetworkError result)) {
     if (impl != null) {
-      return new Future(() => impl.connect(remoteAddress,sendStream,receiveStream,clientSocket,_TcpBoundSocketStubControl._tcpBoundSocketConnectResponseParamsFactory));
+      impl.connect(remoteAddress,sendStream,receiveStream,clientSocket,callback);
+      return;
     }
     var params = new _TcpBoundSocketConnectParams();
     params.remoteAddress = remoteAddress;
     params.sendStream = sendStream;
     params.receiveStream = receiveStream;
     params.clientSocket = clientSocket;
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _tcpBoundSocketMethodConnectName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
 }
 
 class _TcpBoundSocketStubControl
     extends bindings.StubMessageHandler
     implements bindings.StubControl<TcpBoundSocket> {
   TcpBoundSocket _impl;
 
   _TcpBoundSocketStubControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [TcpBoundSocket impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _TcpBoundSocketStubControl.fromHandle(
       core.MojoHandle handle, [TcpBoundSocket impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _TcpBoundSocketStubControl.unbound([this._impl]) : super.unbound();
 
   String get serviceName => TcpBoundSocket.serviceName;
 
 
-  static TcpBoundSocketStartListeningResponseParams _tcpBoundSocketStartListeningResponseParamsFactory(network_error_mojom.NetworkError result) {
-    var result = new TcpBoundSocketStartListeningResponseParams();
-    result.result = result;
-    return result;
+  Function _tcpBoundSocketStartListeningResponseParamsResponder(
+      int requestId) {
+  return (network_error_mojom.NetworkError result) {
+      var result = new TcpBoundSocketStartListeningResponseParams();
+      result.result = result;
+      sendResponse(buildResponseWithId(
+          result,
+          _tcpBoundSocketMethodStartListeningName,
+          requestId,
+          bindings.MessageHeader.kMessageIsResponse));
+    };
   }
-  static TcpBoundSocketConnectResponseParams _tcpBoundSocketConnectResponseParamsFactory(network_error_mojom.NetworkError result) {
-    var result = new TcpBoundSocketConnectResponseParams();
-    result.result = result;
-    return result;
+  Function _tcpBoundSocketConnectResponseParamsResponder(
+      int requestId) {
+  return (network_error_mojom.NetworkError result) {
+      var result = new TcpBoundSocketConnectResponseParams();
+      result.result = result;
+      sendResponse(buildResponseWithId(
+          result,
+          _tcpBoundSocketMethodConnectName,
+          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 _tcpBoundSocketMethodStartListeningName:
         var params = _TcpBoundSocketStartListeningParams.deserialize(
             message.payload);
-        var response = _impl.startListening(params.server,_tcpBoundSocketStartListeningResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _tcpBoundSocketMethodStartListeningName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _tcpBoundSocketMethodStartListeningName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.startListening(params.server, _tcpBoundSocketStartListeningResponseParamsResponder(message.header.requestId));
         break;
       case _tcpBoundSocketMethodConnectName:
         var params = _TcpBoundSocketConnectParams.deserialize(
             message.payload);
-        var response = _impl.connect(params.remoteAddress,params.sendStream,params.receiveStream,params.clientSocket,_tcpBoundSocketConnectResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _tcpBoundSocketMethodConnectName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _tcpBoundSocketMethodConnectName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.connect(params.remoteAddress, params.sendStream, params.receiveStream, params.clientSocket, _tcpBoundSocketConnectResponseParamsResponder(message.header.requestId));
         break;
       default:
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   TcpBoundSocket get impl => _impl;
   set impl(TcpBoundSocket 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, [TcpBoundSocket impl])
       : super(new _TcpBoundSocketStubControl.fromHandle(handle, impl));
 
   static TcpBoundSocketStub newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For TcpBoundSocketStub"));
     return new TcpBoundSocketStub.fromEndpoint(endpoint);
   }
 
 
-  dynamic startListening(tcp_server_socket_mojom.TcpServerSocketInterfaceRequest server,[Function responseFactory = null]) {
-    return impl.startListening(server,responseFactory);
+  void startListening(tcp_server_socket_mojom.TcpServerSocketInterfaceRequest server,void callback(network_error_mojom.NetworkError result)) {
+    return impl.startListening(server,callback);
   }
-  dynamic connect(net_address_mojom.NetAddress remoteAddress,core.MojoDataPipeConsumer sendStream,core.MojoDataPipeProducer receiveStream,tcp_connected_socket_mojom.TcpConnectedSocketInterfaceRequest clientSocket,[Function responseFactory = null]) {
-    return impl.connect(remoteAddress,sendStream,receiveStream,clientSocket,responseFactory);
+  void connect(net_address_mojom.NetAddress remoteAddress,core.MojoDataPipeConsumer sendStream,core.MojoDataPipeProducer receiveStream,tcp_connected_socket_mojom.TcpConnectedSocketInterfaceRequest clientSocket,void callback(network_error_mojom.NetworkError result)) {
+    return impl.connect(remoteAddress,sendStream,receiveStream,clientSocket,callback);
   }
 }