Dart: Futures -> Callbacks.

mojo/dart/packages/mojo_services/lib/http_server/http_server.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 http_server_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_services/http_server/http_request.mojom.dart' as http_request_mojom;
 import 'package:mojo_services/http_server/http_response.mojom.dart' as http_response_mojom;
 
 
 
 class _HttpServerSetHandlerParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(24, 0)
   ];
   String pattern = null;
   HttpHandlerInterface handler = null;
 
   _HttpServerSetHandlerParams() : super(kVersions.last.size);
 
+  _HttpServerSetHandlerParams.init(
+    String this.pattern, 
+    HttpHandlerInterface this.handler
+  ) : super(kVersions.last.size);
+
   static _HttpServerSetHandlerParams 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 _HttpServerSetHandlerParams decode(bindings.Decoder decoder0) {
@@ skipping 63 matching lines @@
 
 
 class HttpServerSetHandlerResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   bool success = false;
 
   HttpServerSetHandlerResponseParams() : super(kVersions.last.size);
 
+  HttpServerSetHandlerResponseParams.init(
+    bool this.success
+  ) : super(kVersions.last.size);
+
   static HttpServerSetHandlerResponseParams 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 HttpServerSetHandlerResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 51 matching lines @@
 }
 
 
 class _HttpServerGetPortParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(8, 0)
   ];
 
   _HttpServerGetPortParams() : super(kVersions.last.size);
 
+  _HttpServerGetPortParams.init(
+  ) : super(kVersions.last.size);
+
   static _HttpServerGetPortParams 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 _HttpServerGetPortParams decode(bindings.Decoder decoder0) {
@@ skipping 39 matching lines @@
 
 
 class HttpServerGetPortResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   int port = 0;
 
   HttpServerGetPortResponseParams() : super(kVersions.last.size);
 
+  HttpServerGetPortResponseParams.init(
+    int this.port
+  ) : super(kVersions.last.size);
+
   static HttpServerGetPortResponseParams 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 HttpServerGetPortResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 52 matching lines @@
 
 
 class _HttpHandlerHandleRequestParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   http_request_mojom.HttpRequest request = null;
 
   _HttpHandlerHandleRequestParams() : super(kVersions.last.size);
 
+  _HttpHandlerHandleRequestParams.init(
+    http_request_mojom.HttpRequest this.request
+  ) : super(kVersions.last.size);
+
   static _HttpHandlerHandleRequestParams 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 _HttpHandlerHandleRequestParams decode(bindings.Decoder decoder0) {
@@ skipping 52 matching lines @@
 
 
 class HttpHandlerHandleRequestResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   http_response_mojom.HttpResponse response = null;
 
   HttpHandlerHandleRequestResponseParams() : super(kVersions.last.size);
 
+  HttpHandlerHandleRequestResponseParams.init(
+    http_response_mojom.HttpResponse this.response
+  ) : super(kVersions.last.size);
+
   static HttpHandlerHandleRequestResponseParams 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 HttpHandlerHandleRequestResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 47 matching lines @@
   Map toJson() {
     throw new bindings.MojoCodecError(
         'Object containing handles cannot be encoded to JSON.');
   }
 }
 
 const int _httpServerMethodSetHandlerName = 0;
 const int _httpServerMethodGetPortName = 1;
 
 class _HttpServerServiceDescription 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 HttpServer {
   static const String serviceName = null;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _HttpServerServiceDescription();
     }
     return _cachedServiceDescription;
   }
 
   static HttpServerProxy connectToService(
       bindings.ServiceConnector s, String url, [String serviceName]) {
     HttpServerProxy p = new HttpServerProxy.unbound();
     String name = serviceName ?? HttpServer.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 setHandler(String pattern,HttpHandlerInterface handler,[Function responseFactory = null]);
-  dynamic getPort([Function responseFactory = null]);
+  void setHandler(String pattern,HttpHandlerInterface handler,void callback(bool success));
+  void getPort(void callback(int port));
 }
 
 abstract class HttpServerInterface
     implements bindings.MojoInterface<HttpServer>,
                HttpServer {
   factory HttpServerInterface([HttpServer impl]) =>
       new HttpServerStub.unbound(impl);
   factory HttpServerInterface.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint,
       [HttpServer impl]) =>
@@ skipping 22 matching lines @@
 
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _httpServerMethodSetHandlerName:
         var r = HttpServerSetHandlerResponseParams.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.success );
         break;
       case _httpServerMethodGetPortName:
         var r = HttpServerGetPortResponseParams.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.port );
         break;
       default:
         proxyError("Unexpected message type: ${message.header.type}");
         close(immediate: true);
         break;
     }
   }
 
   HttpServer get impl => null;
   set impl(HttpServer _) {
@@ skipping 22 matching lines @@
   HttpServerProxy.unbound()
       : super(new _HttpServerProxyControl.unbound());
 
   static HttpServerProxy newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For HttpServerProxy"));
     return new HttpServerProxy.fromEndpoint(endpoint);
   }
 
 
-  dynamic setHandler(String pattern,HttpHandlerInterface handler,[Function responseFactory = null]) {
+  void setHandler(String pattern,HttpHandlerInterface handler,void callback(bool success)) {
     var params = new _HttpServerSetHandlerParams();
     params.pattern = pattern;
     params.handler = handler;
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _httpServerMethodSetHandlerName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
-  dynamic getPort([Function responseFactory = null]) {
+  void getPort(void callback(int port)) {
     var params = new _HttpServerGetPortParams();
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _httpServerMethodGetPortName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
 }
 
 class _HttpServerStubControl
     extends bindings.StubMessageHandler
     implements bindings.StubControl<HttpServer> {
   HttpServer _impl;
 
   _HttpServerStubControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [HttpServer impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _HttpServerStubControl.fromHandle(
       core.MojoHandle handle, [HttpServer impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _HttpServerStubControl.unbound([this._impl]) : super.unbound();
 
   String get serviceName => HttpServer.serviceName;
 
 
-  HttpServerSetHandlerResponseParams _httpServerSetHandlerResponseParamsFactory(bool success) {
-    var result = new HttpServerSetHandlerResponseParams();
-    result.success = success;
-    return result;
+  Function _httpServerSetHandlerResponseParamsResponder(
+      int requestId) {
+  return (bool success) {
+      var result = new HttpServerSetHandlerResponseParams();
+      result.success = success;
+      sendResponse(buildResponseWithId(
+          result,
+          _httpServerMethodSetHandlerName,
+          requestId,
+          bindings.MessageHeader.kMessageIsResponse));
+    };
   }
-  HttpServerGetPortResponseParams _httpServerGetPortResponseParamsFactory(int port) {
-    var result = new HttpServerGetPortResponseParams();
-    result.port = port;
-    return result;
+  Function _httpServerGetPortResponseParamsResponder(
+      int requestId) {
+  return (int port) {
+      var result = new HttpServerGetPortResponseParams();
+      result.port = port;
+      sendResponse(buildResponseWithId(
+          result,
+          _httpServerMethodGetPortName,
+          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 _httpServerMethodSetHandlerName:
         var params = _HttpServerSetHandlerParams.deserialize(
             message.payload);
-        var response = _impl.setHandler(params.pattern,params.handler,_httpServerSetHandlerResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _httpServerMethodSetHandlerName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _httpServerMethodSetHandlerName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.setHandler(params.pattern, params.handler, _httpServerSetHandlerResponseParamsResponder(message.header.requestId));
         break;
       case _httpServerMethodGetPortName:
-        var response = _impl.getPort(_httpServerGetPortResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _httpServerMethodGetPortName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _httpServerMethodGetPortName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.getPort(_httpServerGetPortResponseParamsResponder(message.header.requestId));
         break;
       default:
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   HttpServer get impl => _impl;
   set impl(HttpServer 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, [HttpServer impl])
       : super(new _HttpServerStubControl.fromHandle(handle, impl));
 
   static HttpServerStub newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For HttpServerStub"));
     return new HttpServerStub.fromEndpoint(endpoint);
   }
 
 
-  dynamic setHandler(String pattern,HttpHandlerInterface handler,[Function responseFactory = null]) {
-    return impl.setHandler(pattern,handler,responseFactory);
+  void setHandler(String pattern,HttpHandlerInterface handler,void callback(bool success)) {
+    return impl.setHandler(pattern,handler,callback);
   }
-  dynamic getPort([Function responseFactory = null]) {
-    return impl.getPort(responseFactory);
+  void getPort(void callback(int port)) {
+    return impl.getPort(callback);
   }
 }
 
 const int _httpHandlerMethodHandleRequestName = 0;
 
 class _HttpHandlerServiceDescription 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 HttpHandler {
   static const String serviceName = null;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _HttpHandlerServiceDescription();
     }
     return _cachedServiceDescription;
   }
 
   static HttpHandlerProxy connectToService(
       bindings.ServiceConnector s, String url, [String serviceName]) {
     HttpHandlerProxy p = new HttpHandlerProxy.unbound();
     String name = serviceName ?? HttpHandler.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 handleRequest(http_request_mojom.HttpRequest request,[Function responseFactory = null]);
+  void handleRequest(http_request_mojom.HttpRequest request,void callback(http_response_mojom.HttpResponse response));
 }
 
 abstract class HttpHandlerInterface
     implements bindings.MojoInterface<HttpHandler>,
                HttpHandler {
   factory HttpHandlerInterface([HttpHandler impl]) =>
       new HttpHandlerStub.unbound(impl);
   factory HttpHandlerInterface.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint,
       [HttpHandler impl]) =>
@@ skipping 22 matching lines @@
 
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _httpHandlerMethodHandleRequestName:
         var r = HttpHandlerHandleRequestResponseParams.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.response );
         break;
       default:
         proxyError("Unexpected message type: ${message.header.type}");
         close(immediate: true);
         break;
     }
   }
 
   HttpHandler get impl => null;
   set impl(HttpHandler _) {
@@ skipping 22 matching lines @@
   HttpHandlerProxy.unbound()
       : super(new _HttpHandlerProxyControl.unbound());
 
   static HttpHandlerProxy newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For HttpHandlerProxy"));
     return new HttpHandlerProxy.fromEndpoint(endpoint);
   }
 
 
-  dynamic handleRequest(http_request_mojom.HttpRequest request,[Function responseFactory = null]) {
+  void handleRequest(http_request_mojom.HttpRequest request,void callback(http_response_mojom.HttpResponse response)) {
     var params = new _HttpHandlerHandleRequestParams();
     params.request = request;
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _httpHandlerMethodHandleRequestName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
 }
 
 class _HttpHandlerStubControl
     extends bindings.StubMessageHandler
     implements bindings.StubControl<HttpHandler> {
   HttpHandler _impl;
 
   _HttpHandlerStubControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [HttpHandler impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _HttpHandlerStubControl.fromHandle(
       core.MojoHandle handle, [HttpHandler impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _HttpHandlerStubControl.unbound([this._impl]) : super.unbound();
 
   String get serviceName => HttpHandler.serviceName;
 
 
-  HttpHandlerHandleRequestResponseParams _httpHandlerHandleRequestResponseParamsFactory(http_response_mojom.HttpResponse response) {
-    var result = new HttpHandlerHandleRequestResponseParams();
-    result.response = response;
-    return result;
+  Function _httpHandlerHandleRequestResponseParamsResponder(
+      int requestId) {
+  return (http_response_mojom.HttpResponse response) {
+      var result = new HttpHandlerHandleRequestResponseParams();
+      result.response = response;
+      sendResponse(buildResponseWithId(
+          result,
+          _httpHandlerMethodHandleRequestName,
+          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 _httpHandlerMethodHandleRequestName:
         var params = _HttpHandlerHandleRequestParams.deserialize(
             message.payload);
-        var response = _impl.handleRequest(params.request,_httpHandlerHandleRequestResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _httpHandlerMethodHandleRequestName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _httpHandlerMethodHandleRequestName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.handleRequest(params.request, _httpHandlerHandleRequestResponseParamsResponder(message.header.requestId));
         break;
       default:
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   HttpHandler get impl => _impl;
   set impl(HttpHandler 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, [HttpHandler impl])
       : super(new _HttpHandlerStubControl.fromHandle(handle, impl));
 
   static HttpHandlerStub newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For HttpHandlerStub"));
     return new HttpHandlerStub.fromEndpoint(endpoint);
   }
 
 
-  dynamic handleRequest(http_request_mojom.HttpRequest request,[Function responseFactory = null]) {
-    return impl.handleRequest(request,responseFactory);
+  void handleRequest(http_request_mojom.HttpRequest request,void callback(http_response_mojom.HttpResponse response)) {
+    return impl.handleRequest(request,callback);
   }
 }