diff --git a/src/main/java/lc/HTTPServer.java b/src/main/java/lc/HTTPServer.java index 79b194b..b7b300e 100644 --- a/src/main/java/lc/HTTPServer.java +++ b/src/main/java/lc/HTTPServer.java @@ -1395,9 +1395,11 @@ public class HTTPServer { /** * Returns the body in a String format */ - public String getJson(){ - java.util.Scanner s = new java.util.Scanner(body).useDelimiter("\\A"); - return s.hasNext() ? s.next() : ""; + public String getJson() { + try(final java.util.Scanner s = new java.util.Scanner(body).useDelimiter("\\A")) { + final String result = s.hasNext() ? s.next() : ""; + return result; + } } /** @@ -3034,29 +3036,27 @@ public class HTTPServer { w = name.length(); w += 2; // with room for added slash and space // note: we use apache's format, for consistent user experience - Formatter f = new Formatter(Locale.US); - f.format("%n" + - "Index of %s%n" + - "

Index of %s

%n" + - "
 Name%" + (w - 5) + "s Last modified      Size
", - path, path, ""); - if (path.length() > 1) // add parent link if not root path - f.format(" Parent Directory%" - + (w + 5) + "s-%n", getParentPath(path), ""); - for (File file : dir.listFiles()) { - try { - String name = file.getName() + (file.isDirectory() ? "/" : ""); - String size = file.isDirectory() ? "- " : toSizeApproxString(file.length()); - // properly url-encode the link - String link = new URI(null, path + name, null).toASCIIString(); - if (!file.isHidden() && !name.startsWith(".")) - f.format(" %s%-" + (w - name.length()) + - "s‎%td-%%n" + "Index of %s%n" + + "

Index of %s

%n" + "
 Name%" + (w - 5) + "s Last modified      Size
", path, + path, ""); + if (path.length() > 1) // add parent link if not root path + f.format(" Parent Directory%" + (w + 5) + "s-%n", getParentPath(path), ""); + for (File file : dir.listFiles()) { + try { + String name = file.getName() + (file.isDirectory() ? "/" : ""); + String size = file.isDirectory() ? "- " : toSizeApproxString(file.length()); + // properly url-encode the link + String link = new URI(null, path + name, null).toASCIIString(); + if (!file.isHidden() && !name.startsWith(".")) + f.format(" %s%-" + (w - name.length()) + "s‎%td-%"); + return f.toString(); } - f.format("
"); - return f.toString(); } /**