Revize 758dc669

re #7893 Added compare JOUD x Jackson
some minor issues in formatting repaired

project/Deserializer/src/jdeserialize/arrayobj.java

@@ -42 +42 @@
             boolean isLast = (i == this.data.size()-1) || (this.data.get(i+1) == null);
 
             if (el != null) {
-                if (el instanceof content) {
+                if (el instanceof content && !(el instanceof stringobj)) {
                     if(!bracketInserted){
                         sb.append(NEW_LINE).append(indentation).append("[ " + NEW_LINE);
                         bracketInserted = true;
@@ -64 +64 @@
                         bracketInserted = true;
                     }
                     
-                    sb.append(el.toString());
+                    if(el instanceof stringobj)
+                    {
+                        sb.append(((stringobj)el).toJson(indentation, fielddata, false));
+                    }else{
+                        sb.append(el.toString());
+                    }
                     
                     if (!isLast) {
                         sb.append(", ");

project/Deserializer/src/jdeserialize/classdesc.java

@@ -285 +285 @@
             }
         }
 
-        closingJsonSeq(sb, indentation);
+        indentation = closingJsonSeq(sb, indentation);
 
         //recursively call toJson for superclass if presented
         if (this.superclass != null) {
@@ -302 +302 @@
      * 
      * @param sb            StringBuffer where the closing sequence will be appended
      * @param indentation   Indentation to be changed
+     * @return              The edited indentation String
      */
-    private void closingJsonSeq(StringBuffer sb, String indentation)
+    private String closingJsonSeq(StringBuffer sb, String indentation)
     {
         indentation = indentation.replaceFirst(INDENT, "");
         sb.append(NEW_LINE).append(indentation).append("}");
 
         indentation = indentation.replaceFirst(INDENT, "");
         sb.append(NEW_LINE).append(indentation).append("}");
+
+        return indentation;
     }
 
     /**

project/comparison_jackson.txt

@@ +1 @@
+Pomocí Jackson:
+
+serialized.
+{
+  "pozdrav" : "AHOJ",
+  "testInt" : 123,
+  "testDouble" : 1.0,
+  "intArray" : [ 5, 10, 15 ],
+  "stringArray" : [ "A", "B", "C" ],
+  "locInnerClassInstance" : {
+    "vnitrni" : "INNER STRING AM I"
+  },
+  "localEnum" : "LOW"
+}
+
+*********************************************
+JOUD:
+
+{
+	class samples.ok.Simple extends samples.ok.SimpleChild : {
+		"testDouble" : 1.0, 
+		"testInt" : 123, 
+		"intArray" : [ 5, 10, 15 ], 
+		"locInnerClassInstance" : {
+			class samples.ok.Inner : {
+				"vnitrni" : "INNER STRING AM I"
+			}
+		}, 
+		"localEnum" : LOW, 
+		"pozdrav" : "AHOJ", 
+		"stringArray" : [ "A", "B", "C" ]
+	}
+},
+{
+	class samples.ok.SimpleChild : {
+		"navic" : "AHOJ, jsem tu navic"
+	}
+}

release_v0.4/app.config

@@ +1 @@
+#Wed May 06 18:06:02 CEST 2020
+input_dir=E\:\\Projekty\\Mine\\ZSWI\\2020\\sw\\demo_jh\\Deserializer_tests\\serialized

release_v0.4/jdeserialize_out.txt

@@ +1 @@
+--- JDESERIALIZE BEGINS ---
+read: samples.ok.Simple _h0x7e0007 = r_0x7e0000;  
+--- JDESERIALIZE ENDS ---