diff options
5 files changed, 12 insertions, 13 deletions
diff --git a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java index 68b924c..e0df220 100644 --- a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java +++ b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java @@ -147,7 +147,7 @@ public abstract class NanoHTTPD { try { outputStream = finalAccept.getOutputStream(); TempFileManager tempFileManager = tempFileManagerFactory.create(); - ParsingHTTPSession session = new ParsingHTTPSession(tempFileManager, inputStream, outputStream); + HTTPSession session = new HTTPSession(tempFileManager, inputStream, outputStream); while (!finalAccept.isClosed()) { session.execute(); } @@ -227,7 +227,7 @@ public abstract class NanoHTTPD { * @param session The HTTP session * @return HTTP response, see class Response for details */ - public Response serve(HTTPSession session) { + public Response serve(IHTTPSession session) { Map<String, String> files = new HashMap<String, String>(); Method method = session.getMethod(); if (Method.PUT.equals(method) || Method.POST.equals(method)) { @@ -716,7 +716,7 @@ public abstract class NanoHTTPD { /** * Handles one session, i.e. parses the HTTP request and returns the response. */ - public interface HTTPSession { + public interface IHTTPSession { void execute() throws IOException; Map<String, String> getParms(); @@ -741,9 +741,8 @@ public abstract class NanoHTTPD { void parseBody(Map<String, String> files) throws IOException, ResponseException; } - protected class ParsingHTTPSession implements HTTPSession { - int BUFSIZE = 8192; - + protected class HTTPSession implements IHTTPSession { + public static final int BUFSIZE = 8192; private final TempFileManager tempFileManager; private final OutputStream outputStream; private InputStream inputStream; @@ -755,7 +754,7 @@ public abstract class NanoHTTPD { private Map<String, String> headers; private CookieHandler cookies; - public ParsingHTTPSession(TempFileManager tempFileManager, InputStream inputStream, OutputStream outputStream) { + public HTTPSession(TempFileManager tempFileManager, InputStream inputStream, OutputStream outputStream) { this.tempFileManager = tempFileManager; this.inputStream = inputStream; this.outputStream = outputStream; diff --git a/core/src/test/java/fi/iki/elonen/HttpServerTest.java b/core/src/test/java/fi/iki/elonen/HttpServerTest.java index c5bf664..996f083 100644 --- a/core/src/test/java/fi/iki/elonen/HttpServerTest.java +++ b/core/src/test/java/fi/iki/elonen/HttpServerTest.java @@ -54,7 +54,7 @@ public class HttpServerTest { protected ByteArrayOutputStream invokeServer(String request) { ByteArrayInputStream inputStream = new ByteArrayInputStream(request.getBytes()); ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - NanoHTTPD.ParsingHTTPSession session = testServer.createSession(tempFileManager, inputStream, outputStream); + NanoHTTPD.HTTPSession session = testServer.createSession(tempFileManager, inputStream, outputStream); try { session.execute(); } catch (IOException e) { @@ -106,8 +106,8 @@ public class HttpServerTest { super(8192); } - public ParsingHTTPSession createSession(TempFileManager tempFileManager, InputStream inputStream, OutputStream outputStream) { - return new ParsingHTTPSession(tempFileManager, inputStream, outputStream); + public HTTPSession createSession(TempFileManager tempFileManager, InputStream inputStream, OutputStream outputStream) { + return new HTTPSession(tempFileManager, inputStream, outputStream); } @Override diff --git a/core/src/test/java/fi/iki/elonen/integration/CookieIntegrationTest.java b/core/src/test/java/fi/iki/elonen/integration/CookieIntegrationTest.java index 8eb9b37..0d54b37 100644 --- a/core/src/test/java/fi/iki/elonen/integration/CookieIntegrationTest.java +++ b/core/src/test/java/fi/iki/elonen/integration/CookieIntegrationTest.java @@ -71,7 +71,7 @@ public class CookieIntegrationTest extends IntegrationTestBase<CookieIntegration super(8192); } - @Override public Response serve(HTTPSession session) { + @Override public Response serve(IHTTPSession session) { CookieHandler cookies = session.getCookies(); for (String cookieName : cookies) { cookiesReceived.add(new Cookie(cookieName, cookies.read(cookieName))); diff --git a/core/src/test/java/fi/iki/elonen/integration/PutStreamIntegrationTest.java b/core/src/test/java/fi/iki/elonen/integration/PutStreamIntegrationTest.java index 74c2acb..1e260b2 100644 --- a/core/src/test/java/fi/iki/elonen/integration/PutStreamIntegrationTest.java +++ b/core/src/test/java/fi/iki/elonen/integration/PutStreamIntegrationTest.java @@ -44,7 +44,7 @@ public class PutStreamIntegrationTest extends IntegrationTestBase<PutStreamInteg } @Override - public Response serve(HTTPSession session) { + public Response serve(IHTTPSession session) { Method method = session.getMethod(); Map<String, String> headers = session.getHeaders(); int contentLength = Integer.parseInt(headers.get("content-length")); diff --git a/webserver/src/main/java/fi/iki/elonen/SimpleWebServer.java b/webserver/src/main/java/fi/iki/elonen/SimpleWebServer.java index c05b891..79ed4b3 100644 --- a/webserver/src/main/java/fi/iki/elonen/SimpleWebServer.java +++ b/webserver/src/main/java/fi/iki/elonen/SimpleWebServer.java @@ -219,7 +219,7 @@ public class SimpleWebServer extends NanoHTTPD { return newUri; } - public Response serve(HTTPSession session) { + public Response serve(IHTTPSession session) { Map<String, String> header = session.getHeaders(); Map<String, String> parms = session.getParms(); String uri = session.getUri(); |