Remove the RequestHandler interface from the HTTP library

runtime/bin/http_impl.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 class _HttpHeaders implements HttpHeaders {
   _HttpHeaders() : _headers = new Map<String, List<String>>();
 
   List<String> operator[](String name) {
     name = name.toLowerCase();
     return _headers[name];
@@ skipping 776 matching lines @@
   HttpResponse _response;
 
   // Callbacks.
   Function onRequestReceived;
   Function onClosed;
   Function onError;
 }
 
 
 class _RequestHandlerRegistration {
-  _RequestHandlerRegistration(Function this._matcher, Object this._handler);
+  _RequestHandlerRegistration(Function this._matcher, Function this._handler);
   Function _matcher;
-  RequestHandler _handler;
-}
-
-
-class _RequestHandlerImpl implements RequestHandler {
-  _RequestHandlerImpl(Function this._handler);
-  void onRequest(HttpRequest request, HttpResponse response) =>
-    _handler(request, response);
   Function _handler;
 }
 
 
 // HTTP server waiting for socket connections. The connections are
 // managed by the server and as requests are received the request.
 class _HttpServer implements HttpServer {
   _HttpServer() : _connections = new Set<_HttpConnection>(),
                   _handlers = new List<_RequestHandlerRegistration>();
 
@@ skipping 14 matching lines @@
         if (_onError != null) _onError(e);
       };
       connection._connectionEstablished(socket);
       _connections.add(connection);
     }
     serverSocket.onConnection = onConnection;
     _server = serverSocket;
     _closeServer = false;
   }
 
-  addRequestHandler(bool matcher(String path), Object handler) {
-    if (handler is Function) {
-      handler = new _RequestHandlerImpl(handler);
-    }
+  addRequestHandler(bool matcher(String path),
+                    void handler(HttpRequest request, HttpResponse response)) {
     _handlers.add(new _RequestHandlerRegistration(matcher, handler));
   }
 
-  void set defaultRequestHandler(Object handler) {
+  void set defaultRequestHandler(
+      void handler(HttpRequest request, HttpResponse response)) {
     _defaultHandler = handler;
   }
 
   void close() {
     if (_server !== null && _closeServer) {
       _server.close();
     }
     _server = null;
     for (_HttpConnection connection in _connections) {
       connection._close();
     }
     _connections.clear();
   }
 
   int get port() {
     if (_server === null) {
       throw new HttpException("The HttpServer is not listening on a port.");
     }
     return _server.port;
   }
 
   void set onError(void callback(Exception e)) {
     _onError = callback;
   }
 
   void _handleRequest(HttpRequest request, HttpResponse response) {
     for (int i = 0; i < _handlers.length; i++) {
       if (_handlers[i]._matcher(request)) {
-        var handler = _handlers[i]._handler;
+        Function handler = _handlers[i]._handler;
         try {
-          handler.onRequest(request, response);
+          handler(request, response);
         } catch (var e) {

[Anders Johnsen, 2012/04/25 08:46:23]

We should consider doing something with the Stacktrace here.

[Søren Gjesse, 2012/04/25 08:54:41]

Yes, that is a general issue with error callbacks in dart:io.

           if (_onError != null) {
             _onError(e);
           }
         }
         return;
       }
     }
 
     if (_defaultHandler != null) {

[Anders Johnsen, 2012/04/25 08:46:23]

!==, as you wrote, we support taking classes using operator(), so != might be
overloaded.

[Søren Gjesse, 2012/04/25 08:54:41]

We only support functions now.

-      if (_defaultHandler is Function) {
-        _defaultHandler(request, response);
-      } else {
-        _defaultHandler.onRequest(request, response);
-      }
+      _defaultHandler(request, response);
     } else {
       response.statusCode = HttpStatus.NOT_FOUND;
       response.outputStream.close();
     }
   }
 
 
   ServerSocket _server;  // The server listen socket.
   bool _closeServer = false;
   Set<_HttpConnection> _connections;  // Set of currently connected clients.
@@ skipping 487 matching lines @@
     _activeSockets.remove(socketConn);
     sockets.addFirst(socketConn);
   }
 
   Function _onOpen;
   Map<String, Queue<_SocketConnection>> _openSockets;
   Set<_SocketConnection> _activeSockets;
   Timer _evictionTimer;
   bool _shutdown;  // Has this HTTP client been shutdown?
 }