From faab2d0597940dfa742c3c105a3b607ccf75e8d6 Mon Sep 17 00:00:00 2001 From: ulrich Date: Tue, 06 Apr 2021 11:43:19 +0000 Subject: [PATCH] Ablageorte fertig --- src/de/uhilger/mediaz/api/StorageHandler.java | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/src/de/uhilger/mediaz/api/StorageHandler.java b/src/de/uhilger/mediaz/api/StorageHandler.java index 024900b..e4bf00d 100644 --- a/src/de/uhilger/mediaz/api/StorageHandler.java +++ b/src/de/uhilger/mediaz/api/StorageHandler.java @@ -36,7 +36,7 @@ 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 @@ -128,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]; @@ -138,19 +146,22 @@ logger.log(Level.INFO, "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()); 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(); @@ -169,8 +180,7 @@ String type = elems[elems.length - 1]; logger.info(type); List list = fs.list(type); - Gson gson = new Gson(); - return gson.toJson(list); + return jsonWithEnclosingType(list); } else { String type = elems[elems.length - 2]; String elemName = elems[elems.length - 1]; @@ -178,6 +188,16 @@ } } + 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(); -- Gitblit v1.9.3