mojo/dart/packages/_mojo_for_test_only/lib/test/echo_service.mojom.dart - Issue 2006093002: Dart: Futures -> Callbacks.

Unified Diff: mojo/dart/packages/_mojo_for_test_only/lib/test/echo_service.mojom.dart

Issue 2006093002: Dart: Futures -> Callbacks. (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Cleanup Created 4 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« mojo/dart/embedder/io/mojo_patch.dart ('K') | « mojo/dart/packages/_mojo_for_test_only/lib/sample/sample_service.mojom.dart ('k') | mojo/dart/packages/_mojo_for_test_only/lib/test/pingpong_service.mojom.dart » ('j') | mojo/dart/packages/mojo/lib/src/proxy.dart » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/dart/packages/_mojo_for_test_only/lib/test/echo_service.mojom.dart

diff --git a/mojo/dart/packages/_mojo_for_test_only/lib/test/echo_service.mojom.dart b/mojo/dart/packages/_mojo_for_test_only/lib/test/echo_service.mojom.dart

index 6b959c376f04e34249da0a7d17dc296dba38ee9d..43493c4e6b12ca5d9f3dbd197f1d92441d773877 100644

--- a/mojo/dart/packages/_mojo_for_test_only/lib/test/echo_service.mojom.dart

+++ b/mojo/dart/packages/_mojo_for_test_only/lib/test/echo_service.mojom.dart

@@ -23,6 +23,10 @@ class _EchoServiceEchoStringParams extends bindings.Struct {

_EchoServiceEchoStringParams() : super(kVersions.last.size);

+ _EchoServiceEchoStringParams.init(

+ String this.value

+ ) : super(kVersions.last.size);

static _EchoServiceEchoStringParams deserialize(bindings.Message message) {

var decoder = new bindings.Decoder(message);

var result = decode(decoder);

@@ -95,6 +99,10 @@ class EchoServiceEchoStringResponseParams extends bindings.Struct {

EchoServiceEchoStringResponseParams() : super(kVersions.last.size);

+ EchoServiceEchoStringResponseParams.init(

+ String this.value

+ ) : super(kVersions.last.size);

static EchoServiceEchoStringResponseParams deserialize(bindings.Message message) {

var decoder = new bindings.Decoder(message);

var result = decode(decoder);

@@ -168,6 +176,11 @@ class _EchoServiceDelayedEchoStringParams extends bindings.Struct {

_EchoServiceDelayedEchoStringParams() : super(kVersions.last.size);

+ _EchoServiceDelayedEchoStringParams.init(

+ String this.value,

+ int this.millis

+ ) : super(kVersions.last.size);

static _EchoServiceDelayedEchoStringParams deserialize(bindings.Message message) {

var decoder = new bindings.Decoder(message);

var result = decode(decoder);

@@ -253,6 +266,10 @@ class EchoServiceDelayedEchoStringResponseParams extends bindings.Struct {

EchoServiceDelayedEchoStringResponseParams() : super(kVersions.last.size);

+ EchoServiceDelayedEchoStringResponseParams.init(

+ String this.value

+ ) : super(kVersions.last.size);

static EchoServiceDelayedEchoStringResponseParams deserialize(bindings.Message message) {

var decoder = new bindings.Decoder(message);

var result = decode(decoder);

@@ -324,6 +341,9 @@ class _EchoServiceSwapParams extends bindings.Struct {

_EchoServiceSwapParams() : super(kVersions.last.size);

+ _EchoServiceSwapParams.init(

+ ) : super(kVersions.last.size);

static _EchoServiceSwapParams deserialize(bindings.Message message) {

var decoder = new bindings.Decoder(message);

var result = decode(decoder);

@@ -382,6 +402,9 @@ class _EchoServiceQuitParams extends bindings.Struct {

_EchoServiceQuitParams() : super(kVersions.last.size);

+ _EchoServiceQuitParams.init(

+ ) : super(kVersions.last.size);

static _EchoServiceQuitParams deserialize(bindings.Message message) {

var decoder = new bindings.Decoder(message);

var result = decode(decoder);

@@ -438,17 +461,19 @@ const int _echoServiceMethodSwapName = 2;

const int _echoServiceMethodQuitName = 3;

class _EchoServiceServiceDescription implements service_describer.ServiceDescription {

- dynamic getTopLevelInterface([Function responseFactory]){

+ void getTopLevelInterface(Function responder){

var interfaceTypeKey = getRuntimeTypeInfo().services["test::EchoService"];

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 EchoService {

@@ -473,8 +498,8 @@ abstract class EchoService {

s.connectToService(url, p, name);

return p;

}

- dynamic echoString(String value,[Function responseFactory = null]);

- dynamic delayedEchoString(String value,int millis,[Function responseFactory = null]);

+ void echoString(String value,void callback(String value));

+ void delayedEchoString(String value,int millis,void callback(String value));

void swap();

void quit();

}

@@ -526,18 +551,14 @@ class _EchoServiceProxyControl

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;

case _echoServiceMethodDelayedEchoStringName:

var r = EchoServiceDelayedEchoStringResponseParams.deserialize(

@@ -546,18 +567,14 @@ class _EchoServiceProxyControl

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}");

@@ -602,30 +619,34 @@ class EchoServiceProxy

}

- dynamic echoString(String value,[Function responseFactory = null]) {

+ void echoString(String value,void callback(String value)) {

if (impl != null) {

- return new Future(() => impl.echoString(value,_EchoServiceStubControl._echoServiceEchoStringResponseParamsFactory));

+ impl.echoString(value,callback);

+ return;

}

var params = new _EchoServiceEchoStringParams();

params.value = value;

- return ctrl.sendMessageWithRequestId(

+ ctrl.sendMessageWithRequestId(

params,

_echoServiceMethodEchoStringName,

-1,

- bindings.MessageHeader.kMessageExpectsResponse);

+ bindings.MessageHeader.kMessageExpectsResponse,

+ callback);

}

- dynamic delayedEchoString(String value,int millis,[Function responseFactory = null]) {

+ void delayedEchoString(String value,int millis,void callback(String value)) {

if (impl != null) {

- return new Future(() => impl.delayedEchoString(value,millis,_EchoServiceStubControl._echoServiceDelayedEchoStringResponseParamsFactory));

+ impl.delayedEchoString(value,millis,callback);

+ return;

}

var params = new _EchoServiceDelayedEchoStringParams();

params.value = value;

params.millis = millis;

- return ctrl.sendMessageWithRequestId(

+ ctrl.sendMessageWithRequestId(

params,

_echoServiceMethodDelayedEchoStringName,

-1,

- bindings.MessageHeader.kMessageExpectsResponse);

+ bindings.MessageHeader.kMessageExpectsResponse,

+ callback);

}

void swap() {

if (impl != null) {

@@ -677,22 +698,36 @@ class _EchoServiceStubControl

String get serviceName => EchoService.serviceName;

- static EchoServiceEchoStringResponseParams _echoServiceEchoStringResponseParamsFactory(String value) {

- var result = new EchoServiceEchoStringResponseParams();

- result.value = value;

- return result;

- }

- static EchoServiceDelayedEchoStringResponseParams _echoServiceDelayedEchoStringResponseParamsFactory(String value) {

- var result = new EchoServiceDelayedEchoStringResponseParams();

- result.value = value;

- return result;

- }

- dynamic handleMessage(bindings.ServiceMessage message) {

+ Function _echoServiceEchoStringResponseParamsResponder(

+ int requestId) {

+ return (String value) {

+ var result = new EchoServiceEchoStringResponseParams();

+ result.value = value;

+ sendResponse(buildResponseWithId(

+ result,

+ _echoServiceMethodEchoStringName,

+ requestId,

+ bindings.MessageHeader.kMessageIsResponse));

+ };

+ }

+ Function _echoServiceDelayedEchoStringResponseParamsResponder(

+ int requestId) {

+ return (String value) {

+ var result = new EchoServiceDelayedEchoStringResponseParams();

+ result.value = value;

+ sendResponse(buildResponseWithId(

+ result,

+ _echoServiceMethodDelayedEchoStringName,

+ requestId,

+ bindings.MessageHeader.kMessageIsResponse));

+ };

+ }

+ 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");

@@ -701,46 +736,12 @@ class _EchoServiceStubControl

case _echoServiceMethodEchoStringName:

var params = _EchoServiceEchoStringParams.deserialize(

message.payload);

- var response = _impl.echoString(params.value,_echoServiceEchoStringResponseParamsFactory);

- if (response is Future) {

- return response.then((response) {

- if (response != null) {

- return buildResponseWithId(

- response,

- _echoServiceMethodEchoStringName,

- message.header.requestId,

- bindings.MessageHeader.kMessageIsResponse);

- }

- });

- } else if (response != null) {

- return buildResponseWithId(

- response,

- _echoServiceMethodEchoStringName,

- message.header.requestId,

- bindings.MessageHeader.kMessageIsResponse);

- }

+ _impl.echoString(params.value, _echoServiceEchoStringResponseParamsResponder(message.header.requestId));

break;

case _echoServiceMethodDelayedEchoStringName:

var params = _EchoServiceDelayedEchoStringParams.deserialize(

message.payload);

- var response = _impl.delayedEchoString(params.value,params.millis,_echoServiceDelayedEchoStringResponseParamsFactory);

- if (response is Future) {

- return response.then((response) {

- if (response != null) {

- return buildResponseWithId(

- response,

- _echoServiceMethodDelayedEchoStringName,

- message.header.requestId,

- bindings.MessageHeader.kMessageIsResponse);

- }

- });

- } else if (response != null) {

- return buildResponseWithId(

- response,

- _echoServiceMethodDelayedEchoStringName,

- message.header.requestId,

- bindings.MessageHeader.kMessageIsResponse);

- }

+ _impl.delayedEchoString(params.value, params.millis, _echoServiceDelayedEchoStringResponseParamsResponder(message.header.requestId));

break;

case _echoServiceMethodSwapName:

_impl.swap();

@@ -752,7 +753,6 @@ class _EchoServiceStubControl

throw new bindings.MojoCodecError("Unexpected message name");

break;

}

- return null;

}

EchoService get impl => _impl;

@@ -806,11 +806,11 @@ class EchoServiceStub

}

- 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);

}

- dynamic delayedEchoString(String value,int millis,[Function responseFactory = null]) {

- return impl.delayedEchoString(value,millis,responseFactory);

+ void delayedEchoString(String value,int millis,void callback(String value)) {

+ return impl.delayedEchoString(value,millis,callback);

}

void swap() {

return impl.swap();

@@ -833,7 +833,7 @@ 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/+xYvY4TMRDenwPCXUD8SstPEahCwZkyioSUglRICHQ01xBZe75k0W52WW8OwRPwCJSUlJQ8Ao9yJSUd2OwYnIkdNtGR1Z5upLmJfZnY3+dvxpsETmlXIH6AiOd72tgV3oLxLeFXhReMF/3+MJykeyw/ikJmef89yHm5/3w4ejrc78vE3cU8vP7gBD7PhXxfy+9C7EDMXOABooPWVzx8hPgZ4k+wL47Z8L47BpwXtPnrwneEA4pnNGGV+FZ5+D8BrIHpwTzL/W0LPxT+SjiZ8ZzEaUhjMk7TcczIJE0YeZ9TkqSvU8LzsHxxQPOC0CyTC3Ai/47EiJNoWrD8kIaMEyaWHfFy3V2ZlPwbD96fztsWvJa8enCuXZhX7/t2royf2mX8etl87t/VOfvmc1f2CI3lmZvmlV0DPn8jK/JoOjbjuggYNsU71p/CH3jVcUvrWXDfBux/cT/M2ZuZ2J4Zv7JN4cf1OLD0uR9ONauqk64l/5JwKdUjGs+YRR83N8yPqi1T/wq0vbuW+vwfuroDPW5OVzxLp5yd6WpNXXUboCvcrxV/k635z6vCl6udBzZ1Hz1hMX3HDnDbXuBvu+a+rXjo+avV18CCXz1PLeCfb9+111kAvP/Rh9uMepN6uVtjvZn4cWDPJmutwY+7hB/5+HVeeBLFccTN/DyosV/r/cfTxra663gnU3f34ZnJVHfa9XZ2v61Rb48beL8dI5zeCnx5S/hqw/ejvbc0M+lpp+b77BjFqnVl+/51AzBLvPoVVncdtSrow1nyOwXWh78CX34FfbyYRUae2qdUHxJvk/XxKwAA///0GO/NyBMAAA==";

+ var serializedRuntimeTypeInfo = "H4sIAAAJbogC/+xYvY4TMRDenwPCXUD8SstPEahCwRlRRZGQUpAKCYGO5qrI2jPJot3sst4cgifgESgpKSl5BB7lSko6sC9jcCZ2cKIjq5xupLmJfZnY3+dvxptE3tSuQPwIEc93tLEvvAHjW8KvCq8Yr7rdfjzK91h5mMTM8v57kPNq/0V/8Ky/35WJu/N5eP3eCXyeD/mhlt+G2IJY+MADRA+tr3j4BPELxF9gXz2z4X23DDgvaPPXhe8IBxTPacac+FZ5+D8RrIHpwTzL/W0LHwofCCcTXpI0j2lKhnk+TBkZ5RkjH0pKsvxN/pjwMj5+RQ5oWRFaFHIFTuTfgRhxkowrVr6mMeOEiXUHfLrwrkzK/okH70/nbQteS14DONc2zKv3fT83jZ+b0/jtsvncf6hzDs3nruwRGsszN80ruwZ8HiOrymQ8NOO6CBjWxTvWn8IfBe64pXUsuG8D9r+4H5bs7UTszoxf2brw43rsWfrcT8/NXHXStuRfEi6lekjTCbPo4+aa+VG1ZepfkbZ331Kf/0NXd6DHzeiKF/mYszNdrair9gboCvdrxd9oa/bzXPjytfPApu6jpyyl79kBbttz/G3X3LcVD51wufrqWfCr56k5/LPtu/Y6i4D3P/rwN6PepF7u1lhvJn482LPJGivw4y/gRz5+nReeJWmacDM/D2rs13r/CbSxre5awcnU3X14ZjLVnXa9nd1vK9Tbkw28344QzmAJvoIFfDXh+9HeO1qY9LRT8312hKJrXdm+f90AzBKvfoXVXUcNB314C36nwPoIl+ArdNDHy0li5Kl5SvUh8W6yPn4HAAD//6kk0hzIEwAA";

// Deserialize RuntimeTypeInfo

var bytes = BASE64.decode(serializedRuntimeTypeInfo);