Dart: Refactor Stubs

mojo/dart/packages/_mojo_for_test_only/lib/test/echo_service.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 echo_service_mojom;
 import 'dart:async';
 import 'dart:collection';
 import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
@@ skipping 441 matching lines @@
 }
 
 abstract class EchoService {
   static const String serviceName = "test::EchoService";
   dynamic echoString(String value,[Function responseFactory = null]);
   dynamic delayedEchoString(String value,int millis,[Function responseFactory = null]);
   void swap();
   void quit();
 }
 
-
-class _EchoServiceProxyControl extends bindings.ProxyMessageHandler
-                                      implements bindings.ProxyControl {
+class _EchoServiceProxyControl
+    extends bindings.ProxyMessageHandler
+    implements bindings.ProxyControl {
   _EchoServiceProxyControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) : super.fromEndpoint(endpoint);
 
   _EchoServiceProxyControl.fromHandle(
       core.MojoHandle handle) : super.fromHandle(handle);
 
   _EchoServiceProxyControl.unbound() : super.unbound();
 
   service_describer.ServiceDescription get serviceDescription =>
       new _EchoServiceServiceDescription();
 
   String get serviceName => EchoService.serviceName;
 
-  @override
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _echoServiceMethodEchoStringName:
         var r = EchoServiceEchoStringResponseParams.deserialize(
             message.payload);
         if (!message.header.hasRequestId) {
           proxyError("Expected a message with a valid request Id.");
           return;
         }
         Completer c = completerMap[message.header.requestId];
@@ skipping 36 matching lines @@
     }
   }
 
   @override
   String toString() {
     var superString = super.toString();
     return "_EchoServiceProxyControl($superString)";
   }
 }
 
-
-class EchoServiceProxy extends bindings.Proxy
-                              implements EchoService {
+class EchoServiceProxy
+    extends bindings.Proxy
+    implements EchoService {
   EchoServiceProxy.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint)
       : super(new _EchoServiceProxyControl.fromEndpoint(endpoint));
 
   EchoServiceProxy.fromHandle(core.MojoHandle handle)
       : super(new _EchoServiceProxyControl.fromHandle(handle));
 
   EchoServiceProxy.unbound()
       : super(new _EchoServiceProxyControl.unbound());
 
@@ skipping 43 matching lines @@
     if (!ctrl.isBound) {
       ctrl.proxyError("The Proxy is closed.");
       return;
     }
     var params = new _EchoServiceQuitParams();
     ctrl.sendMessage(params,
         _echoServiceMethodQuitName);
   }
 }
 
-
-class EchoServiceStub extends bindings.Stub {
+class _EchoServiceStubControl
+    extends bindings.StubMessageHandler
+    implements bindings.StubControl<EchoService> {
   EchoService _impl;
 
-  EchoServiceStub.fromEndpoint(
+  _EchoServiceStubControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [EchoService impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  EchoServiceStub.fromHandle(
+  _EchoServiceStubControl.fromHandle(
       core.MojoHandle handle, [EchoService impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  EchoServiceStub.unbound([this._impl]) : super.unbound();
-
-  static EchoServiceStub newFromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) {
-    assert(endpoint.setDescription("For EchoServiceStub"));
-    return new EchoServiceStub.fromEndpoint(endpoint);
-  }
+  _EchoServiceStubControl.unbound([this._impl]) : super.unbound();
 
 
   EchoServiceEchoStringResponseParams _echoServiceEchoStringResponseParamsFactory(String value) {
     var result = new EchoServiceEchoStringResponseParams();
     result.value = value;
     return result;
   }
   EchoServiceDelayedEchoStringResponseParams _echoServiceDelayedEchoStringResponseParamsFactory(String value) {
     var result = new EchoServiceDelayedEchoStringResponseParams();
     result.value = value;
@@ skipping 79 matching lines @@
   }
 
   @override
   void bind(core.MojoMessagePipeEndpoint endpoint) {
     super.bind(endpoint);
     if (!isOpen && (_impl != null)) {
       beginHandlingEvents();
     }
   }
 
+  @override
   String toString() {
     var superString = super.toString();
-    return "EchoServiceStub($superString)";
+    return "_EchoServiceStubControl($superString)";
   }
 
   int get version => 0;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _EchoServiceServiceDescription();
     }
     return _cachedServiceDescription;
   }
 }
 
+class EchoServiceStub
+    extends bindings.Stub<EchoService>
+    implements EchoService {
+  EchoServiceStub.fromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint, [EchoService impl])
+      : super(new _EchoServiceStubControl.fromEndpoint(endpoint, impl));
+
+  EchoServiceStub.fromHandle(
+      core.MojoHandle handle, [EchoService impl])
+      : super(new _EchoServiceStubControl.fromHandle(handle, impl));
+
+  EchoServiceStub.unbound([EchoService impl])
+      : super(new _EchoServiceStubControl.unbound(impl));
+
+  static EchoServiceStub newFromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint) {
+    assert(endpoint.setDescription("For EchoServiceStub"));
+    return new EchoServiceStub.fromEndpoint(endpoint);
+  }
+
+  static service_describer.ServiceDescription get serviceDescription =>
+      _EchoServiceStubControl.serviceDescription;
+
+
+  dynamic echoString(String value,[Function responseFactory = null]) {
+    return impl.echoString(value,responseFactory);
+  }
+  dynamic delayedEchoString(String value,int millis,[Function responseFactory = null]) {
+    return impl.delayedEchoString(value,millis,responseFactory);
+  }
+  void swap() {
+    return impl.swap();
+  }
+  void quit() {
+    return impl.quit();
+  }
+}
+
 
 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/+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==";
 
   // 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;
 }