From 757acef98231fb7b5923befbe0498924874ebd32 Mon Sep 17 00:00:00 2001
From: ulrich
Date: Wed, 21 Apr 2021 05:57:43 +0000
Subject: [PATCH] Geraete-Liste mit Status fertig

---
 src/de/uhilger/mediaz/api/JsonHelper.java |   37 +++++++++++++++++++++++++++++++++----
 1 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/de/uhilger/mediaz/api/JsonHelper.java b/src/de/uhilger/mediaz/api/JsonHelper.java
index 1c91930..21b323e 100644
--- a/src/de/uhilger/mediaz/api/JsonHelper.java
+++ b/src/de/uhilger/mediaz/api/JsonHelper.java
@@ -1,7 +1,19 @@
 /*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+  Mediazentrale - Personal Media Center
+  Copyright (C) 2021  Ulrich Hilger
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Affero General Public License as
+  published by the Free Software Foundation, either version 3 of the
+  License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License
+  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package de.uhilger.mediaz.api;
 
@@ -9,7 +21,8 @@
 
 /**
  *
- * @author ulrich
+ * @author Ulrich Hilger
+ * @version 1, 9.4.2021
  */
 public class JsonHelper {
   
@@ -28,6 +41,7 @@
   }
   
   public String jsonWithCustomType(Object o, String typeName) {
+    /*
     StringBuilder sb = new StringBuilder();
     sb.append("{\"");
     sb.append(typeName);
@@ -36,6 +50,21 @@
     sb.append(gson.toJson(o));
     sb.append("}");
     return sb.toString();
+    */
+    Gson gson = new Gson();
+    return embedInCustomType(gson.toJson(o), typeName);
+  }
+  
+  public String embedInCustomType(String jsonStr, String typeName) {
+    StringBuilder sb = new StringBuilder();
+    sb.append("{\"");
+    sb.append(typeName);
+    sb.append("\": ");
+    //Gson gson = new Gson();
+    //sb.append(gson.toJson(o));
+    sb.append(jsonStr);
+    sb.append("}");
+    return sb.toString();
   }
   
 }

--
Gitblit v1.9.3