more libcore removal

5 files changed, 19 insertions, 26 deletions

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
index dd38e5e..bfcbab6 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/WebSocketImpl.java
@@ -110,16 +110,16 @@ public class WebSocketImpl implements WebSocket {
     public WebSocketImpl(AsyncHttpServerRequest request, AsyncHttpServerResponse response) {
         this(request.getSocket());
         
-        String key = request.getHeaders().getHeaders().get("Sec-WebSocket-Key");
+        String key = request.getHeaders().get("Sec-WebSocket-Key");
         String concat = key + MAGIC;
         String sha1 = SHA1(concat);
-        String origin = request.getHeaders().getHeaders().get("Origin");
+        String origin = request.getHeaders().get("Origin");
         
         response.responseCode(101);
         response.getHeaders().getHeaders().set("Upgrade", "WebSocket");
         response.getHeaders().getHeaders().set("Connection", "Upgrade");
         response.getHeaders().getHeaders().set("Sec-WebSocket-Accept", sha1);
-        String protocol = request.getHeaders().getHeaders().get("Sec-WebSocket-Protocol");
+        String protocol = request.getHeaders().get("Sec-WebSocket-Protocol");
         // match the protocol (sanity checking and enforcement is done in the caller)
         if (!TextUtils.isEmpty(protocol))
             response.getHeaders().getHeaders().set("Sec-WebSocket-Protocol", protocol);
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
index b1b393d..b5d69e6 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
@@ -79,7 +79,7 @@ public class AsyncHttpServer {
 
                 @Override
                 protected void onHeadersReceived() {
-                    RawHeaders headers = getRawHeaders();
+                    RawHeaders headers = getHeaders();
 
                     // should the negotiation of 100 continue be here, or in the request impl?
                     // probably here, so AsyncResponse can negotiate a 100 continue.
@@ -173,7 +173,7 @@ public class AsyncHttpServer {
                 
                 private void handleOnCompleted() {
                     if (requestComplete && responseComplete) {
-                        if (HttpUtil.isKeepAlive(getHeaders().getHeaders())) {
+                        if (HttpUtil.isKeepAlive(getHeaders())) {
                             onAccepted(socket);
                         }
                         else {
@@ -285,7 +285,7 @@ public class AsyncHttpServer {
     }
 
     public static interface WebSocketRequestCallback {
-        public void onConnected(WebSocket webSocket, RequestHeaders headers);
+        public void onConnected(WebSocket webSocket, RawHeaders headers);
     }
 
     public void websocket(String regex, final WebSocketRequestCallback callback) {
@@ -297,7 +297,7 @@ public class AsyncHttpServer {
             @Override
             public void onRequest(final AsyncHttpServerRequest request, final AsyncHttpServerResponse response) {
                 boolean hasUpgrade = false;
-                String connection = request.getHeaders().getHeaders().get("Connection");
+                String connection = request.getHeaders().get("Connection");
                 if (connection != null) {
                     String[] connections = connection.split(",");
                     for (String c: connections) {
@@ -307,12 +307,12 @@ public class AsyncHttpServer {
                         }
                     }
                 }
-                if (!"websocket".equalsIgnoreCase(request.getHeaders().getHeaders().get("Upgrade")) || !hasUpgrade) {
+                if (!"websocket".equalsIgnoreCase(request.getHeaders().get("Upgrade")) || !hasUpgrade) {
                     response.responseCode(404);
                     response.end();
                     return;
                 }
-                String peerProtocol = request.getHeaders().getHeaders().get("Sec-WebSocket-Protocol");
+                String peerProtocol = request.getHeaders().get("Sec-WebSocket-Protocol");
                 if (!TextUtils.equals(protocol, peerProtocol)) {
                     response.responseCode(404);
                     response.end();
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequest.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequest.java
index be7d888..9af204e 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequest.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequest.java
@@ -2,14 +2,14 @@ package com.koushikdutta.async.http.server;
 
 import com.koushikdutta.async.AsyncSocket;
 import com.koushikdutta.async.DataEmitter;
-import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
 import com.koushikdutta.async.http.Multimap;
-import com.koushikdutta.async.http.libcore.RequestHeaders;
+import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
+import com.koushikdutta.async.http.libcore.RawHeaders;
 
 import java.util.regex.Matcher;
 
 public interface AsyncHttpServerRequest extends DataEmitter {
-    public RequestHeaders getHeaders();
+    public RawHeaders getHeaders();
     public Matcher getMatcher();
     public AsyncHttpRequestBody getBody();
     public AsyncSocket getSocket();
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java
index c2e2c13..3e82bd3 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRequestImpl.java
@@ -1,7 +1,5 @@
 package com.koushikdutta.async.http.server;
 
-import java.util.regex.Matcher;
-
 import com.koushikdutta.async.AsyncSocket;
 import com.koushikdutta.async.DataEmitter;
 import com.koushikdutta.async.FilteredDataEmitter;
@@ -9,10 +7,11 @@ import com.koushikdutta.async.LineEmitter;
 import com.koushikdutta.async.LineEmitter.StringCallback;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.callback.DataCallback;
-import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
 import com.koushikdutta.async.http.HttpUtil;
+import com.koushikdutta.async.http.body.AsyncHttpRequestBody;
 import com.koushikdutta.async.http.libcore.RawHeaders;
-import com.koushikdutta.async.http.libcore.RequestHeaders;
+
+import java.util.regex.Matcher;
 
 public abstract class AsyncHttpServerRequestImpl extends FilteredDataEmitter implements AsyncHttpServerRequest, CompletedCallback {
     private RawHeaders mRawHeaders = new RawHeaders();
@@ -68,7 +67,6 @@ public abstract class AsyncHttpServerRequestImpl extends FilteredDataEmitter imp
                             mBody = new UnknownRequestBody(mRawHeaders.get("Content-Type"));
                     }
                     mBody.parse(emitter, mReporter);
-                    mHeaders = new RequestHeaders(null, mRawHeaders);
                     onHeadersReceived();
                 }
             }
@@ -78,10 +76,6 @@ public abstract class AsyncHttpServerRequestImpl extends FilteredDataEmitter imp
         }
     };
 
-    RawHeaders getRawHeaders() {
-        return mRawHeaders;
-    }
-
     String method;
     @Override
     public String getMethod() {
@@ -101,10 +95,9 @@ public abstract class AsyncHttpServerRequestImpl extends FilteredDataEmitter imp
         return mSocket;
     }
 
-    private RequestHeaders mHeaders;
     @Override
-    public RequestHeaders getHeaders() {
-        return mHeaders;
+    public RawHeaders getHeaders() {
+        return mRawHeaders;
     }
 
     @Override
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
index d1cb952..08d3af9 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java
@@ -45,7 +45,7 @@ public class AsyncHttpServerResponseImpl implements AsyncHttpServerResponse {
     AsyncHttpServerResponseImpl(AsyncSocket socket, AsyncHttpServerRequestImpl req) {
         mSocket = socket;
         mRequest = req;
-        if (HttpUtil.isKeepAlive(req.getHeaders().getHeaders()))
+        if (HttpUtil.isKeepAlive(req.getHeaders()))
             mRawHeaders.set("Connection", "Keep-Alive");
     }
 
@@ -204,7 +204,7 @@ public class AsyncHttpServerResponseImpl implements AsyncHttpServerResponse {
         long start = 0;
         long end = totalLength - 1;
 
-        String range = mRequest.getHeaders().getHeaders().get("Range");
+        String range = mRequest.getHeaders().get("Range");
         if (range != null) {
             String[] parts = range.split("=");
             if (parts.length != 2 || !"bytes".equals(parts[0])) {