checkstyle issues and imports reorganized
diff --git a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java
index 362346f..f797557 100644
--- a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java
+++ b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java
@@ -33,7 +33,20 @@
* #L%
*/
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.Closeable;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.io.PushbackInputStream;
+import java.io.RandomAccessFile;
+import java.io.UnsupportedEncodingException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.ServerSocket;
@@ -56,6 +69,8 @@
import java.util.Set;
import java.util.StringTokenizer;
import java.util.TimeZone;
+import java.util.logging.Level;
+import java.util.logging.Logger;
/**
* A simple, tiny, nicely embeddable HTTP server in Java
@@ -120,6 +135,12 @@
* Pseudo-Parameter to use to store the actual query string in the parameters map for later re-processing.
*/
private static final String QUERY_STRING_PARAMETER = "NanoHttpd.QUERY_STRING";
+
+ /**
+ * logger to log to.
+ */
+ private static Logger LOG = Logger.getLogger(NanoHTTPD.class.getName());
+
private final String hostname;
private final int myPort;
private ServerSocket myServerSocket;
@@ -156,24 +177,7 @@
try {
closeable.close();
} catch (IOException e) {
- }
- }
- }
-
- private static final void safeClose(Socket closeable) {
- if (closeable != null) {
- try {
- closeable.close();
- } catch (IOException e) {
- }
- }
- }
-
- private static final void safeClose(ServerSocket closeable) {
- if (closeable != null) {
- try {
- closeable.close();
- } catch (IOException e) {
+ LOG.log(Level.SEVERE, "Could not close",e);
}
}
}
@@ -212,7 +216,7 @@
// When the socket is closed by the client, we throw our own SocketException
// to break the "keep alive" loop above.
if (!(e instanceof SocketException && "NanoHttpd Shutdown".equals(e.getMessage()))) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, "Communication with the client broken", e);
}
} finally {
safeClose(outputStream);
@@ -223,6 +227,7 @@
}
});
} catch (IOException e) {
+ LOG.log(Level.SEVERE, "Communication with the client broken", e);
}
} while (!myServerSocket.isClosed());
}
@@ -243,7 +248,7 @@
myThread.join();
}
} catch (Exception e) {
- e.printStackTrace();
+ LOG.log(Level.SEVERE, "Could not stop all connections", e);
}
}
@@ -343,6 +348,7 @@
try {
decoded = URLDecoder.decode(str, "UTF8");
} catch (UnsupportedEncodingException ignored) {
+ LOG.log(Level.WARNING, "Encoding not supported, ignored", ignored);
}
return decoded;
}
@@ -526,6 +532,7 @@
try {
file.delete();
} catch (Exception ignored) {
+ LOG.log(Level.WARNING, "could not delete file ", ignored);
}
}
tempFiles.clear();
@@ -677,7 +684,7 @@
outputStream.flush();
safeClose(data);
} catch (IOException ioe) {
- // Couldn't write? No can do.
+ LOG.log(Level.SEVERE, "Could not send response to the client", ioe);
}
}
@@ -1203,7 +1210,7 @@
int count = 2;
while(files.containsKey(pname+count)) {
count++;
- };
+ }
files.put(pname+count, path);
}
value = disposition.get("filename");
diff --git a/markdown-plugin/src/main/java/fi/iki/elonen/MarkdownWebServerPlugin.java b/markdown-plugin/src/main/java/fi/iki/elonen/MarkdownWebServerPlugin.java
index 04cd829..a400cb4 100644
--- a/markdown-plugin/src/main/java/fi/iki/elonen/MarkdownWebServerPlugin.java
+++ b/markdown-plugin/src/main/java/fi/iki/elonen/MarkdownWebServerPlugin.java
@@ -33,14 +33,17 @@
* #L%
*/
-import org.pegdown.PegDownProcessor;
-
-import java.io.*;
-import java.util.Map;
-
import static fi.iki.elonen.NanoHTTPD.MIME_HTML;
import static fi.iki.elonen.NanoHTTPD.Response.Status.OK;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.Map;
+
+import org.pegdown.PegDownProcessor;
+
/**
* @author Paul S. Hawke ([email protected])
* On: 9/13/13 at 4:03 AM
diff --git a/samples/src/main/java/fi/iki/elonen/HelloServer.java b/samples/src/main/java/fi/iki/elonen/HelloServer.java
index a206408..0a212e0 100644
--- a/samples/src/main/java/fi/iki/elonen/HelloServer.java
+++ b/samples/src/main/java/fi/iki/elonen/HelloServer.java
@@ -34,37 +34,43 @@
*/
import java.util.Map;
+import java.util.logging.Logger;
/**
* An example of subclassing NanoHTTPD to make a custom HTTP server.
*/
public class HelloServer extends NanoHTTPD {
- public HelloServer() {
- super(8080);
- }
- @Override public Response serve(IHTTPSession session) {
- Method method = session.getMethod();
- String uri = session.getUri();
- System.out.println(method + " '" + uri + "' ");
+ /**
+ * logger to log to.
+ */
+ private static Logger LOG = Logger.getLogger(HelloServer.class.getName());
- String msg = "<html><body><h1>Hello server</h1>\n";
- Map<String, String> parms = session.getParms();
- if (parms.get("username") == null)
- msg +=
- "<form action='?' method='get'>\n" +
- " <p>Your name: <input type='text' name='username'></p>\n" +
- "</form>\n";
- else
- msg += "<p>Hello, " + parms.get("username") + "!</p>";
+ public HelloServer() {
+ super(8080);
+ }
- msg += "</body></html>\n";
+ @Override
+ public Response serve(IHTTPSession session) {
+ Method method = session.getMethod();
+ String uri = session.getUri();
+ LOG.info(method + " '" + uri + "' ");
- return new NanoHTTPD.Response(msg);
- }
+ String msg = "<html><body><h1>Hello server</h1>\n";
+ Map<String, String> parms = session.getParms();
+ if (parms.get("username") == null)
+ msg += "<form action='?' method='get'>\n"
+ + " <p>Your name: <input type='text' name='username'></p>\n"
+ + "</form>\n";
+ else
+ msg += "<p>Hello, " + parms.get("username") + "!</p>";
+ msg += "</body></html>\n";
- public static void main(String[] args) {
- ServerRunner.run(HelloServer.class);
- }
+ return new NanoHTTPD.Response(msg);
+ }
+
+ public static void main(String[] args) {
+ ServerRunner.run(HelloServer.class);
+ }
}
diff --git a/samples/src/main/java/fi/iki/elonen/TempFilesServer.java b/samples/src/main/java/fi/iki/elonen/TempFilesServer.java
index 3297833..6eba33e 100644
--- a/samples/src/main/java/fi/iki/elonen/TempFilesServer.java
+++ b/samples/src/main/java/fi/iki/elonen/TempFilesServer.java
@@ -33,11 +33,11 @@
* #L%
*/
-import fi.iki.elonen.debug.DebugServer;
-
import java.util.ArrayList;
import java.util.List;
+import fi.iki.elonen.debug.DebugServer;
+
/**
* @author Paul S. Hawke ([email protected])
* On: 3/9/13 at 12:47 AM
diff --git a/samples/src/main/java/fi/iki/elonen/debug/DebugServer.java b/samples/src/main/java/fi/iki/elonen/debug/DebugServer.java
index 85330fc..6988598 100644
--- a/samples/src/main/java/fi/iki/elonen/debug/DebugServer.java
+++ b/samples/src/main/java/fi/iki/elonen/debug/DebugServer.java
@@ -33,13 +33,13 @@
* #L%
*/
-import fi.iki.elonen.NanoHTTPD;
-import fi.iki.elonen.ServerRunner;
-
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import fi.iki.elonen.NanoHTTPD;
+import fi.iki.elonen.ServerRunner;
+
public class DebugServer extends NanoHTTPD {
public DebugServer() {
super(8080);
diff --git a/samples/src/site/site.xml b/samples/src/site/site.xml
index 4f03939..4270945 100644
--- a/samples/src/site/site.xml
+++ b/samples/src/site/site.xml
@@ -6,10 +6,10 @@
<version>1.3.0</version>
</skin>
<bannerLeft>
- <src>images/nanohttpd_logo.png</src>
+ <src>../images/nanohttpd_logo.png</src>
</bannerLeft>
<bannerRight>
- <src>images/nanohttpd_logo_text.png</src>
+ <src>../images/nanohttpd_logo_text.png</src>
</bannerRight>
<publishDate position="left" format="yyyy-MM-dd" />
<version position="right" />
diff --git a/webserver/src/main/java/fi/iki/elonen/InternalRewrite.java b/webserver/src/main/java/fi/iki/elonen/InternalRewrite.java
index e15965b..ad6b16e 100644
--- a/webserver/src/main/java/fi/iki/elonen/InternalRewrite.java
+++ b/webserver/src/main/java/fi/iki/elonen/InternalRewrite.java
@@ -35,7 +35,7 @@
import java.util.Map;
-import static fi.iki.elonen.NanoHTTPD.Response;
+import fi.iki.elonen.NanoHTTPD.Response;
/**
* @author Paul S. Hawke ([email protected])
diff --git a/websocket/src/main/java/fi/iki/elonen/WebSocket.java b/websocket/src/main/java/fi/iki/elonen/WebSocket.java
index 3da81d8..9b5979c 100644
--- a/websocket/src/main/java/fi/iki/elonen/WebSocket.java
+++ b/websocket/src/main/java/fi/iki/elonen/WebSocket.java
@@ -33,10 +33,6 @@
* #L%
*/
-import fi.iki.elonen.WebSocketFrame.CloseCode;
-import fi.iki.elonen.WebSocketFrame.CloseFrame;
-import fi.iki.elonen.WebSocketFrame.OpCode;
-
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -44,6 +40,10 @@
import java.util.LinkedList;
import java.util.List;
+import fi.iki.elonen.WebSocketFrame.CloseCode;
+import fi.iki.elonen.WebSocketFrame.CloseFrame;
+import fi.iki.elonen.WebSocketFrame.OpCode;
+
public abstract class WebSocket {
public static enum State {
UNCONNECTED, CONNECTING, OPEN, CLOSING, CLOSED
diff --git a/websocket/src/main/java/fi/iki/elonen/WebSocketException.java b/websocket/src/main/java/fi/iki/elonen/WebSocketException.java
index 5efe102..8e1f510 100644
--- a/websocket/src/main/java/fi/iki/elonen/WebSocketException.java
+++ b/websocket/src/main/java/fi/iki/elonen/WebSocketException.java
@@ -33,10 +33,10 @@
* #L%
*/
-import fi.iki.elonen.WebSocketFrame.CloseCode;
-
import java.io.IOException;
+import fi.iki.elonen.WebSocketFrame.CloseCode;
+
public class WebSocketException extends IOException {
private static final long serialVersionUID = -6179651370664878831L;
diff --git a/websocket/src/main/java/fi/iki/elonen/samples/echo/DebugWebSocket.java b/websocket/src/main/java/fi/iki/elonen/samples/echo/DebugWebSocket.java
index 2833be5..7d9fcfe 100644
--- a/websocket/src/main/java/fi/iki/elonen/samples/echo/DebugWebSocket.java
+++ b/websocket/src/main/java/fi/iki/elonen/samples/echo/DebugWebSocket.java
@@ -33,12 +33,12 @@
* #L%
*/
+import java.io.IOException;
+
import fi.iki.elonen.NanoHTTPD;
import fi.iki.elonen.WebSocket;
import fi.iki.elonen.WebSocketFrame;
-import java.io.IOException;
-
/**
* @author Paul S. Hawke ([email protected])
* On: 4/23/14 at 10:34 PM
diff --git a/websocket/src/main/java/fi/iki/elonen/samples/echo/EchoSocketSample.java b/websocket/src/main/java/fi/iki/elonen/samples/echo/EchoSocketSample.java
index c0b1f8e..8fed4c7 100644
--- a/websocket/src/main/java/fi/iki/elonen/samples/echo/EchoSocketSample.java
+++ b/websocket/src/main/java/fi/iki/elonen/samples/echo/EchoSocketSample.java
@@ -33,10 +33,10 @@
* #L%
*/
-import fi.iki.elonen.NanoWebSocketServer;
-
import java.io.IOException;
+import fi.iki.elonen.NanoWebSocketServer;
+
public class EchoSocketSample {
public static void main(String[] args) throws IOException {
final boolean debugMode = args.length >= 2 && args[1].toLowerCase().equals("-d");
