Add logger to FileProvider / remove trash

Author: simonwep

src/express/Express.java

@@ -294,7 +294,6 @@ public void listen(ExpressListener onStart, int port) throws IOException {
           onStart.action();
 
       } catch (IOException e) {
-        // TODO: Handle errors
         e.printStackTrace();
       }
     }).start();

src/express/ExpressException.java

@@ -10,7 +10,6 @@ public class ExpressException extends RuntimeException {
    * Constructs a new exception with {@code null} as its detail message.
    */
   public ExpressException() {
-    super();
   }
 
   /**

src/express/http/request/RequestUtils.java

@@ -8,7 +8,9 @@
 import java.util.HashMap;
 import java.util.List;
 
-class RequestUtils {
+final class RequestUtils {
+
+  private RequestUtils() {}
 
   /**
    * Extract the cookies from the 'Cookie' header.
@@ -20,7 +22,7 @@ static HashMap<String, Cookie> parseCookies(Headers headers) {
     HashMap<String, Cookie> cookieList = new HashMap<>();
     List<String> headerCookies = headers.get("Cookie");
 
-    if (headerCookies == null || headerCookies.size() == 0) {
+    if (headerCookies == null || headerCookies.isEmpty()) {
       return cookieList;
     }
 

src/express/middleware/FileProvider.java

@@ -12,13 +12,17 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Date;
+import java.util.Optional;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * @author Simon Reinisch
  * An middleware to provide access to static server-files.
  */
 final class FileProvider implements HttpRequest {
 
+  private final Logger LOGGER;
   private FileProviderOptions OPTIONS;
   private String ROOT;
 
@@ -30,6 +34,7 @@ final class FileProvider implements HttpRequest {
 
     this.ROOT = rootDir.getAbsolutePath();
     this.OPTIONS = options;
+    this.LOGGER = Logger.getLogger(this.getClass().getSimpleName());
   }
 
   @Override
@@ -49,9 +54,13 @@ public void handle(Request req, Response res) {
       String name = reqFile.getFileName().toString();
 
       try {
-        reqFile = Files.walk(reqFile.getParent()).filter(sub -> getBaseName(sub).equals(name)).findFirst().get();
+        Optional<Path> founded = Files.walk(reqFile.getParent()).filter(sub -> getBaseName(sub).equals(name)).findFirst();
+
+        if (founded.isPresent())
+          reqFile = founded.get();
+
       } catch (IOException e) {
-        // TODO: Handle error
+        this.LOGGER.log(Level.WARNING, "Cannot walg file tree.", e);
       }
     }
 
@@ -93,11 +102,14 @@ private void finish(Path file, Request req, Response res) {
       OPTIONS.getHandler().handle(req, res);
 
     try {
+
       // Apply header
       if (OPTIONS.isLastModified())
         res.setHeader("Last-Modified", Utils.getGMTDate(new Date(Files.getLastModifiedTime(file).toMillis())));
     } catch (IOException e) {
-      // TODO: Handle error
+      res.sendStatus(Status._500);
+      this.LOGGER.log(Level.WARNING, "Cannot read LastModifiedTime from file " + file.toString(), e);
+      return;
     }
 
     res.setHeader("Cache-Control", String.valueOf(OPTIONS.getMaxAge()));
@@ -109,4 +121,11 @@ private String getBaseName(Path path) {
     int index = name.lastIndexOf('.');
     return index == -1 ? name : name.substring(0, index);
   }
+
+  /**
+   * @return The logger from this FileProvider instance.
+   */
+  public Logger getLogger() {
+    return LOGGER;
+  }
 }