CAMEL-8389: camel-jackson - Allow to configure jackson object mapper …

…from XML DSL

camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java

@@ -16,11 +16,9 @@
  */
 package org.apache.camel.model.dataformat;
 
-import java.util.Set;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 
@@ -66,10 +64,10 @@ public class JsonDataFormat extends DataFormatDefinition {
     private String moduleClassNames;
     @XmlAttribute
     private String moduleRefs;
-    @XmlElement
-    private Set<String> enableFeatures;
-    @XmlElement
-    private Set<String> disableFeatures;
+    @XmlAttribute
+    private String enableFeatures;
+    @XmlAttribute
+    private String disableFeatures;
 
     public JsonDataFormat() {
         super("json");
@@ -223,7 +221,7 @@ public void setModuleRefs(String moduleRefs) {
         this.moduleRefs = moduleRefs;
     }
 
-    public Set<String> getEnableFeatures() {
+    public String getEnableFeatures() {
         return enableFeatures;
     }
 
@@ -232,12 +230,14 @@ public Set<String> getEnableFeatures() {
      * <p/>
      * The features should be a name that matches a enum from <tt>com.fasterxml.jackson.databind.SerializationFeature</tt>,
      * <tt>com.fasterxml.jackson.databind.DeserializationFeature</tt>, or <tt>com.fasterxml.jackson.databind.MapperFeature</tt>
+     * <p/>
+     * Multiple features can be separated by comma
      */
-    public void setEnableFeatures(Set<String> enableFeatures) {
+    public void setEnableFeatures(String enableFeatures) {
         this.enableFeatures = enableFeatures;
     }
 
-    public Set<String> getDisableFeatures() {
+    public String getDisableFeatures() {
         return disableFeatures;
     }
 
@@ -246,8 +246,10 @@ public Set<String> getDisableFeatures() {
      * <p/>
      * The features should be a name that matches a enum from <tt>com.fasterxml.jackson.databind.SerializationFeature</tt>,
      * <tt>com.fasterxml.jackson.databind.DeserializationFeature</tt>, or <tt>com.fasterxml.jackson.databind.MapperFeature</tt>
+     * <p/>
+     * Multiple features can be separated by comma
      */
-    public void setDisableFeatures(Set<String> disableFeatures) {
+    public void setDisableFeatures(String disableFeatures) {
         this.disableFeatures = disableFeatures;
     }
 

components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java

@@ -21,10 +21,9 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.DeserializationFeature;
@@ -65,8 +64,8 @@ public class JacksonDataFormat extends ServiceSupport implements DataFormat, Cam
     private boolean allowJmsType;
     private boolean useList;
     private boolean enableJaxbAnnotationModule;
-    private Set<String> enableFeatures;
-    private Set<String> disableFeatures;
+    private String enableFeatures;
+    private String disableFeatures;
 
     /**
      * Use the default Jackson {@link ObjectMapper} and {@link Map}
@@ -294,70 +293,76 @@ public void setAllowJmsType(boolean allowJmsType) {
         this.allowJmsType = allowJmsType;
     }
 
-    public Set<String> getEnableFeatures() {
+    public String getEnableFeatures() {
         return enableFeatures;
     }
 
     /**
      * Set of features to enable on the Jackson {@link ObjectMapper}.
      * The features should be a name that matches a enum from {@link SerializationFeature}, {@link DeserializationFeature}, or {@link MapperFeature}.
      */
-    public void setEnableFeatures(Set<String> enableFeatures) {
+    public void setEnableFeatures(String enableFeatures) {
         this.enableFeatures = enableFeatures;
     }
 
-    public Set<String> getDisableFeatures() {
+    public String getDisableFeatures() {
         return disableFeatures;
     }
 
     /**
      * Set of features to disable on the Jackson {@link ObjectMapper}.
      * The features should be a name that matches a enum from {@link SerializationFeature}, {@link DeserializationFeature}, or {@link MapperFeature}.
      */
-    public void setDisableFeatures(Set<String> disableFeatures) {
+    public void setDisableFeatures(String disableFeatures) {
         this.disableFeatures = disableFeatures;
     }
 
     public void enableFeature(SerializationFeature feature) {
         if (enableFeatures == null) {
-            enableFeatures = new HashSet<String>();
+            enableFeatures = feature.name();
+        } else {
+            enableFeatures += "," + feature.name();
         }
-        enableFeatures.add(feature.name());
     }
 
     public void enableFeature(DeserializationFeature feature) {
         if (enableFeatures == null) {
-            enableFeatures = new HashSet<String>();
+            enableFeatures = feature.name();
+        } else {
+            enableFeatures += "," + feature.name();
         }
-        enableFeatures.add(feature.name());
     }
 
     public void enableFeature(MapperFeature feature) {
         if (enableFeatures == null) {
-            enableFeatures = new HashSet<String>();
+            enableFeatures = feature.name();
+        } else {
+            enableFeatures += "," + feature.name();
         }
-        enableFeatures.add(feature.name());
     }
 
     public void disableFeature(SerializationFeature feature) {
         if (disableFeatures == null) {
-            disableFeatures = new HashSet<String>();
+            disableFeatures = feature.name();
+        } else {
+            disableFeatures += "," + feature.name();
         }
-        disableFeatures.add(feature.name());
     }
 
     public void disableFeature(DeserializationFeature feature) {
         if (disableFeatures == null) {
-            disableFeatures = new HashSet<String>();
+            disableFeatures = feature.name();
+        } else {
+            disableFeatures += "," + feature.name();
         }
-        disableFeatures.add(feature.name());
     }
 
     public void disableFeature(MapperFeature feature) {
         if (disableFeatures == null) {
-            disableFeatures = new HashSet<String>();
+            disableFeatures = feature.name();
+        } else {
+            disableFeatures += "," + feature.name();
         }
-        disableFeatures.add(feature.name());
     }
 
     @Override
@@ -382,7 +387,9 @@ protected void doStart() throws Exception {
         }
 
         if (enableFeatures != null) {
-            for (String enable : enableFeatures) {
+            Iterator<Object> it = ObjectHelper.createIterator(enableFeatures);
+            while (it.hasNext()) {
+                String enable = it.next().toString();
                 // it can be different kind
                 SerializationFeature sf = getCamelContext().getTypeConverter().tryConvertTo(SerializationFeature.class, enable);
                 if (sf != null) {
@@ -403,7 +410,9 @@ protected void doStart() throws Exception {
             }
         }
         if (disableFeatures != null) {
-            for (String disable : disableFeatures) {
+            Iterator<Object> it = ObjectHelper.createIterator(enableFeatures);
+            while (it.hasNext()) {
+                String disable = it.next().toString();
                 // it can be different kind
                 SerializationFeature sf = getCamelContext().getTypeConverter().tryConvertTo(SerializationFeature.class, disable);
                 if (sf != null) {

components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonEnableFeatureTest.java

@@ -0,0 +1,44 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.jackson;
+
+import org.apache.camel.test.spring.CamelSpringTestSupport;
+import org.junit.Test;
+import org.springframework.context.support.AbstractXmlApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+/**
+ * @version 
+ */
+public class SpringJacksonEnableFeatureTest extends CamelSpringTestSupport {
+
+    @Test
+    public void testMarshal() throws Exception {
+        TestPojoView in = new TestPojoView();
+
+        Object marshalled = template.requestBody("direct:in", in);
+        String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled);
+        // we enable the wrap root type feature so we should have TestPojoView
+        assertEquals("{\"TestPojoView\":{\"age\":30,\"height\":190,\"weight\":70}}", marshalledAsString);
+    }
+
+    @Override
+    protected AbstractXmlApplicationContext createApplicationContext() {
+        return new ClassPathXmlApplicationContext("org/apache/camel/component/jackson/SpringJacksonEnableFeatureTest.xml");
+    }
+
+}

components/camel-jackson/src/test/resources/org/apache/camel/component/jackson/SpringJacksonEnableFeatureTest.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+       http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
+    ">
+
+  <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
+
+    <dataFormats>
+      <json id="jack" library="Jackson" unmarshalTypeName="org.apache.camel.component.jackson.TestPojo"
+            enableFeatures="WRAP_ROOT_VALUE"/>
+    </dataFormats>
+
+    <route>
+      <from uri="direct:in"/>
+      <marshal ref="jack"/>
+    </route>
+
+  </camelContext>
+
+</beans>