aboutsummaryrefslogtreecommitdiff
path: root/samples
diff options
context:
space:
mode:
authorPaul Hawke <paul.hawke@gmail.com>2013-12-12 06:06:25 -0600
committerPaul Hawke <paul.hawke@gmail.com>2013-12-12 06:06:25 -0600
commitef3be58ec24d3e155c8036f8806dba7172f61d0c (patch)
treee829db9643634d8320e5cbb3282ac2197759bbbe /samples
parent68394ef81a80928d25e584475be59a2e937a5ae0 (diff)
downloadnanohttpd-ef3be58ec24d3e155c8036f8806dba7172f61d0c.tar.gz
Tests and documentation cleanup.
Diffstat (limited to 'samples')
-rw-r--r--samples/src/main/java/fi/iki/elonen/TempFilesServer.java2
-rw-r--r--samples/src/main/java/fi/iki/elonen/debug/DebugServer.java (renamed from samples/src/main/java/fi/iki/elonen/DebugServer.java)35
2 files changed, 25 insertions, 12 deletions
diff --git a/samples/src/main/java/fi/iki/elonen/TempFilesServer.java b/samples/src/main/java/fi/iki/elonen/TempFilesServer.java
index 84eb871..fb96911 100644
--- a/samples/src/main/java/fi/iki/elonen/TempFilesServer.java
+++ b/samples/src/main/java/fi/iki/elonen/TempFilesServer.java
@@ -1,5 +1,7 @@
package fi.iki.elonen;
+import fi.iki.elonen.debug.DebugServer;
+
import java.util.ArrayList;
import java.util.List;
diff --git a/samples/src/main/java/fi/iki/elonen/DebugServer.java b/samples/src/main/java/fi/iki/elonen/debug/DebugServer.java
index ae3fff1..1c83876 100644
--- a/samples/src/main/java/fi/iki/elonen/DebugServer.java
+++ b/samples/src/main/java/fi/iki/elonen/debug/DebugServer.java
@@ -1,7 +1,10 @@
-package fi.iki.elonen;
+package fi.iki.elonen.debug;
+
+import fi.iki.elonen.NanoHTTPD;
+import fi.iki.elonen.ServerRunner;
-import java.io.IOException;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
public class DebugServer extends NanoHTTPD {
@@ -14,32 +17,39 @@ public class DebugServer extends NanoHTTPD {
}
@Override public Response serve(IHTTPSession session) {
+ Map<String, List<String>> decodedQueryParameters =
+ decodeParameters(session.getQueryParameterString());
+
StringBuilder sb = new StringBuilder();
sb.append("<html>");
sb.append("<head><title>Debug Server</title></head>");
sb.append("<body>");
sb.append("<h1>Debug Server</h1>");
- sb.append("<p><blockquote><b>URI</b> = ").append(String.valueOf(session.getUri())).append("<br />");
+ sb.append("<p><blockquote><b>URI</b> = ").append(
+ String.valueOf(session.getUri())).append("<br />");
- sb.append("<b>Method</b> = ").append(String.valueOf(session.getMethod())).append("</blockquote></p>");
+ sb.append("<b>Method</b> = ").append(
+ String.valueOf(session.getMethod())).append("</blockquote></p>");
- sb.append("<h3>Headers</h3><p><blockquote>").append(toString(session.getHeaders())).append("</blockquote></p>");
+ sb.append("<h3>Headers</h3><p><blockquote>").
+ append(toString(session.getHeaders())).append("</blockquote></p>");
- sb.append("<h3>Parms</h3><p><blockquote>").append(toString(session.getParms())).append("</blockquote></p>");
+ sb.append("<h3>Parms</h3><p><blockquote>").
+ append(toString(session.getParms())).append("</blockquote></p>");
sb.append("<h3>Parms (multi values?)</h3><p><blockquote>").
- append(toString(decodeParameters(session.getQueryParameterString()))).append("</blockquote></p>");
+ append(toString(decodedQueryParameters)).append("</blockquote></p>");
try {
Map<String, String> files = new HashMap<String, String>();
session.parseBody(files);
- sb.append("<h3>Files</h3><p><blockquote>").append(toString(files)).append("</blockquote></p>");
- } catch (IOException e) {
- e.printStackTrace();
- } catch (ResponseException e) {
+ sb.append("<h3>Files</h3><p><blockquote>").
+ append(toString(files)).append("</blockquote></p>");
+ } catch (Exception e) {
e.printStackTrace();
}
+
sb.append("</body>");
sb.append("</html>");
return new Response(sb.toString());
@@ -63,6 +73,7 @@ public class DebugServer extends NanoHTTPD {
}
private void listItem(StringBuilder sb, Map.Entry entry) {
- sb.append("<li><code><b>").append(entry.getKey()).append("</b> = ").append(entry.getValue()).append("</code></li>");
+ sb.append("<li><code><b>").append(entry.getKey()).
+ append("</b> = ").append(entry.getValue()).append("</code></li>");
}
}