Dart: Refactor Stubs

mojo/dart/packages/_mojo_for_test_only/lib/mojo/examples/echo.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_mojom;
 import 'dart:async';
 import 'dart:collection';
 import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
@@ skipping 161 matching lines @@
 
   dynamic getAllTypeDefinitions([Function responseFactory]) =>
     responseFactory(getAllMojomTypeDefinitions());
 }
 
 abstract class Echo {
   static const String serviceName = "mojo::examples::Echo";
   dynamic echoString(String value,[Function responseFactory = null]);
 }
 
-
-class _EchoProxyControl extends bindings.ProxyMessageHandler
-                                      implements bindings.ProxyControl {
+class _EchoProxyControl
+    extends bindings.ProxyMessageHandler
+    implements bindings.ProxyControl {
   _EchoProxyControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) : super.fromEndpoint(endpoint);
 
   _EchoProxyControl.fromHandle(
       core.MojoHandle handle) : super.fromHandle(handle);
 
   _EchoProxyControl.unbound() : super.unbound();
 
   service_describer.ServiceDescription get serviceDescription =>
       new _EchoServiceDescription();
 
   String get serviceName => Echo.serviceName;
 
-  @override
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _echoMethodEchoStringName:
         var r = EchoEchoStringResponseParams.deserialize(
             message.payload);
         if (!message.header.hasRequestId) {
           proxyError("Expected a message with a valid request Id.");
           return;
         }
         Completer c = completerMap[message.header.requestId];
@@ skipping 16 matching lines @@
     }
   }
 
   @override
   String toString() {
     var superString = super.toString();
     return "_EchoProxyControl($superString)";
   }
 }
 
-
-class EchoProxy extends bindings.Proxy
-                              implements Echo {
+class EchoProxy
+    extends bindings.Proxy
+    implements Echo {
   EchoProxy.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint)
       : super(new _EchoProxyControl.fromEndpoint(endpoint));
 
   EchoProxy.fromHandle(core.MojoHandle handle)
       : super(new _EchoProxyControl.fromHandle(handle));
 
   EchoProxy.unbound()
       : super(new _EchoProxyControl.unbound());
 
@@ skipping 15 matching lines @@
     var params = new _EchoEchoStringParams();
     params.value = value;
     return ctrl.sendMessageWithRequestId(
         params,
         _echoMethodEchoStringName,
         -1,
         bindings.MessageHeader.kMessageExpectsResponse);
   }
 }
 
-
-class EchoStub extends bindings.Stub {
+class _EchoStubControl
+    extends bindings.StubMessageHandler
+    implements bindings.StubControl<Echo> {
   Echo _impl;
 
-  EchoStub.fromEndpoint(
+  _EchoStubControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [Echo impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  EchoStub.fromHandle(
+  _EchoStubControl.fromHandle(
       core.MojoHandle handle, [Echo impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  EchoStub.unbound([this._impl]) : super.unbound();
-
-  static EchoStub newFromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) {
-    assert(endpoint.setDescription("For EchoStub"));
-    return new EchoStub.fromEndpoint(endpoint);
-  }
+  _EchoStubControl.unbound([this._impl]) : super.unbound();
 
 
   EchoEchoStringResponseParams _echoEchoStringResponseParamsFactory(String value) {
     var result = new EchoEchoStringResponseParams();
     result.value = value;
     return result;
   }
 
   dynamic handleMessage(bindings.ServiceMessage message) {
     if (bindings.ControlMessageHandler.isControlMessage(message)) {
@@ skipping 46 matching lines @@
   }
 
   @override
   void bind(core.MojoMessagePipeEndpoint endpoint) {
     super.bind(endpoint);
     if (!isOpen && (_impl != null)) {
       beginHandlingEvents();
     }
   }
 
+  @override
   String toString() {
     var superString = super.toString();
-    return "EchoStub($superString)";
+    return "_EchoStubControl($superString)";
   }
 
   int get version => 0;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _EchoServiceDescription();
     }
     return _cachedServiceDescription;
   }
 }
 
+class EchoStub
+    extends bindings.Stub<Echo>
+    implements Echo {
+  EchoStub.fromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint, [Echo impl])
+      : super(new _EchoStubControl.fromEndpoint(endpoint, impl));
+
+  EchoStub.fromHandle(
+      core.MojoHandle handle, [Echo impl])
+      : super(new _EchoStubControl.fromHandle(handle, impl));
+
+  EchoStub.unbound([Echo impl])
+      : super(new _EchoStubControl.unbound(impl));
+
+  static EchoStub newFromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint) {
+    assert(endpoint.setDescription("For EchoStub"));
+    return new EchoStub.fromEndpoint(endpoint);
+  }
+
+  static service_describer.ServiceDescription get serviceDescription =>
+      _EchoStubControl.serviceDescription;
+
+
+  dynamic echoString(String value,[Function responseFactory = null]) {
+    return impl.echoString(value,responseFactory);
+  }
+}
+
 
 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/5JggAABKN0BpdHFLZD4jEDMAeXLALEIEOfmZ+VbWaVWJOYW5KQWW1m5JmfkY1OvDMTSQBwSGeAa7+0aaQXSqAfTpwfThmG/Aw77STGPEaqfGUm/BpRWgNIBjBA6A0ozoNkPC4cZUHoBlP4PBRsYsAN0dytgCWd2JHFhIOYG4uDUorLM5FS/xNxUosKbB4hZgBjGlwJiIah6LMGCEc6cQMwFxC5AbAPE+qXFRfo5+cmJOfrp+fnpOan6Gfm5qfpVRYn6ICP1i4uS9WHG6qcCjQUTeiC5XGLci24/jM8DDS9c4Ycebxeg9AMm7PEGAwZofFCcYROHASFoeIDcG1xSlJmXjj3cQGqYqBhu6OkD5r8bjMT7CwQscPgLli4Q/tItSi0sTS0uwe4/GKCW/9Dj0wFHOXODgThAbDxr4NDPC8SsQFyWmFOaiiN+RansfwakNI4eHhJIbmNEUk/rdCENLXtQ0kVxQX5ecepousCRLjQGQboABAAA///YBJ9/yAcAAA==";
 
   // 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;
 }