svn commit: r962668 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/model/dataformat/ components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/ components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/

[ha...@apache.org]

Author: hadrian
Date: Fri Jul  9 19:38:52 2010
New Revision: 962668

URL: http://svn.apache.org/viewvc?rev=962668&view=rev
Log:
CAMEL-2915. Fix misspelled api and set NO_REFERENCES for json

Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
    camel/trunk/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/JsonDataFormat.java
    camel/trunk/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConfigurationTest.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java?rev=962668&r1=962667&r2=962668&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java Fri Jul  9 19:38:52 2010
@@ -107,7 +107,7 @@ public class XStreamDataFormat extends D
         return implicitCollections;
     }
 
-    public void setImplicitCollection(Map<String, String[]> implicitCollections) {
+    public void setImplicitCollections(Map<String, String[]> implicitCollections) {
         this.implicitCollections = implicitCollections;
     }
 

Modified: camel/trunk/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/JsonDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/JsonDataFormat.java?rev=962668&r1=962667&r2=962668&view=diff
==============================================================================
--- camel/trunk/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/JsonDataFormat.java (original)
+++ camel/trunk/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/JsonDataFormat.java Fri Jul  9 19:38:52 2010
@@ -23,6 +23,7 @@ import java.util.Map;
 
 import javax.xml.stream.XMLStreamException;
 
+import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
 import com.thoughtworks.xstream.io.xml.QNameMap;
@@ -30,6 +31,7 @@ import com.thoughtworks.xstream.io.xml.S
 import com.thoughtworks.xstream.io.xml.StaxWriter;
 
 import org.apache.camel.Exchange;
+import org.apache.camel.spi.ClassResolver;
 import org.codehaus.jettison.mapped.MappedXMLInputFactory;
 import org.codehaus.jettison.mapped.MappedXMLOutputFactory;
 
@@ -50,6 +52,13 @@ public class JsonDataFormat extends Abst
         mif = new MappedXMLInputFactory(nstjsons);
     }
 
+    @Override
+    protected XStream createXStream(ClassResolver resolver) {
+        XStream xs = super.createXStream(resolver);
+        xs.setMode(XStream.NO_REFERENCES);
+        return xs;
+    }
+
     protected HierarchicalStreamWriter createHierarchicalStreamWriter(Exchange exchange, Object body, OutputStream stream) throws XMLStreamException {        
         return new StaxWriter(new QNameMap(), mof.createXMLStreamWriter(stream));
     }
@@ -57,5 +66,4 @@ public class JsonDataFormat extends Abst
     protected HierarchicalStreamReader createHierarchicalStreamReader(Exchange exchange, InputStream stream) throws XMLStreamException {        
         return new StaxReader(new QNameMap(), mif.createXMLStreamReader(stream));
     }
-
 }

Modified: camel/trunk/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConfigurationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConfigurationTest.java?rev=962668&r1=962667&r2=962668&view=diff
==============================================================================
--- camel/trunk/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConfigurationTest.java (original)
+++ camel/trunk/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConfigurationTest.java Fri Jul  9 19:38:52 2010
@@ -138,7 +138,7 @@ public class XStreamConfigurationTest ex
 
                 Map<String, String[]> implicits = new HashMap<String, String[]>();
                 implicits.put(PurchaseHistory.class.getName(), new String[] {"history"});
-                xstreamDefinition.setImplicitCollection(implicits);
+                xstreamDefinition.setImplicitCollections(implicits);
 
                 from("direct:marshal").marshal(xstreamDefinition).to("mock:result");
                 from("direct:unmarshal").unmarshal(xstreamDefinition).to("mock:result");