Changeset 19596

Timestamp:

01/31/12 19:02:39 (4 months ago)

Author:

sys

Message:

Ajout Json parser en java.

Location:

trunk/Jav_Commons

Files:

• src/eu/scenari/commons/syntax/json/JsonParser.java (added)
• src/eu/scenari/commons/syntax/json/JsonSerializer.java (modified) (5 diffs)
• src/eu/scenari/commons/util/coder (added)
• src/eu/scenari/commons/util/coder/HexaUtils.java (added)
• test/eu/scenari/commons/syntax/json/JsonParserTest.java (added)
• test/eu/scenari/commons/syntax/json/JsonSerializerTest.java (modified) (3 diffs)

trunk/Jav_Commons/src/eu/scenari/commons/syntax/json/JsonSerializer.java

@@ -41 +41 @@
 import java.io.IOException;
 import java.util.Collection;
+import java.util.Map;
 
 /**
@@ -169 +170 @@
          * 
          */
-        public JsonSerializer(Appendable pappendable) {
+        public JsonSerializer() {
                 this.fStackStatus = new SerialStatus[10];
-                this.fAppendable = pappendable;
+                this.fAppendable = new StringBuilder();
+        }
+
+        /**
+         * 
+         */
+        public JsonSerializer(Appendable pAppendable) {
+                this.fStackStatus = new SerialStatus[10];
+                this.fAppendable = pAppendable;
         }
 
@@ -372 +381 @@
                 }
                 endArray();
+                return this;
+        }
+
+        public JsonSerializer valObject(Map<?, ?> pObject) throws Exception {
+                startObject();
+                for (Map.Entry<?, ?> vField : pObject.entrySet()) {
+                        key(vField.getKey().toString());
+                        val(vField.getValue());
+                }
+                endObject();
                 return this;
         }
@@ -397 +416 @@
                 } else if (pObject instanceof Collection<?>) {
                         valArray((Collection) pObject);
+                } else if (pObject instanceof Map<?, ?>) {
+                        valObject((Map<?, ?>) pObject);
                 } else {
                         valString(pObject);
                 }
                 return this;
+        }
+
+        public Appendable getAppendable() {
+                return fAppendable;
         }
 
@@ -416 +441 @@
                         if (!fNeedComma) fNeedComma = true;
                         break;
+                case start:
+                        fNeedComma = false;
+                        break;
                 case object:
                         throw new Exception("JsonAppendable can't write value before key object.");
-                case start:
-                        throw new Exception("JsonAppendable can't write value just after start.");
                 case closed:
                         throw new Exception("JsonAppendable closed");

trunk/Jav_Commons/test/eu/scenari/commons/syntax/json/JsonSerializerTest.java

@@ -43 +43 @@
 import org.junit.Test;
 
-import eu.scenari.commons.syntax.json.JsonSerializer;
-
 /**
  * 
@@ -56 +54 @@
                 vJson.startObject().key("key1").valBoolean(true).key("'ê").valString("é\"è'").endObject();
                 System.out.println(vSb);
-                Assert.assertEquals("{key1:true,\"\\'ê\":\"é\\\"è\\'\"}", vSb.toString());
+                Assert.assertEquals("{\"key1\":true,\"'ê\":\"é\\\"è\'\"}", vSb.toString());
         }
 
@@ -85 +83 @@
 
                 System.out.println(vSb);
-                Assert.assertEquals("{arr1:[{val1:1235.0,val2:12.0,val3:true},[null,null]]}", vSb.toString());
+                Assert.assertEquals("{\"arr1\":[{\"val1\":1235,\"val2\":12,\"val3\":true},[null,null]]}", vSb.toString());
         }
 }