From 89076bfa54ac2e4ad0d00af8a6beaa1610b7d4c5 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Mon, 16 Jan 2017 17:07:35 +0100
Subject: [PATCH] Fixed some warnings and added toString function in
 JSONObjectStream

---
 src/zutil/db/bean/DBBean.java                  |  0
 src/zutil/db/bean/DBBeanSQLResultHandler.java  |  4 ++--
 .../parser/json/JSONObjectOutputStream.java    | 18 +++++++++++++++++-
 src/zutil/parser/json/JSONWriter.java          |  2 +-
 4 files changed, 20 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 src/zutil/db/bean/DBBean.java

diff --git a/src/zutil/db/bean/DBBean.java b/src/zutil/db/bean/DBBean.java
old mode 100644
new mode 100755
diff --git a/src/zutil/db/bean/DBBeanSQLResultHandler.java b/src/zutil/db/bean/DBBeanSQLResultHandler.java
index 79b7224..adcf820 100755
--- a/src/zutil/db/bean/DBBeanSQLResultHandler.java
+++ b/src/zutil/db/bean/DBBeanSQLResultHandler.java
@@ -45,7 +45,7 @@ public class DBBeanSQLResultHandler<T> implements SQLResultHandler<T>{
 	public static final long CACHE_DATA_TTL = 1000*60*5; // 5 min in ms
 	/** A cache for detecting recursion **/
 	protected static Map<Class<?>, Map<Long,DBBeanCache>> cache =
-		new ConcurrentHashMap<Class<?>, Map<Long,DBBeanCache>>();
+		new ConcurrentHashMap<>();
 	private static Timer timer;
 
     static {
@@ -283,7 +283,7 @@ public class DBBeanSQLResultHandler<T> implements SQLResultHandler<T>{
 		} finally{
 			obj.processing_update = false;
 		}
-		
+
 		obj.postUpdateAction();
 	}
 
diff --git a/src/zutil/parser/json/JSONObjectOutputStream.java b/src/zutil/parser/json/JSONObjectOutputStream.java
index 1544cac..480c1ce 100755
--- a/src/zutil/parser/json/JSONObjectOutputStream.java
+++ b/src/zutil/parser/json/JSONObjectOutputStream.java
@@ -25,6 +25,7 @@
 package zutil.parser.json;
 
 import zutil.ClassUtil;
+import zutil.io.StringOutputStream;
 import zutil.parser.Base64Encoder;
 import zutil.parser.DataNode;
 import zutil.parser.DataNode.DataType;
@@ -52,7 +53,7 @@ public class JSONObjectOutputStream extends OutputStream implements ObjectOutput
     private JSONWriter out;
 
     private JSONObjectOutputStream() {
-        this.objectCache = new HashMap<Object, Integer>();
+        this.objectCache = new HashMap<>();
     }
     public JSONObjectOutputStream(OutputStream out) {
         this();
@@ -64,6 +65,21 @@ public class JSONObjectOutputStream extends OutputStream implements ObjectOutput
     }
 
 
+    /**
+     * @return a String containing the JSON representation of the Object
+     */
+    public static String toString(Object obj){
+        try {
+            StringOutputStream out = new StringOutputStream();
+            JSONObjectOutputStream writer = new JSONObjectOutputStream(out);
+            writer.writeObject(obj);
+            writer.close();
+            return out.toString();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
 
     public synchronized void writeObject(Object obj) throws IOException{
         try{
diff --git a/src/zutil/parser/json/JSONWriter.java b/src/zutil/parser/json/JSONWriter.java
index 481beb6..aec6358 100755
--- a/src/zutil/parser/json/JSONWriter.java
+++ b/src/zutil/parser/json/JSONWriter.java
@@ -132,7 +132,7 @@ public class JSONWriter{
     }
 
     /**
-     * @return JSON String that is generated from the input DataNode graph
+     * @return a String containing the JSON representation of the input DataNode graph
      */
     public static String toString(DataNode root){
         StringOutputStream out = new StringOutputStream();