Changeset 1645

Timestamp:

2010-08-05 11:19:47 (3 years ago)

Author:

freya

Message:

see #175 : use kauri-json and jackson lib instead of json-lib

Location:

trunk/samples/kauri-forms-sample

Files:

• pom.xml (modified) (1 diff)
• src/main/java/org/kauriproject/samples/forms/OrderedDateMembersValidationResource.java (modified) (2 diffs)

trunk/samples/kauri-forms-sample/pom.xml

@@ -62 +62 @@
     </dependency>
     <dependency>
-      <groupId>org.json</groupId>
-      <artifactId>org.json</artifactId>
-    </dependency> 
+      <groupId>org.kauriproject</groupId>
+      <artifactId>kauri-json</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.kauriproject</groupId>

trunk/samples/kauri-forms-sample/src/main/java/org/kauriproject/samples/forms/OrderedDateMembersValidationResource.java

@@ -16 +16 @@
 package org.kauriproject.samples.forms;
 
-import net.sf.json.JSONObject;
+import java.io.IOException;
+import java.util.HashMap;
 
+import org.codehaus.jackson.JsonParseException;
+import org.codehaus.jackson.map.JsonMappingException;
+import org.codehaus.jackson.map.ObjectMapper;
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormatter;
 import org.joda.time.format.ISODateTimeFormat;
+import org.kauriproject.samples.forms.ValidationResource.Result;
 import org.restlet.Context;
 import org.restlet.Request;
@@ -51 +56 @@
             final String[] inputs = new String[2];
 
-            JSONObject input = JSONObject.fromObject(value);        
-    
-            boolean allOk = true;
-            for (int i = 0; i < dates.length; i++) {
-                if ( ! input.has(members[i]))
-                    return Result.OK; // can't declare invalid if some members are missing
-                    
-                inputs[i] = input.getString(members[i]);
-                dates[i] = parseDateTime(inputs[i]);
-                
-                allOk = allOk && (dates[i] != null);
-            }
+            ObjectMapper mapper = new ObjectMapper(); 
+            HashMap<String, String> map;
+            try {
+                map = mapper.readValue(value, HashMap.class);
+                boolean allOk = true;
+                for (int i = 0; i < dates.length; i++) {
+                    if ( ! map.containsKey(members[i]))
+                        return Result.OK; // can't declare invalid if some members are missing
+                        
+                    inputs[i] = map.get(members[i]);
+                    dates[i] = parseDateTime(inputs[i]);
+                    
+                    allOk = allOk && (dates[i] != null);
+                }
+                
+                if (!allOk) {
+                    return new Result(false, "One of the Date members could not be parsed as date. {'" +
+                            members[0] + "':" + dates[0]+ ",'" + members[1] + "':" + dates[1]+ "}");
+                } else if (dates[0].compareTo(dates[1]) > 0) {
+                    return new Result(false, "Date member '" + members[0] + "' (" + dates[0] + ")  is not before " +
+                            "Date member '" + members[1] + "' (" + dates[1] + ") ");
+                } 
+                
+            } catch (JsonParseException e) {
+                return new Result(false, "Json could not be parsed.");
+            } catch (JsonMappingException e) {
+                return new Result(false, "Json could not be parsed.");
+            } catch (IOException e) {
+                return new Result(false, "Json could not be parsed.");
+            } 
             
-            if (!allOk) {
-                return new Result(false, "One of the Date members could not be parsed as date. {'" +
-                        members[0] + "':" + dates[0]+ ",'" + members[1] + "':" + dates[1]+ "}");
-            } else if (dates[0].compareTo(dates[1]) > 0) {
-                return new Result(false, "Date member '" + members[0] + "' (" + dates[0] + ")  is not before " +
-                        "Date member '" + members[1] + "' (" + dates[1] + ") ");
-            } 
         }