From bebd4767df2dd419a2d04eaa4253592d13336e8c Mon Sep 17 00:00:00 2001 From: ulrich Date: Tue, 06 Apr 2021 22:01:26 +0000 Subject: [PATCH] Gestaltungen angepasst --- src/de/uhilger/mediaz/api/StorageHandler.java | 42 ++++++++++++++++++++---------------------- 1 files changed, 20 insertions(+), 22 deletions(-) diff --git a/src/de/uhilger/mediaz/api/StorageHandler.java b/src/de/uhilger/mediaz/api/StorageHandler.java index 8de56fd..f022ada 100644 --- a/src/de/uhilger/mediaz/api/StorageHandler.java +++ b/src/de/uhilger/mediaz/api/StorageHandler.java @@ -18,7 +18,6 @@ package de.uhilger.mediaz.api; import com.google.gson.Gson; -import com.google.gson.GsonBuilder; import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpHandler; import de.uhilger.mediaz.App; @@ -37,12 +36,12 @@ import java.util.logging.Logger; /** - * HttpHandler fuer die Ablage von Entitaeten der Mediazentrale + * HttpHandler fuer die Verwaltung von Entitaeten der Mediazentrale * * @author Ulrich Hilger * @version 1, 5.4.2021 */ -public class StorageHandler implements HttpHandler { +public class StorageHandler extends AbstractHandler implements HttpHandler { private static final Logger logger = Logger.getLogger(StorageHandler.class.getName()); @@ -121,7 +120,7 @@ } break; } - logger.info(response); + logger.fine(response); e.sendResponseHeaders(code, response.length()); OutputStream os = e.getResponseBody(); os.write(response.getBytes()); @@ -129,6 +128,14 @@ } private String neu(HttpExchange e) throws IOException { + return schreiben(e, false); + } + + private String aendern(HttpExchange e) throws IOException { + return schreiben(e, true); + } + + private String schreiben(HttpExchange e, boolean overwrite) throws IOException { String path = e.getRequestURI().toString(); String[] elems = path.split(App.getRs(Server.RB_SLASH)); String type = elems[elems.length - 1]; @@ -136,22 +143,25 @@ String filename = ""; FileStorage fs = new FileStorage(App.getInitParameter(App.getRs(App.RB_AP_CONF))); Gson gson = new Gson(); - logger.log(Level.INFO, "type: {0}", type); + logger.log(Level.FINE, "type: {0}", type); Object o = gson.fromJson(body, fs.typeFromName(type).getType()); if(o instanceof Entity) { - Object antwortObjekt = fs.write((Entity) o); + Object antwortObjekt = fs.write((Entity) o, overwrite); if(antwortObjekt instanceof File) { File file = (File) antwortObjekt; - logger.log(Level.INFO, "Datei {0} geschrieben.", file.getAbsolutePath()); + logger.log(Level.FINE, "Datei {0} geschrieben.", file.getAbsolutePath()); filename = file.getName(); + return type + FileHandler.STR_BLANK + filename; } } - return type + FileHandler.STR_BLANK + filename; + return type + FileHandler.STR_BLANK + " Operation 'neu' fuer bereits existierende Entitaet."; } + /* private String aendern(HttpExchange e) throws IOException { return neu(e); // einstweilen wird einfach ueberschrieben } + */ private boolean loeschen(HttpExchange e) { String path = e.getRequestURI().toString(); @@ -168,7 +178,7 @@ FileStorage fs = new FileStorage(App.getInitParameter(App.getRs(App.RB_AP_CONF))); if(path.endsWith(App.getRs(RB_SLASH))) { String type = elems[elems.length - 1]; - logger.info(type); + logger.fine(type); List list = fs.list(type); return jsonWithEnclosingType(list); } else { @@ -177,18 +187,6 @@ return fs.readJson(type, elemName); } } - - private String jsonWithEnclosingType(Object o) { - StringBuilder sb = new StringBuilder(); - sb.append("{\""); - sb.append(o.getClass().getSimpleName()); - sb.append("\": "); - Gson gson = new Gson(); - sb.append(gson.toJson(o)); - sb.append("}"); - return sb.toString(); - } - private String bodyLesen(HttpExchange e) throws IOException { InputStream is = e.getRequestBody(); @@ -201,7 +199,7 @@ } r.close(); String json = sb.toString(); - logger.log(Level.INFO, "json: {0}", json); + logger.log(Level.FINE, "json: {0}", json); return json; } } -- Gitblit v1.9.3