Dart: Refactors Proxies

mojo/dart/packages/mojo_services/lib/http_server/http_server.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 http_server_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;
 import 'package:mojo_services/http_server/http_request.mojom.dart' as http_request_mojom;
@@ skipping 444 matching lines @@
       responseFactory(null);
 }
 
 abstract class HttpServer {
   static const String serviceName = null;
   dynamic setHandler(String pattern,Object handler,[Function responseFactory = null]);
   dynamic getPort([Function responseFactory = null]);
 }
 
 
-class _HttpServerProxyImpl extends bindings.Proxy {
-  _HttpServerProxyImpl.fromEndpoint(
+class _HttpServerProxyControl extends bindings.ProxyMessageHandler
+                                      implements bindings.ProxyControl {
+  _HttpServerProxyControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) : super.fromEndpoint(endpoint);
 
-  _HttpServerProxyImpl.fromHandle(core.MojoHandle handle) :
-      super.fromHandle(handle);
+  _HttpServerProxyControl.fromHandle(
+      core.MojoHandle handle) : super.fromHandle(handle);
 
-  _HttpServerProxyImpl.unbound() : super.unbound();
-
-  static _HttpServerProxyImpl newFromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) {
-    assert(endpoint.setDescription("For _HttpServerProxyImpl"));
-    return new _HttpServerProxyImpl.fromEndpoint(endpoint);
-  }
+  _HttpServerProxyControl.unbound() : super.unbound();
 
   service_describer.ServiceDescription get serviceDescription =>
-    new _HttpServerServiceDescription();
+      new _HttpServerServiceDescription();
 
+  String get serviceName => HttpServer.serviceName;
+
+  @override
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _httpServerMethodSetHandlerName:
         var r = HttpServerSetHandlerResponseParams.deserialize(
             message.payload);
         if (!message.header.hasRequestId) {
           proxyError("Expected a message with a valid request Id.");
           return;
         }
         Completer c = completerMap[message.header.requestId];
@@ skipping 29 matching lines @@
         }
         c.complete(r);
         break;
       default:
         proxyError("Unexpected message type: ${message.header.type}");
         close(immediate: true);
         break;
     }
   }
 
+  @override
   String toString() {
     var superString = super.toString();
-    return "_HttpServerProxyImpl($superString)";
+    return "_HttpServerProxyControl($superString)";
   }
 }
 
 
-class _HttpServerProxyCalls implements HttpServer {
-  _HttpServerProxyImpl _proxyImpl;
+class HttpServerProxy extends bindings.Proxy
+                              implements HttpServer {
+  HttpServerProxy.fromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint)
+      : super(new _HttpServerProxyControl.fromEndpoint(endpoint));
 
-  _HttpServerProxyCalls(this._proxyImpl);
-    dynamic setHandler(String pattern,Object handler,[Function responseFactory = null]) {
-      var params = new _HttpServerSetHandlerParams();
-      params.pattern = pattern;
-      params.handler = handler;
-      return _proxyImpl.sendMessageWithRequestId(
-          params,
-          _httpServerMethodSetHandlerName,
-          -1,
-          bindings.MessageHeader.kMessageExpectsResponse);
-    }
-    dynamic getPort([Function responseFactory = null]) {
-      var params = new _HttpServerGetPortParams();
-      return _proxyImpl.sendMessageWithRequestId(
-          params,
-          _httpServerMethodGetPortName,
-          -1,
-          bindings.MessageHeader.kMessageExpectsResponse);
-    }
-}
+  HttpServerProxy.fromHandle(core.MojoHandle handle)
+      : super(new _HttpServerProxyControl.fromHandle(handle));
 
+  HttpServerProxy.unbound()
+      : super(new _HttpServerProxyControl.unbound());
 
-class HttpServerProxy implements bindings.ProxyBase {
-  final bindings.Proxy impl;
-  HttpServer ptr;
-
-  HttpServerProxy(_HttpServerProxyImpl proxyImpl) :
-      impl = proxyImpl,
-      ptr = new _HttpServerProxyCalls(proxyImpl);
-
-  HttpServerProxy.fromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) :
-      impl = new _HttpServerProxyImpl.fromEndpoint(endpoint) {
-    ptr = new _HttpServerProxyCalls(impl);
-  }
-
-  HttpServerProxy.fromHandle(core.MojoHandle handle) :
-      impl = new _HttpServerProxyImpl.fromHandle(handle) {
-    ptr = new _HttpServerProxyCalls(impl);
-  }
-
-  HttpServerProxy.unbound() :
-      impl = new _HttpServerProxyImpl.unbound() {
-    ptr = new _HttpServerProxyCalls(impl);
+  static HttpServerProxy newFromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint) {
+    assert(endpoint.setDescription("For HttpServerProxy"));
+    return new HttpServerProxy.fromEndpoint(endpoint);
   }
 
   factory HttpServerProxy.connectToService(
       bindings.ServiceConnector s, String url, [String serviceName]) {
     HttpServerProxy p = new HttpServerProxy.unbound();
     s.connectToService(url, p, serviceName);
     return p;
   }
 
-  static HttpServerProxy newFromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) {
-    assert(endpoint.setDescription("For HttpServerProxy"));
-    return new HttpServerProxy.fromEndpoint(endpoint);
+
+  dynamic setHandler(String pattern,Object handler,[Function responseFactory = null]) {
+    var params = new _HttpServerSetHandlerParams();
+    params.pattern = pattern;
+    params.handler = handler;
+    return ctrl.sendMessageWithRequestId(
+        params,
+        _httpServerMethodSetHandlerName,
+        -1,
+        bindings.MessageHeader.kMessageExpectsResponse);
   }
-
-  String get serviceName => HttpServer.serviceName;
-
-  Future close({bool immediate: false}) => impl.close(immediate: immediate);
-
-  Future responseOrError(Future f) => impl.responseOrError(f);
-
-  Future get errorFuture => impl.errorFuture;
-
-  int get version => impl.version;
-
-  Future<int> queryVersion() => impl.queryVersion();
-
-  void requireVersion(int requiredVersion) {
-    impl.requireVersion(requiredVersion);
-  }
-
-  String toString() {
-    return "HttpServerProxy($impl)";
+  dynamic getPort([Function responseFactory = null]) {
+    var params = new _HttpServerGetPortParams();
+    return ctrl.sendMessageWithRequestId(
+        params,
+        _httpServerMethodGetPortName,
+        -1,
+        bindings.MessageHeader.kMessageExpectsResponse);
   }
 }
 
 
 class HttpServerStub extends bindings.Stub {
   HttpServer _impl;
 
   HttpServerStub.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [HttpServer impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
@@ skipping 132 matching lines @@
   dynamic getAllTypeDefinitions([Function responseFactory]) =>
       responseFactory(null);
 }
 
 abstract class HttpHandler {
   static const String serviceName = null;
   dynamic handleRequest(http_request_mojom.HttpRequest request,[Function responseFactory = null]);
 }
 
 
-class _HttpHandlerProxyImpl extends bindings.Proxy {
-  _HttpHandlerProxyImpl.fromEndpoint(
+class _HttpHandlerProxyControl extends bindings.ProxyMessageHandler
+                                      implements bindings.ProxyControl {
+  _HttpHandlerProxyControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) : super.fromEndpoint(endpoint);
 
-  _HttpHandlerProxyImpl.fromHandle(core.MojoHandle handle) :
-      super.fromHandle(handle);
+  _HttpHandlerProxyControl.fromHandle(
+      core.MojoHandle handle) : super.fromHandle(handle);
 
-  _HttpHandlerProxyImpl.unbound() : super.unbound();
-
-  static _HttpHandlerProxyImpl newFromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) {
-    assert(endpoint.setDescription("For _HttpHandlerProxyImpl"));
-    return new _HttpHandlerProxyImpl.fromEndpoint(endpoint);
-  }
+  _HttpHandlerProxyControl.unbound() : super.unbound();
 
   service_describer.ServiceDescription get serviceDescription =>
-    new _HttpHandlerServiceDescription();
+      new _HttpHandlerServiceDescription();
 
+  String get serviceName => HttpHandler.serviceName;
+
+  @override
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _httpHandlerMethodHandleRequestName:
         var r = HttpHandlerHandleRequestResponseParams.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) {
           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);
         break;
       default:
         proxyError("Unexpected message type: ${message.header.type}");
         close(immediate: true);
         break;
     }
   }
 
+  @override
   String toString() {
     var superString = super.toString();
-    return "_HttpHandlerProxyImpl($superString)";
+    return "_HttpHandlerProxyControl($superString)";
   }
 }
 
 
-class _HttpHandlerProxyCalls implements HttpHandler {
-  _HttpHandlerProxyImpl _proxyImpl;
+class HttpHandlerProxy extends bindings.Proxy
+                              implements HttpHandler {
+  HttpHandlerProxy.fromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint)
+      : super(new _HttpHandlerProxyControl.fromEndpoint(endpoint));
 
-  _HttpHandlerProxyCalls(this._proxyImpl);
-    dynamic handleRequest(http_request_mojom.HttpRequest request,[Function responseFactory = null]) {
-      var params = new _HttpHandlerHandleRequestParams();
-      params.request = request;
-      return _proxyImpl.sendMessageWithRequestId(
-          params,
-          _httpHandlerMethodHandleRequestName,
-          -1,
-          bindings.MessageHeader.kMessageExpectsResponse);
-    }
-}
+  HttpHandlerProxy.fromHandle(core.MojoHandle handle)
+      : super(new _HttpHandlerProxyControl.fromHandle(handle));
 
+  HttpHandlerProxy.unbound()
+      : super(new _HttpHandlerProxyControl.unbound());
 
-class HttpHandlerProxy implements bindings.ProxyBase {
-  final bindings.Proxy impl;
-  HttpHandler ptr;
-
-  HttpHandlerProxy(_HttpHandlerProxyImpl proxyImpl) :
-      impl = proxyImpl,
-      ptr = new _HttpHandlerProxyCalls(proxyImpl);
-
-  HttpHandlerProxy.fromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) :
-      impl = new _HttpHandlerProxyImpl.fromEndpoint(endpoint) {
-    ptr = new _HttpHandlerProxyCalls(impl);
-  }
-
-  HttpHandlerProxy.fromHandle(core.MojoHandle handle) :
-      impl = new _HttpHandlerProxyImpl.fromHandle(handle) {
-    ptr = new _HttpHandlerProxyCalls(impl);
-  }
-
-  HttpHandlerProxy.unbound() :
-      impl = new _HttpHandlerProxyImpl.unbound() {
-    ptr = new _HttpHandlerProxyCalls(impl);
+  static HttpHandlerProxy newFromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint) {
+    assert(endpoint.setDescription("For HttpHandlerProxy"));
+    return new HttpHandlerProxy.fromEndpoint(endpoint);
   }
 
   factory HttpHandlerProxy.connectToService(
       bindings.ServiceConnector s, String url, [String serviceName]) {
     HttpHandlerProxy p = new HttpHandlerProxy.unbound();
     s.connectToService(url, p, serviceName);
     return p;
   }
 
-  static HttpHandlerProxy newFromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) {
-    assert(endpoint.setDescription("For HttpHandlerProxy"));
-    return new HttpHandlerProxy.fromEndpoint(endpoint);
-  }
 
-  String get serviceName => HttpHandler.serviceName;
-
-  Future close({bool immediate: false}) => impl.close(immediate: immediate);
-
-  Future responseOrError(Future f) => impl.responseOrError(f);
-
-  Future get errorFuture => impl.errorFuture;
-
-  int get version => impl.version;
-
-  Future<int> queryVersion() => impl.queryVersion();
-
-  void requireVersion(int requiredVersion) {
-    impl.requireVersion(requiredVersion);
-  }
-
-  String toString() {
-    return "HttpHandlerProxy($impl)";
+  dynamic handleRequest(http_request_mojom.HttpRequest request,[Function responseFactory = null]) {
+    var params = new _HttpHandlerHandleRequestParams();
+    params.request = request;
+    return ctrl.sendMessageWithRequestId(
+        params,
+        _httpHandlerMethodHandleRequestName,
+        -1,
+        bindings.MessageHeader.kMessageExpectsResponse);
   }
 }
 
 
 class HttpHandlerStub extends bindings.Stub {
   HttpHandler _impl;
 
   HttpHandlerStub.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [HttpHandler impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
@@ skipping 90 matching lines @@
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _HttpHandlerServiceDescription();
     }
     return _cachedServiceDescription;
   }
 }