Dart: Refactor Stubs

mojo/dart/packages/_mojo_for_test_only/lib/sample/sample_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 sample_service_mojom;
 import 'dart:async';
 import 'dart:collection';
 import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
@@ skipping 1743 matching lines @@
       responseFactory(null);
 }
 
 abstract class Service {
   static const String serviceName = null;
   dynamic frobinate(Foo foo,ServiceBazOptions baz,Object port,[Function responseFactory = null]);
   void getPort(Object port);
   static const int kFavoriteBaz = 1;
 }
 
-
-class _ServiceProxyControl extends bindings.ProxyMessageHandler
-                                      implements bindings.ProxyControl {
+class _ServiceProxyControl
+    extends bindings.ProxyMessageHandler
+    implements bindings.ProxyControl {
   _ServiceProxyControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) : super.fromEndpoint(endpoint);
 
   _ServiceProxyControl.fromHandle(
       core.MojoHandle handle) : super.fromHandle(handle);
 
   _ServiceProxyControl.unbound() : super.unbound();
 
   service_describer.ServiceDescription get serviceDescription =>
       new _ServiceServiceDescription();
 
   String get serviceName => Service.serviceName;
 
-  @override
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _serviceMethodFrobinateName:
         var r = ServiceFrobinateResponseParams.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 "_ServiceProxyControl($superString)";
   }
 }
 
-
-class ServiceProxy extends bindings.Proxy
-                              implements Service {
+class ServiceProxy
+    extends bindings.Proxy
+    implements Service {
   ServiceProxy.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint)
       : super(new _ServiceProxyControl.fromEndpoint(endpoint));
 
   ServiceProxy.fromHandle(core.MojoHandle handle)
       : super(new _ServiceProxyControl.fromHandle(handle));
 
   ServiceProxy.unbound()
       : super(new _ServiceProxyControl.unbound());
 
@@ skipping 27 matching lines @@
       ctrl.proxyError("The Proxy is closed.");
       return;
     }
     var params = new _ServiceGetPortParams();
     params.port = port;
     ctrl.sendMessage(params,
         _serviceMethodGetPortName);
   }
 }
 
-
-class ServiceStub extends bindings.Stub {
+class _ServiceStubControl
+    extends bindings.StubMessageHandler
+    implements bindings.StubControl<Service> {
   Service _impl;
 
-  ServiceStub.fromEndpoint(
+  _ServiceStubControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [Service impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  ServiceStub.fromHandle(
+  _ServiceStubControl.fromHandle(
       core.MojoHandle handle, [Service impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  ServiceStub.unbound([this._impl]) : super.unbound();
-
-  static ServiceStub newFromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) {
-    assert(endpoint.setDescription("For ServiceStub"));
-    return new ServiceStub.fromEndpoint(endpoint);
-  }
+  _ServiceStubControl.unbound([this._impl]) : super.unbound();
 
 
   ServiceFrobinateResponseParams _serviceFrobinateResponseParamsFactory(int result) {
     var result = new ServiceFrobinateResponseParams();
     result.result = result;
     return result;
   }
 
   dynamic handleMessage(bindings.ServiceMessage message) {
     if (bindings.ControlMessageHandler.isControlMessage(message)) {
@@ skipping 51 matching lines @@
   }
 
   @override
   void bind(core.MojoMessagePipeEndpoint endpoint) {
     super.bind(endpoint);
     if (!isOpen && (_impl != null)) {
       beginHandlingEvents();
     }
   }
 
+  @override
   String toString() {
     var superString = super.toString();
-    return "ServiceStub($superString)";
+    return "_ServiceStubControl($superString)";
   }
 
   int get version => 0;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _ServiceServiceDescription();
     }
     return _cachedServiceDescription;
   }
 }
 
+class ServiceStub
+    extends bindings.Stub<Service>
+    implements Service {
+  ServiceStub.fromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint, [Service impl])
+      : super(new _ServiceStubControl.fromEndpoint(endpoint, impl));
+
+  ServiceStub.fromHandle(
+      core.MojoHandle handle, [Service impl])
+      : super(new _ServiceStubControl.fromHandle(handle, impl));
+
+  ServiceStub.unbound([Service impl])
+      : super(new _ServiceStubControl.unbound(impl));
+
+  static ServiceStub newFromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint) {
+    assert(endpoint.setDescription("For ServiceStub"));
+    return new ServiceStub.fromEndpoint(endpoint);
+  }
+
+  static service_describer.ServiceDescription get serviceDescription =>
+      _ServiceStubControl.serviceDescription;
+
+
+  dynamic frobinate(Foo foo,ServiceBazOptions baz,Object port,[Function responseFactory = null]) {
+    return impl.frobinate(foo,baz,port,responseFactory);
+  }
+  void getPort(Object port) {
+    return impl.getPort(port);
+  }
+}
+
 const int _portMethodPostMessageName = 0;
 
 class _PortServiceDescription implements service_describer.ServiceDescription {
   dynamic getTopLevelInterface([Function responseFactory]) =>
       responseFactory(null);
 
   dynamic getTypeDefinition(String typeKey, [Function responseFactory]) =>
       responseFactory(null);
 
   dynamic getAllTypeDefinitions([Function responseFactory]) =>
       responseFactory(null);
 }
 
 abstract class Port {
   static const String serviceName = null;
   void postMessage(String messageText, Object port);
 }
 
-
-class _PortProxyControl extends bindings.ProxyMessageHandler
-                                      implements bindings.ProxyControl {
+class _PortProxyControl
+    extends bindings.ProxyMessageHandler
+    implements bindings.ProxyControl {
   _PortProxyControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) : super.fromEndpoint(endpoint);
 
   _PortProxyControl.fromHandle(
       core.MojoHandle handle) : super.fromHandle(handle);
 
   _PortProxyControl.unbound() : super.unbound();
 
   service_describer.ServiceDescription get serviceDescription =>
       new _PortServiceDescription();
 
   String get serviceName => Port.serviceName;
 
-  @override
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       default:
         proxyError("Unexpected message type: ${message.header.type}");
         close(immediate: true);
         break;
     }
   }
 
   @override
   String toString() {
     var superString = super.toString();
     return "_PortProxyControl($superString)";
   }
 }
 
-
-class PortProxy extends bindings.Proxy
-                              implements Port {
+class PortProxy
+    extends bindings.Proxy
+    implements Port {
   PortProxy.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint)
       : super(new _PortProxyControl.fromEndpoint(endpoint));
 
   PortProxy.fromHandle(core.MojoHandle handle)
       : super(new _PortProxyControl.fromHandle(handle));
 
   PortProxy.unbound()
       : super(new _PortProxyControl.unbound());
 
@@ skipping 17 matching lines @@
       return;
     }
     var params = new _PortPostMessageParams();
     params.messageText = messageText;
     params.port = port;
     ctrl.sendMessage(params,
         _portMethodPostMessageName);
   }
 }
 
-
-class PortStub extends bindings.Stub {
+class _PortStubControl
+    extends bindings.StubMessageHandler
+    implements bindings.StubControl<Port> {
   Port _impl;
 
-  PortStub.fromEndpoint(
+  _PortStubControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [Port impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  PortStub.fromHandle(
+  _PortStubControl.fromHandle(
       core.MojoHandle handle, [Port impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  PortStub.unbound([this._impl]) : super.unbound();
-
-  static PortStub newFromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) {
-    assert(endpoint.setDescription("For PortStub"));
-    return new PortStub.fromEndpoint(endpoint);
-  }
+  _PortStubControl.unbound([this._impl]) : super.unbound();
 
 
 
   dynamic handleMessage(bindings.ServiceMessage message) {
     if (bindings.ControlMessageHandler.isControlMessage(message)) {
       return bindings.ControlMessageHandler.handleMessage(this,
                                                           0,
                                                           message);
     }
     if (_impl == null) {
@@ skipping 24 matching lines @@
   }
 
   @override
   void bind(core.MojoMessagePipeEndpoint endpoint) {
     super.bind(endpoint);
     if (!isOpen && (_impl != null)) {
       beginHandlingEvents();
     }
   }
 
+  @override
   String toString() {
     var superString = super.toString();
-    return "PortStub($superString)";
+    return "_PortStubControl($superString)";
   }
 
   int get version => 0;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _PortServiceDescription();
     }
     return _cachedServiceDescription;
   }
 }
 
+class PortStub
+    extends bindings.Stub<Port>
+    implements Port {
+  PortStub.fromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint, [Port impl])
+      : super(new _PortStubControl.fromEndpoint(endpoint, impl));
+
+  PortStub.fromHandle(
+      core.MojoHandle handle, [Port impl])
+      : super(new _PortStubControl.fromHandle(handle, impl));
+
+  PortStub.unbound([Port impl])
+      : super(new _PortStubControl.unbound(impl));
+
+  static PortStub newFromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint) {
+    assert(endpoint.setDescription("For PortStub"));
+    return new PortStub.fromEndpoint(endpoint);
+  }
+
+  static service_describer.ServiceDescription get serviceDescription =>
+      _PortStubControl.serviceDescription;
+
+
+  void postMessage(String messageText, Object port) {
+    return impl.postMessage(messageText, port);
+  }
+}
+
 
 mojom_types.RuntimeTypeInfo getRuntimeTypeInfo() => _runtimeTypeInfo ??
     _initRuntimeTypeInfo();
 
 Map<String, mojom_types.UserDefinedType> getAllMojomTypeDefinitions() {
   return getRuntimeTypeInfo().typeMap;
 }
 
 var _runtimeTypeInfo;
 mojom_types.RuntimeTypeInfo  _initRuntimeTypeInfo() {
@@ skipping 13 matching lines @@
           _runtimeTypeInfo.typeMap[s] = udt;
       });
 
   sample_import2_mojom.getAllMojomTypeDefinitions()
       .forEach((String s, mojom_types.UserDefinedType udt) {
           _runtimeTypeInfo.typeMap[s] = udt;
       });
 
   return _runtimeTypeInfo;
 }