NPM/numass-framework
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Storage servlet update

Browse Source
This commit is contained in:
Alexander Nozik 2016-10-02 12:45:56 +03:00
parent 0490b8c8d6
commit d6ef1d994c
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
numass-storage/numass-server/src/main/java/inr/numass/server/NumassRootHandler.java
View File

@ -17,6 +17,7 @@ import ratpack.handling.Context;
import ratpack.handling.Handler; import ratpack.handling.Handler;
import java.io.StringWriter; import java.io.StringWriter;
import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -67,7 +68,7 @@ public class NumassRootHandler implements Handler {
StringBuilder b = new StringBuilder(); StringBuilder b = new StringBuilder();
renderStorage(ctx, b, server.getRun().getStorage()); renderStorage(ctx, b, server.getRun().getStorage());
data.put("storageContent", b.toString()); data.put("storageContent", b.toString());
} catch (StorageException ex) { } catch (Exception ex) {
data.put("storageContent", ex.toString()); data.put("storageContent", ex.toString());
} }
} else { } else {
@ -85,18 +86,23 @@ public class NumassRootHandler implements Handler {
} }
} }
private void renderStorage(Context ctx, StringBuilder b, Storage storage) throws StorageException { private void renderStorage(Context ctx, StringBuilder b, Storage storage){
b.append("<div class=\"shifted\">\n"); try {
for (Storage shelf : storage.shelves().values()) { b.append("<div class=\"shifted\">\n");
b.append(String.format("<p><strong>+ %s</strong></p>%n", shelf.getName())); storage.shelves().values().stream().sorted(Comparator.comparing(it -> it.getName())).forEach(shelf -> {
renderStorage(ctx, b, shelf); b.append(String.format("<p><strong>+ %s</strong></p>%n", shelf.getName()));
renderStorage(ctx, b, shelf);
});
b.append("<div class=\"shifted\">\n");
storage.loaders().values().stream().sorted(Comparator.comparing(it->it.getName())).forEach(loader -> renderLoader(ctx, b, loader));
b.append("</div>\n");
b.append("</div>\n");
}catch (StorageException ex){
throw new RuntimeException(ex);
} }
b.append("<div class=\"shifted\">\n");
for (Loader loader : storage.loaders().values()) {
renderLoader(ctx, b, loader);
}
b.append("</div>\n");
b.append("</div>\n");
} }
private void renderLoader(Context ctx, StringBuilder b, Loader loader) { private void renderLoader(Context ctx, StringBuilder b, Loader loader) {