Changeset 264

Timestamp:

2008-05-28 15:39:21 (5 years ago)

Author:

jgou

Message:

• add support for update (put) and create (post) of database resources from XML
• use streams rather than in-memory strings

Location:

trunk/modules/kauri-dbresources/kauri-dbresources-impl/src/main/java/org/kauriproject/dbresources

Files:

• DatabaseResource.java (modified) (1 diff)
• serialization/Serializer.java (modified) (2 diffs)

trunk/modules/kauri-dbresources/kauri-dbresources-impl/src/main/java/org/kauriproject/dbresources/DatabaseResource.java

@@ -100 +100 @@
             try {
                 JsonRepresentation jsonrep = new JsonRepresentation(representation);
-                entity = Serializer.deserializeFromJSON(jsonrep.getText());
+                entity = Serializer.deserializeFromJSON(jsonrep.getStream());
+            } catch (IOException ex) {
+                ex.printStackTrace();
+            }
+        } else if (MediaType.APPLICATION_XML.getName().equals(representation.getMediaType().getName())) {
+            try {
+                entity = Serializer.deserializeFromXML(representation.getStream());
+                representation.getStream();
             } catch (IOException ex) {
                 ex.printStackTrace();

trunk/modules/kauri-dbresources/kauri-dbresources-impl/src/main/java/org/kauriproject/dbresources/serialization/Serializer.java

@@ -16 +16 @@
 package org.kauriproject.dbresources.serialization;
 
+import java.io.InputStream;
 import java.io.StringReader;
 
@@ -72 +73 @@
     }
 
-    public static Object deserializeFromJSON(String json) {
+    // ----------------------------------
+
+    public static Object deserializeFromXML(InputStream xmlInputStream) {
+        // XML: DomDriver does not require XPP3 library
+        XStream xmlSerializer = setupSerializer(new DomDriver());
+        return xmlSerializer.fromXML(xmlInputStream);
+    }
+
+    public static Object deserializeFromJSON(InputStream jsonInputStream) {
         // JSON: Jettison works in both directions
         XStream jsonSerializer = setupSerializer(new JettisonMappedXmlDriver());
-        return jsonSerializer.fromXML(json);
+        return jsonSerializer.fromXML(jsonInputStream);
     }