CAMEL-9189: Jackson XML Mapper Data format
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5c956443 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5c956443 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5c956443 Branch: refs/heads/master Commit: 5c9564437843ae43d88b747958b8ac91dd91f91a Parents: 4077f52 Author: Claus Ibsen <davscl...@apache.org> Authored: Mon Oct 5 13:13:02 2015 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Oct 5 13:13:02 2015 +0200 ---------------------------------------------------------------------- components/camel-jacksonxml/pom.xml | 146 ++++++++++--------- .../jacksonxml/JacksonXMLConstants.java | 2 +- .../jacksonxml/JacksonXMLDataFormat.java | 35 +++-- .../jacksonxml/ListJacksonXMLDataFormat.java | 2 +- .../converter/JacksonXMLTypeConverters.java | 5 +- .../jacksonxml/JacksonConcurrentTest.java | 3 +- .../JacksonConversionsSimpleTest.java | 1 - .../jacksonxml/JacksonConversionsTest.java | 1 - .../jacksonxml/JacksonIncludeDefaultTest.java | 2 +- .../jacksonxml/JacksonIncludeNotNulllTest.java | 2 +- .../jacksonxml/JacksonJAXBAnnotationTest.java | 2 +- .../jacksonxml/JacksonJsonDataFormatTest.java | 1 - .../jacksonxml/JacksonMarshalTest.java | 2 +- .../JacksonMarshalUnmarshalListTest.java | 2 +- .../JacksonMarshalUnmarshalTypeHeaderTest.java | 3 +- .../jacksonxml/JacksonMarshalViewTest.java | 1 - .../jacksonxml/JacksonModuleRefTest.java | 2 +- .../component/jacksonxml/JacksonModuleTest.java | 2 +- .../jacksonxml/JacksonObjectListSplitTest.java | 4 +- .../SpringJacksonEnableFeatureTest.java | 2 +- .../SpringJacksonJsonDataFormatTest.java | 2 +- .../SpringJacksonMarshalUnmarshalListTest.java | 2 +- .../camel/component/jacksonxml/Views.java | 7 +- .../src/test/resources/log4j.properties | 2 +- 24 files changed, 117 insertions(+), 116 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/5c956443/components/camel-jacksonxml/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-jacksonxml/pom.xml b/components/camel-jacksonxml/pom.xml index f2e93b3..a1d2375 100644 --- a/components/camel-jacksonxml/pom.xml +++ b/components/camel-jacksonxml/pom.xml @@ -1,81 +1,87 @@ <?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. --> +<!-- + 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. +--> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.camel</groupId> - <artifactId>components</artifactId> - <version>2.16.1-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.apache.camel</groupId> + <artifactId>components</artifactId> + <version>2.16.1-SNAPSHOT</version> + </parent> - <artifactId>camel-jacksonxml</artifactId> - <packaging>bundle</packaging> - <name>Camel :: Jackson XML</name> - <description>Camel Jackson XML support</description> + <artifactId>camel-jacksonxml</artifactId> + <packaging>bundle</packaging> + <name>Camel :: Jackson XML</name> + <description>Camel Jackson XML support</description> - <properties> - <camel.osgi.import.before.defaults> - com.fasterxml.jackson.*;version="[2.3,3)" - </camel.osgi.import.before.defaults> - <camel.osgi.export.pkg>org.apache.camel.component.jacksonxml.*</camel.osgi.export.pkg> - <camel.osgi.export.service>org.apache.camel.spi.DataFormatResolver;dataformat=jacksonxml</camel.osgi.export.service> - </properties> + <properties> + <camel.osgi.import.before.defaults> + com.fasterxml.jackson.*;version="[2.3,3)" + </camel.osgi.import.before.defaults> + <camel.osgi.export.pkg>org.apache.camel.component.jacksonxml.*</camel.osgi.export.pkg> + <camel.osgi.export.service>org.apache.camel.spi.DataFormatResolver;dataformat=jacksonxml</camel.osgi.export.service> + </properties> - <dependencies> + <dependencies> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-core</artifactId> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - <version>${jackson2-version}</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.dataformat</groupId> - <artifactId>jackson-dataformat-xml</artifactId> - <version>${jackson2-version}</version> - </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-core</artifactId> + </dependency> - <dependency> - <groupId>com.fasterxml.jackson.module</groupId> - <artifactId>jackson-module-jaxb-annotations</artifactId> - <version>${jackson2-version}</version> - </dependency> - <dependency> - <groupId>org.codehaus.woodstox</groupId> - <artifactId>woodstox-core-asl</artifactId> - <version>4.1.4</version> - </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>${jackson2-version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-xml</artifactId> + <version>${jackson2-version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.module</groupId> + <artifactId>jackson-module-jaxb-annotations</artifactId> + <version>${jackson2-version}</version> + </dependency> + <dependency> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>woodstox-core-asl</artifactId> + <version>${woodstox-version}</version> + </dependency> - <!-- testing --> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-test-spring</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - </dependencies> + <!-- testing --> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-test-spring</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + </dependencies> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/5c956443/components/camel-jacksonxml/src/main/java/org/apache/camel/component/jacksonxml/JacksonXMLConstants.java ---------------------------------------------------------------------- diff --git a/components/camel-jacksonxml/src/main/java/org/apache/camel/component/jacksonxml/JacksonXMLConstants.java b/components/camel-jacksonxml/src/main/java/org/apache/camel/component/jacksonxml/JacksonXMLConstants.java index 1e8c3db..6ea2b37 100644 --- a/components/camel-jacksonxml/src/main/java/org/apache/camel/component/jacksonxml/JacksonXMLConstants.java +++ b/components/camel-jacksonxml/src/main/java/org/apache/camel/component/jacksonxml/JacksonXMLConstants.java @@ -19,7 +19,7 @@ package org.apache.camel.component.jacksonxml; public final class JacksonXMLConstants { public static final String ENABLE_TYPE_CONVERTER = "CamelJacksonXmlEnableTypeConverter"; - + public static final String ENABLE_XML_TYPE_CONVERTER = "CamelJacksonXmlEnableTypeConverter"; public static final String UNMARSHAL_TYPE = "CamelJacksonXmlUnmarshalType"; http://git-wip-us.apache.org/repos/asf/camel/blob/5c956443/components/camel-jacksonxml/src/main/java/org/apache/camel/component/jacksonxml/JacksonXMLDataFormat.java ---------------------------------------------------------------------- diff --git a/components/camel-jacksonxml/src/main/java/org/apache/camel/component/jacksonxml/JacksonXMLDataFormat.java b/components/camel-jacksonxml/src/main/java/org/apache/camel/component/jacksonxml/JacksonXMLDataFormat.java index bb6131c..531877b 100644 --- a/components/camel-jacksonxml/src/main/java/org/apache/camel/component/jacksonxml/JacksonXMLDataFormat.java +++ b/components/camel-jacksonxml/src/main/java/org/apache/camel/component/jacksonxml/JacksonXMLDataFormat.java @@ -25,6 +25,14 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.MapperFeature; +import com.fasterxml.jackson.databind.Module; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.databind.type.CollectionType; +import com.fasterxml.jackson.dataformat.xml.XmlMapper; +import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule; import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; import org.apache.camel.Exchange; @@ -36,15 +44,6 @@ import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.MapperFeature; -import com.fasterxml.jackson.databind.Module; -import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.databind.type.CollectionType; -import com.fasterxml.jackson.dataformat.xml.XmlMapper; -import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule; - /** * A <a href="http://camel.apache.org/data-format.html";>data format</a> ({@link DataFormat}) * using <a href="http://jackson.codehaus.org/";>Jackson</a> to marshal to and from XML. @@ -92,20 +91,20 @@ public class JacksonXMLDataFormat extends ServiceSupport implements DataFormat, * unmarshal type and JSON view * * @param unmarshalType the custom unmarshal type - * @param jsonView marker class to specify properties to be included during marshalling. - * See also http://wiki.fasterxml.com/JacksonJsonViews + * @param jsonView marker class to specify properties to be included during marshalling. + * See also http://wiki.fasterxml.com/JacksonJsonViews */ public JacksonXMLDataFormat(Class<?> unmarshalType, Class<?> jsonView) { this(unmarshalType, jsonView, true); } - + /** * Use the default Jackson {@link XmlMapper} and with a custom * unmarshal type and JSON view * - * @param unmarshalType the custom unmarshal type - * @param jsonView marker class to specify properties to be included during marshalling. - * See also http://wiki.fasterxml.com/JacksonJsonViews + * @param unmarshalType the custom unmarshal type + * @param jsonView marker class to specify properties to be included during marshalling. + * See also http://wiki.fasterxml.com/JacksonJsonViews * @param enableJaxbAnnotationModule if it is true, will enable the JaxbAnnotationModule. */ public JacksonXMLDataFormat(Class<?> unmarshalType, Class<?> jsonView, boolean enableJaxbAnnotationModule) { @@ -130,8 +129,8 @@ public class JacksonXMLDataFormat extends ServiceSupport implements DataFormat, * * @param mapper the custom mapper * @param unmarshalType the custom unmarshal type - * @param jsonView marker class to specify properties to be included during marshalling. - * See also http://wiki.fasterxml.com/JacksonJsonViews + * @param jsonView marker class to specify properties to be included during marshalling. + * See also http://wiki.fasterxml.com/JacksonJsonViews */ public JacksonXMLDataFormat(XmlMapper mapper, Class<?> unmarshalType, Class<?> jsonView) { this.xmlMapper = mapper; @@ -399,7 +398,7 @@ public class JacksonXMLDataFormat extends ServiceSupport implements DataFormat, @Override protected void doStart() throws Exception { - + if (enableJaxbAnnotationModule) { // Enables JAXB processing JaxbAnnotationModule module = new JaxbAnnotationModule(); http://git-wip-us.apache.org/repos/asf/camel/blob/5c956443/components/camel-jacksonxml/src/main/java/org/apache/camel/component/jacksonxml/ListJacksonXMLDataFormat.java ---------------------------------------------------------------------- diff --git a/components/camel-jacksonxml/src/main/java/org/apache/camel/component/jacksonxml/ListJacksonXMLDataFormat.java b/components/camel-jacksonxml/src/main/java/org/apache/camel/component/jacksonxml/ListJacksonXMLDataFormat.java index f88cdf9..51b8490 100644 --- a/components/camel-jacksonxml/src/main/java/org/apache/camel/component/jacksonxml/ListJacksonXMLDataFormat.java +++ b/components/camel-jacksonxml/src/main/java/org/apache/camel/component/jacksonxml/ListJacksonXMLDataFormat.java @@ -36,7 +36,7 @@ public class ListJacksonXMLDataFormat extends JacksonXMLDataFormat { super(unmarshalType, jsonView); useList(); } - + public ListJacksonXMLDataFormat(Class<?> unmarshalType, Class<?> jsonView, boolean enableJaxbAnnotationModule) { super(unmarshalType, jsonView, enableJaxbAnnotationModule); useList(); http://git-wip-us.apache.org/repos/asf/camel/blob/5c956443/components/camel-jacksonxml/src/main/java/org/apache/camel/component/jacksonxml/converter/JacksonXMLTypeConverters.java ---------------------------------------------------------------------- diff --git a/components/camel-jacksonxml/src/main/java/org/apache/camel/component/jacksonxml/converter/JacksonXMLTypeConverters.java b/components/camel-jacksonxml/src/main/java/org/apache/camel/component/jacksonxml/converter/JacksonXMLTypeConverters.java index 922e69e..cc70801 100644 --- a/components/camel-jacksonxml/src/main/java/org/apache/camel/component/jacksonxml/converter/JacksonXMLTypeConverters.java +++ b/components/camel-jacksonxml/src/main/java/org/apache/camel/component/jacksonxml/converter/JacksonXMLTypeConverters.java @@ -19,15 +19,14 @@ package org.apache.camel.component.jacksonxml.converter; import java.util.Map; import java.util.Set; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.dataformat.xml.XmlMapper; import org.apache.camel.Exchange; import org.apache.camel.FallbackConverter; import org.apache.camel.component.jacksonxml.JacksonXMLConstants; import org.apache.camel.spi.Registry; import org.apache.camel.spi.TypeConverterRegistry; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.dataformat.xml.XmlMapper; - public final class JacksonXMLTypeConverters { private final XmlMapper defaultMapper = new XmlMapper(); http://git-wip-us.apache.org/repos/asf/camel/blob/5c956443/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConcurrentTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConcurrentTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConcurrentTest.java index 90d5530..9dbc9db 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConcurrentTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConcurrentTest.java @@ -21,12 +21,11 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.model.dataformat.JsonLibrary; import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Test; /** - * @version + * @version */ public class JacksonConcurrentTest extends CamelTestSupport { http://git-wip-us.apache.org/repos/asf/camel/blob/5c956443/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConversionsSimpleTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConversionsSimpleTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConversionsSimpleTest.java index 53f71f7..86222a5 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConversionsSimpleTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConversionsSimpleTest.java @@ -21,7 +21,6 @@ import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.Exchange; -import org.apache.camel.component.jacksonxml.JacksonXMLConstants; import org.apache.camel.impl.DefaultExchange; import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/camel/blob/5c956443/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConversionsTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConversionsTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConversionsTest.java index ffbdeb3..721b3e1 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConversionsTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonConversionsTest.java @@ -21,7 +21,6 @@ import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.jacksonxml.JacksonXMLConstants; import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/camel/blob/5c956443/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonIncludeDefaultTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonIncludeDefaultTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonIncludeDefaultTest.java index 095ae45..7499765 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonIncludeDefaultTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonIncludeDefaultTest.java @@ -43,7 +43,7 @@ public class JacksonIncludeDefaultTest extends CamelTestSupport { @Override public void configure() throws Exception { - JacksonXMLDataFormat format = new JacksonXMLDataFormat(); + JacksonXMLDataFormat format = new JacksonXMLDataFormat(); from("direct:marshal").marshal(format).to("mock:marshal"); } http://git-wip-us.apache.org/repos/asf/camel/blob/5c956443/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonIncludeNotNulllTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonIncludeNotNulllTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonIncludeNotNulllTest.java index 9ba76d2..b99b6c1 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonIncludeNotNulllTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonIncludeNotNulllTest.java @@ -43,7 +43,7 @@ public class JacksonIncludeNotNulllTest extends CamelTestSupport { @Override public void configure() throws Exception { - JacksonXMLDataFormat format = new JacksonXMLDataFormat(); + JacksonXMLDataFormat format = new JacksonXMLDataFormat(); format.setInclude("NON_NULL"); from("direct:marshal").marshal(format).to("mock:marshal"); http://git-wip-us.apache.org/repos/asf/camel/blob/5c956443/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonJAXBAnnotationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonJAXBAnnotationTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonJAXBAnnotationTest.java index f5c0ac5..a94d895 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonJAXBAnnotationTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonJAXBAnnotationTest.java @@ -49,7 +49,7 @@ public class JacksonJAXBAnnotationTest extends CamelTestSupport { @Override public void configure() throws Exception { - JacksonXMLDataFormat format = new JacksonXMLDataFormat(); + JacksonXMLDataFormat format = new JacksonXMLDataFormat(); from("direct:in").marshal(format); from("direct:back").unmarshal(format).to("mock:reverse"); http://git-wip-us.apache.org/repos/asf/camel/blob/5c956443/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonJsonDataFormatTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonJsonDataFormatTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonJsonDataFormatTest.java index 45e3ba9..f657793 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonJsonDataFormatTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonJsonDataFormatTest.java @@ -17,7 +17,6 @@ package org.apache.camel.component.jacksonxml; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.model.dataformat.JsonLibrary; public class JacksonJsonDataFormatTest extends JacksonMarshalTest { http://git-wip-us.apache.org/repos/asf/camel/blob/5c956443/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalTest.java index 998a2e0..5de0001 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalTest.java @@ -90,7 +90,7 @@ public class JacksonMarshalTest extends CamelTestSupport { @Override public void configure() throws Exception { - JacksonXMLDataFormat format = new JacksonXMLDataFormat(); + JacksonXMLDataFormat format = new JacksonXMLDataFormat(); from("direct:in").marshal(format); from("direct:back").unmarshal(format).to("mock:reverse"); http://git-wip-us.apache.org/repos/asf/camel/blob/5c956443/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalUnmarshalListTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalUnmarshalListTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalUnmarshalListTest.java index 9c418b5..7008ee7 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalUnmarshalListTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalUnmarshalListTest.java @@ -71,7 +71,7 @@ public class JacksonMarshalUnmarshalListTest extends CamelTestSupport { @Override public void configure() throws Exception { - JacksonXMLDataFormat format = new JacksonXMLDataFormat(TestPojo.class); + JacksonXMLDataFormat format = new JacksonXMLDataFormat(TestPojo.class); format.useList(); from("direct:backPojo").unmarshal(format).to("mock:reversePojo"); http://git-wip-us.apache.org/repos/asf/camel/blob/5c956443/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalUnmarshalTypeHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalUnmarshalTypeHeaderTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalUnmarshalTypeHeaderTest.java index 61436e3..56e3b35 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalUnmarshalTypeHeaderTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalUnmarshalTypeHeaderTest.java @@ -17,7 +17,6 @@ package org.apache.camel.component.jacksonxml; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.jacksonxml.JacksonXMLConstants; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Test; @@ -46,7 +45,7 @@ public class JacksonMarshalUnmarshalTypeHeaderTest extends CamelTestSupport { @Override public void configure() throws Exception { - JacksonXMLDataFormat format = new JacksonXMLDataFormat(); + JacksonXMLDataFormat format = new JacksonXMLDataFormat(); from("direct:backPojo").unmarshal(format).to("mock:reversePojo"); http://git-wip-us.apache.org/repos/asf/camel/blob/5c956443/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalViewTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalViewTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalViewTest.java index 40bf4ca..8485bcd 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalViewTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalViewTest.java @@ -18,7 +18,6 @@ package org.apache.camel.component.jacksonxml; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.model.dataformat.JsonLibrary; import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/camel/blob/5c956443/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonModuleRefTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonModuleRefTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonModuleRefTest.java index 30e3f77..f522034 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonModuleRefTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonModuleRefTest.java @@ -34,7 +34,7 @@ public class JacksonModuleRefTest extends JacksonModuleTest { @Override public void configure() throws Exception { - JacksonXMLDataFormat format = new JacksonXMLDataFormat(); + JacksonXMLDataFormat format = new JacksonXMLDataFormat(); format.setInclude("NON_NULL"); format.setModuleRefs("myJacksonModule"); http://git-wip-us.apache.org/repos/asf/camel/blob/5c956443/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonModuleTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonModuleTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonModuleTest.java index af3dd4f..6d97810 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonModuleTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonModuleTest.java @@ -44,7 +44,7 @@ public class JacksonModuleTest extends CamelTestSupport { @Override public void configure() throws Exception { - JacksonXMLDataFormat format = new JacksonXMLDataFormat(); + JacksonXMLDataFormat format = new JacksonXMLDataFormat(); format.setInclude("NON_NULL"); format.setModuleClassNames("org.apache.camel.component.jacksonxml.MyModule"); http://git-wip-us.apache.org/repos/asf/camel/blob/5c956443/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonObjectListSplitTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonObjectListSplitTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonObjectListSplitTest.java index fc53e7b..4a6ea19 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonObjectListSplitTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonObjectListSplitTest.java @@ -37,13 +37,13 @@ public class JacksonObjectListSplitTest extends CamelTestSupport { @Override public void configure() throws Exception { // you can specify the pojo class type for unmarshal the jason file - JacksonXMLDataFormat format = new JacksonXMLDataFormat(DummyObject.class); + JacksonXMLDataFormat format = new JacksonXMLDataFormat(DummyObject.class); format.useList(); from("direct:start").unmarshal(format).split(body()).to("mock:result"); } }; } - + public static class DummyObject { private String dummy; http://git-wip-us.apache.org/repos/asf/camel/blob/5c956443/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonEnableFeatureTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonEnableFeatureTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonEnableFeatureTest.java index dec3f0b..c61ce7f 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonEnableFeatureTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonEnableFeatureTest.java @@ -22,7 +22,7 @@ import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; /** - * @version + * @version */ public class SpringJacksonEnableFeatureTest extends CamelSpringTestSupport { http://git-wip-us.apache.org/repos/asf/camel/blob/5c956443/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonJsonDataFormatTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonJsonDataFormatTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonJsonDataFormatTest.java index a33c10d..5b4bb8a 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonJsonDataFormatTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonJsonDataFormatTest.java @@ -26,7 +26,7 @@ import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; /** - * @version + * @version */ public class SpringJacksonJsonDataFormatTest extends CamelSpringTestSupport { http://git-wip-us.apache.org/repos/asf/camel/blob/5c956443/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonMarshalUnmarshalListTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonMarshalUnmarshalListTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonMarshalUnmarshalListTest.java index 01750a9..e620dca 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonMarshalUnmarshalListTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonMarshalUnmarshalListTest.java @@ -25,7 +25,7 @@ import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; /** - * @version + * @version */ public class SpringJacksonMarshalUnmarshalListTest extends CamelSpringTestSupport { http://git-wip-us.apache.org/repos/asf/camel/blob/5c956443/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/Views.java ---------------------------------------------------------------------- diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/Views.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/Views.java index ccbcc12..4b16f24 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/Views.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/Views.java @@ -19,7 +19,10 @@ package org.apache.camel.component.jacksonxml; //START SNIPPET: marker public class Views { - static class Age { } - static class Weight { } + static class Age { + } + + static class Weight { + } } //END SNIPPET: marker http://git-wip-us.apache.org/repos/asf/camel/blob/5c956443/components/camel-jacksonxml/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-jacksonxml/src/test/resources/log4j.properties b/components/camel-jacksonxml/src/test/resources/log4j.properties index 52125b6..520300f 100644 --- a/components/camel-jacksonxml/src/test/resources/log4j.properties +++ b/components/camel-jacksonxml/src/test/resources/log4j.properties @@ -32,5 +32,5 @@ log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m% log4j.appender.file=org.apache.log4j.FileAppender log4j.appender.file.layout=org.apache.log4j.PatternLayout log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n -log4j.appender.file.file=target/camel-jackson-test.log +log4j.appender.file.file=target/camel-jacksonxml-test.log log4j.appender.file.append=true
