AdHocHttpServer fixed

Author: UMTti

tmc-plugin/src/fi/helsinki/cs/tmc/testing/AdHocHttpServer.java

@@ -1,84 +1,81 @@
 package fi.helsinki.cs.tmc.testing;
 
 import java.io.IOException;
-import java.io.InterruptedIOException;
 import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.SocketException;
 import java.util.concurrent.Semaphore;
 import org.apache.http.ConnectionClosedException;
 import org.apache.http.HttpResponseInterceptor;
-import org.apache.http.impl.DefaultConnectionReuseStrategy;
-import org.apache.http.impl.DefaultHttpResponseFactory;
-import org.apache.http.impl.DefaultHttpServerConnection;
-import org.apache.http.params.SyncBasicHttpParams;
+import org.apache.http.impl.DefaultBHttpServerConnection;
 import org.apache.http.protocol.BasicHttpContext;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.protocol.HttpProcessor;
 import org.apache.http.protocol.HttpRequestHandler;
-import org.apache.http.protocol.HttpRequestHandlerRegistry;
-import org.apache.http.protocol.HttpRequestHandlerResolver;
+import org.apache.http.protocol.HttpRequestHandlerMapper;
 import org.apache.http.protocol.HttpService;
 import org.apache.http.protocol.ImmutableHttpProcessor;
 import org.apache.http.protocol.ResponseConnControl;
 import org.apache.http.protocol.ResponseContent;
 import org.apache.http.protocol.ResponseDate;
 import org.apache.http.protocol.ResponseServer;
+import org.apache.http.protocol.UriHttpRequestHandlerMapper;
 import org.openide.util.Exceptions;
 
-/**
- * A HTTP server running on a random port in a single background thread.
- * 
- * An exception in a request handler will cause the server to shut down.
- * The exception will be propagated when {@link #stop()} is called.
- */
 public class AdHocHttpServer {
-    private HttpRequestHandlerResolver handlers;
-    
+
+    /**
+     * A HTTP server running on a random port in a single background thread.
+     *
+     * An exception in a request handler will cause the server to shut down. The
+     * exception will be propagated when {@link #stop()} is called.
+     */
+    private HttpRequestHandlerMapper handlers;
+
     private ServerSocket serverSocket;
     private HttpService httpService;
     private Thread thread;
-    
+
     private Exception inThreadException; // Set by thread, read in stop()
     private Semaphore requestCounter = new Semaphore(0);
-    
+
     private volatile boolean debugEnabled = false;
 
     public AdHocHttpServer() {
-        this.handlers = new HttpRequestHandlerRegistry();
+        this.handlers = new UriHttpRequestHandlerMapper();
     }
-    
+
     public void enableDebug() {
         debugEnabled = true;
     }
-    
+
     public void setHandler(HttpRequestHandler handler) {
-        HttpRequestHandlerRegistry registry = new HttpRequestHandlerRegistry();
+        UriHttpRequestHandlerMapper registry = new UriHttpRequestHandlerMapper();
         registry.register("*", handler);
         this.handlers = registry;
     }
-    
+
     public boolean isStarted() {
         return thread != null;
     }
-    
+
     public int getPort() {
         if (!isStarted()) {
             throw new IllegalStateException("Server must be started first");
         }
         return serverSocket.getLocalPort();
     }
-    
+
     public String getBaseUrl() {
         return "http://localhost:" + getPort();
     }
-    
+
     public synchronized void start() throws IOException {
         if (isStarted()) {
             throw new IllegalStateException("Already started");
         }
-        
+
         setupServerSocket();
         setupHttpClientIncantations();
         startThread();
@@ -91,22 +88,18 @@ private void setupServerSocket() throws IOException {
         serverSocket.setReceiveBufferSize(64);
         serverSocket.bind(addr);
     }
-    
+
     private void setupHttpClientIncantations() {
-        HttpProcessor proc = new ImmutableHttpProcessor(new HttpResponseInterceptor[] {
+        HttpProcessor proc = new ImmutableHttpProcessor(new HttpResponseInterceptor[]{
             new ResponseDate(),
             new ResponseServer(),
             new ResponseContent(),
             new ResponseConnControl()
         });
-        
+
         httpService = new HttpService(
                 proc,
-                new DefaultConnectionReuseStrategy(),
-                new DefaultHttpResponseFactory(),
-                handlers,
-                new SyncBasicHttpParams()
-                );
+                handlers);
     }
 
     private void startThread() {
@@ -153,8 +146,8 @@ public void run() {
                     }
 
                     debug("Got connection");
-                    DefaultHttpServerConnection conn = new DefaultHttpServerConnection();
-                    conn.bind(socket, httpService.getParams());
+                    DefaultBHttpServerConnection conn = new DefaultBHttpServerConnection(5000);
+                    conn.bind(socket);
                     HttpContext ctx = new BasicHttpContext(null);
                     while (!Thread.currentThread().isInterrupted() && conn.isOpen()) {
                         httpService.handleRequest(conn, ctx);
@@ -163,9 +156,6 @@ public void run() {
                     debug("Connection processed");
                 } catch (ConnectionClosedException ex) {
                     // No problem I think
-                } catch (InterruptedIOException ex) {
-                    debug("InterruptedIOException: " + ex);
-                    break;
                 } catch (Exception ex) {
                     inThreadException = ex;
                     debug("Exception: " + ex);