Dart: Futures -> Callbacks.

mojo/dart/packages/mojo_services/lib/nfc/nfc.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 nfc_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;
 
 
 
 class NfcData extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   List<int> data = null;
 
   NfcData() : super(kVersions.last.size);
 
+  NfcData.init(
+    List<int> this.data
+  ) : super(kVersions.last.size);
+
   static NfcData 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 NfcData decode(bindings.Decoder decoder0) {
@@ skipping 51 matching lines @@
 }
 
 
 class _NfcTransmissionCancelParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(8, 0)
   ];
 
   _NfcTransmissionCancelParams() : super(kVersions.last.size);
 
+  _NfcTransmissionCancelParams.init(
+  ) : super(kVersions.last.size);
+
   static _NfcTransmissionCancelParams 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 _NfcTransmissionCancelParams decode(bindings.Decoder decoder0) {
@@ skipping 39 matching lines @@
 
 
 class _NfcReceiverOnReceivedNfcDataParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   NfcData nfcData = null;
 
   _NfcReceiverOnReceivedNfcDataParams() : super(kVersions.last.size);
 
+  _NfcReceiverOnReceivedNfcDataParams.init(
+    NfcData this.nfcData
+  ) : super(kVersions.last.size);
+
   static _NfcReceiverOnReceivedNfcDataParams 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 _NfcReceiverOnReceivedNfcDataParams decode(bindings.Decoder decoder0) {
@@ skipping 54 matching lines @@
 
 class _NfcTransmitOnNextConnectionParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(24, 0)
   ];
   NfcData nfcData = null;
   NfcTransmissionInterfaceRequest transmission = null;
 
   _NfcTransmitOnNextConnectionParams() : super(kVersions.last.size);
 
+  _NfcTransmitOnNextConnectionParams.init(
+    NfcData this.nfcData, 
+    NfcTransmissionInterfaceRequest this.transmission
+  ) : super(kVersions.last.size);
+
   static _NfcTransmitOnNextConnectionParams 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 _NfcTransmitOnNextConnectionParams decode(bindings.Decoder decoder0) {
@@ skipping 64 matching lines @@
 
 
 class NfcTransmitOnNextConnectionResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   bool success = false;
 
   NfcTransmitOnNextConnectionResponseParams() : super(kVersions.last.size);
 
+  NfcTransmitOnNextConnectionResponseParams.init(
+    bool this.success
+  ) : super(kVersions.last.size);
+
   static NfcTransmitOnNextConnectionResponseParams 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 NfcTransmitOnNextConnectionResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 51 matching lines @@
 }
 
 
 class _NfcRegisterParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(8, 0)
   ];
 
   _NfcRegisterParams() : super(kVersions.last.size);
 
+  _NfcRegisterParams.init(
+  ) : super(kVersions.last.size);
+
   static _NfcRegisterParams 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 _NfcRegisterParams decode(bindings.Decoder decoder0) {
@@ skipping 38 matching lines @@
 }
 
 
 class _NfcUnregisterParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(8, 0)
   ];
 
   _NfcUnregisterParams() : super(kVersions.last.size);
 
+  _NfcUnregisterParams.init(
+  ) : super(kVersions.last.size);
+
   static _NfcUnregisterParams 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 _NfcUnregisterParams decode(bindings.Decoder decoder0) {
@@ skipping 33 matching lines @@
 
   Map toJson() {
     Map map = new Map();
     return map;
   }
 }
 
 const int _nfcTransmissionMethodCancelName = 0;
 
 class _NfcTransmissionServiceDescription 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 NfcTransmission {
   static const String serviceName = null;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _NfcTransmissionServiceDescription();
     }
@@ skipping 128 matching lines @@
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _NfcTransmissionStubControl.unbound([this._impl]) : super.unbound();
 
   String get serviceName => NfcTransmission.serviceName;
 
 
 
-  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 _nfcTransmissionMethodCancelName:
         _impl.cancel();
         break;
       default:
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   NfcTransmission get impl => _impl;
   set impl(NfcTransmission d) {
     if (d == null) {
       throw new core.MojoApiError("$this: Cannot set a null implementation");
     }
     if (isBound && (_impl == null)) {
       beginHandlingEvents();
     }
@@ skipping 41 matching lines @@
 
 
   void cancel() {
     return impl.cancel();
   }
 }
 
 const int _nfcReceiverMethodOnReceivedNfcDataName = 0;
 
 class _NfcReceiverServiceDescription 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 NfcReceiver {
   static const String serviceName = "nfc::NfcReceiver";
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _NfcReceiverServiceDescription();
     }
@@ skipping 129 matching lines @@
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _NfcReceiverStubControl.unbound([this._impl]) : super.unbound();
 
   String get serviceName => NfcReceiver.serviceName;
 
 
 
-  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 _nfcReceiverMethodOnReceivedNfcDataName:
         var params = _NfcReceiverOnReceivedNfcDataParams.deserialize(
             message.payload);
         _impl.onReceivedNfcData(params.nfcData);
         break;
       default:
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   NfcReceiver get impl => _impl;
   set impl(NfcReceiver d) {
     if (d == null) {
       throw new core.MojoApiError("$this: Cannot set a null implementation");
     }
     if (isBound && (_impl == null)) {
       beginHandlingEvents();
     }
@@ skipping 43 matching lines @@
   void onReceivedNfcData(NfcData nfcData) {
     return impl.onReceivedNfcData(nfcData);
   }
 }
 
 const int _nfcMethodTransmitOnNextConnectionName = 0;
 const int _nfcMethodRegisterName = 1;
 const int _nfcMethodUnregisterName = 2;
 
 class _NfcServiceDescription 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 Nfc {
   static const String serviceName = "nfc::Nfc";
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _NfcServiceDescription();
     }
     return _cachedServiceDescription;
   }
 
   static NfcProxy connectToService(
       bindings.ServiceConnector s, String url, [String serviceName]) {
     NfcProxy p = new NfcProxy.unbound();
     String name = serviceName ?? Nfc.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 transmitOnNextConnection(NfcData nfcData,NfcTransmissionInterfaceRequest transmission,[Function responseFactory = null]);
+  void transmitOnNextConnection(NfcData nfcData,NfcTransmissionInterfaceRequest transmission,void callback(bool success));
   void register();
   void unregister();
 }
 
 abstract class NfcInterface
     implements bindings.MojoInterface<Nfc>,
                Nfc {
   factory NfcInterface([Nfc impl]) =>
       new NfcStub.unbound(impl);
 
@@ skipping 31 matching lines @@
 
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _nfcMethodTransmitOnNextConnectionName:
         var r = NfcTransmitOnNextConnectionResponseParams.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;
       default:
         proxyError("Unexpected message type: ${message.header.type}");
         close(immediate: true);
         break;
     }
   }
 
   @override
   String toString() {
@@ skipping 24 matching lines @@
     return newMockedProxy;
   }
 
   static NfcProxy newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For NfcProxy"));
     return new NfcProxy.fromEndpoint(endpoint);
   }
 
 
-  dynamic transmitOnNextConnection(NfcData nfcData,NfcTransmissionInterfaceRequest transmission,[Function responseFactory = null]) {
+  void transmitOnNextConnection(NfcData nfcData,NfcTransmissionInterfaceRequest transmission,void callback(bool success)) {
     if (impl != null) {
-      return new Future(() => impl.transmitOnNextConnection(nfcData,transmission,_NfcStubControl._nfcTransmitOnNextConnectionResponseParamsFactory));
+      impl.transmitOnNextConnection(nfcData,transmission,callback);
+      return;
     }
     var params = new _NfcTransmitOnNextConnectionParams();
     params.nfcData = nfcData;
     params.transmission = transmission;
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _nfcMethodTransmitOnNextConnectionName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
   void register() {
     if (impl != null) {
       impl.register();
       return;
     }
     if (!ctrl.isBound) {
       ctrl.proxyError("The Proxy is closed.");
       return;
     }
@@ skipping 31 matching lines @@
       core.MojoHandle handle, [Nfc impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _NfcStubControl.unbound([this._impl]) : super.unbound();
 
   String get serviceName => Nfc.serviceName;
 
 
-  static NfcTransmitOnNextConnectionResponseParams _nfcTransmitOnNextConnectionResponseParamsFactory(bool success) {
-    var result = new NfcTransmitOnNextConnectionResponseParams();
-    result.success = success;
-    return result;
+  Function _nfcTransmitOnNextConnectionResponseParamsResponder(
+      int requestId) {
+  return (bool success) {
+      var result = new NfcTransmitOnNextConnectionResponseParams();
+      result.success = success;
+      sendResponse(buildResponseWithId(
+          result,
+          _nfcMethodTransmitOnNextConnectionName,
+          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 _nfcMethodTransmitOnNextConnectionName:
         var params = _NfcTransmitOnNextConnectionParams.deserialize(
             message.payload);
-        var response = _impl.transmitOnNextConnection(params.nfcData,params.transmission,_nfcTransmitOnNextConnectionResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _nfcMethodTransmitOnNextConnectionName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _nfcMethodTransmitOnNextConnectionName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.transmitOnNextConnection(params.nfcData, params.transmission, _nfcTransmitOnNextConnectionResponseParamsResponder(message.header.requestId));
         break;
       case _nfcMethodRegisterName:
         _impl.register();
         break;
       case _nfcMethodUnregisterName:
         _impl.unregister();
         break;
       default:
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   Nfc get impl => _impl;
   set impl(Nfc 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, [Nfc impl])
       : super(new _NfcStubControl.fromHandle(handle, impl));
 
   static NfcStub newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For NfcStub"));
     return new NfcStub.fromEndpoint(endpoint);
   }
 
 
-  dynamic transmitOnNextConnection(NfcData nfcData,NfcTransmissionInterfaceRequest transmission,[Function responseFactory = null]) {
-    return impl.transmitOnNextConnection(nfcData,transmission,responseFactory);
+  void transmitOnNextConnection(NfcData nfcData,NfcTransmissionInterfaceRequest transmission,void callback(bool success)) {
+    return impl.transmitOnNextConnection(nfcData,transmission,callback);
   }
   void register() {
     return impl.register();
   }
   void unregister() {
     return impl.unregister();
   }
 }