You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2016/06/17 08:17:33 UTC
[1/3] camel git commit: CAMEL-10061: Add JSON Johnzon DataFormat
Repository: camel
Updated Branches:
refs/heads/master 6cb7b85f8 -> d30d78429
CAMEL-10061: Add JSON Johnzon DataFormat
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8200174c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8200174c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8200174c
Branch: refs/heads/master
Commit: 8200174c2ddf2c8f830730f2c130b9851019c41d
Parents: 6cb7b85
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Jun 16 11:52:10 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Jun 17 09:42:35 2016 +0200
----------------------------------------------------------------------
apache-camel/pom.xml | 4 +
.../src/main/descriptors/common-bin.xml | 1 +
.../camel/model/dataformat/JsonDataFormat.java | 4 +-
.../camel/model/dataformat/JsonLibrary.java | 2 +-
components/camel-johnzon/pom.xml | 77 ++++++
.../component/johnzon/JohnzonConstants.java | 25 ++
.../component/johnzon/JohnzonDataFormat.java | 220 +++++++++++++++++
.../JohnzonDataFormatAutoConfiguration.java | 55 +++++
.../JohnzonDataFormatConfiguration.java | 245 +++++++++++++++++++
.../src/main/resources/META-INF/LICENSE.txt | 203 +++++++++++++++
.../src/main/resources/META-INF/NOTICE.txt | 11 +
.../org/apache/camel/dataformat/json-johnzon | 18 ++
.../main/resources/META-INF/spring.factories | 19 ++
.../johnzon/JohnzonAttributeOrderTest.java | 76 ++++++
.../johnzon/JohnzonDataFormatTest.java | 80 ++++++
.../johnzon/JohnzonJsonDataFormatTest.java | 38 +++
.../component/johnzon/JohnzonMarshalTest.java | 86 +++++++
.../component/johnzon/JohnzonSkipNullTest.java | 55 +++++
.../camel/component/johnzon/NumberPojo.java | 134 ++++++++++
.../SpringJohnzonJsonDataFormatTest.java | 76 ++++++
.../camel/component/johnzon/TestOtherPojo.java | 40 +++
.../camel/component/johnzon/TestPojo.java | 45 ++++
.../src/test/resources/log4j.properties | 36 +++
.../johnzon/SpringJohnzonJsonDataFormatTest.xml | 61 +++++
components/pom.xml | 1 +
parent/pom.xml | 5 +
.../maven/packaging/PackageDataFormatMojo.java | 4 +-
27 files changed, 1618 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8200174c/apache-camel/pom.xml
----------------------------------------------------------------------
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 8f2d51e..8e9d4c4 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -469,6 +469,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-johnzon</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-josql</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/8200174c/apache-camel/src/main/descriptors/common-bin.xml
----------------------------------------------------------------------
diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index 2858d54..af39760 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -129,6 +129,7 @@
<include>org.apache.camel:camel-jms</include>
<include>org.apache.camel:camel-jmx</include>
<include>org.apache.camel:camel-jolt</include>
+ <include>org.apache.camel:camel-johnzon</include>
<include>org.apache.camel:camel-josql</include>
<include>org.apache.camel:camel-jpa</include>
<include>org.apache.camel:camel-jsch</include>
http://git-wip-us.apache.org/repos/asf/camel/blob/8200174c/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
index e64f9e7..d28c423 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
@@ -315,8 +315,10 @@ public class JsonDataFormat extends DataFormatDefinition {
setProperty(routeContext.getCamelContext(), this, "dataFormatName", "json-xstream");
} else if (library == JsonLibrary.Jackson) {
setProperty(routeContext.getCamelContext(), this, "dataFormatName", "json-jackson");
- } else {
+ } else if (library == JsonLibrary.Gson){
setProperty(routeContext.getCamelContext(), this, "dataFormatName", "json-gson");
+ } else {
+ setProperty(routeContext.getCamelContext(), this, "dataFormatName", "json-johnzon");
}
if (unmarshalType == null && unmarshalTypeName != null) {
http://git-wip-us.apache.org/repos/asf/camel/blob/8200174c/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonLibrary.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonLibrary.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonLibrary.java
index b95f1fb..1263f60 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonLibrary.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonLibrary.java
@@ -28,6 +28,6 @@ import javax.xml.bind.annotation.XmlType;
@XmlEnum
public enum JsonLibrary {
- XStream, Jackson, Gson
+ XStream, Jackson, Johnzon, Gson
}
http://git-wip-us.apache.org/repos/asf/camel/blob/8200174c/components/camel-johnzon/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-johnzon/pom.xml b/components/camel-johnzon/pom.xml
new file mode 100644
index 0000000..a15b9f6
--- /dev/null
+++ b/components/camel-johnzon/pom.xml
@@ -0,0 +1,77 @@
+<?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.
+-->
+<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>
+
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>components</artifactId>
+ <version>2.18-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>camel-johnzon</artifactId>
+ <packaging>jar</packaging>
+ <name>Camel :: Johnzon</name>
+ <description>Camel Johnzon support</description>
+
+ <properties>
+ <camel.osgi.export.pkg>org.apache.camel.component.johnzon.*</camel.osgi.export.pkg>
+ <camel.osgi.export.service>org.apache.camel.spi.DataFormatResolver;dataformat=json-johnzon</camel.osgi.export.service>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.johnzon</groupId>
+ <artifactId>johnzon-core</artifactId>
+ <version>0.9.3-incubating</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.johnzon</groupId>
+ <artifactId>johnzon-mapper</artifactId>
+ <version>0.9.3-incubating</version>
+ </dependency>
+<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-json_1.0_spec</artifactId>
+ <version>1.0-alpha-1</version>
+ <scope>compile</scope> <!-- or compile if your environment doesn't provide it -->
+</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>
+
+</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/8200174c/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/JohnzonConstants.java
----------------------------------------------------------------------
diff --git a/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/JohnzonConstants.java b/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/JohnzonConstants.java
new file mode 100644
index 0000000..1ec3044
--- /dev/null
+++ b/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/JohnzonConstants.java
@@ -0,0 +1,25 @@
+/**
+ * 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.johnzon;
+
+public final class JohnzonConstants {
+
+ public static final String UNMARSHAL_TYPE = "CamelJohnzonUnmarshalType";
+
+ private JohnzonConstants() {
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/8200174c/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/JohnzonDataFormat.java
----------------------------------------------------------------------
diff --git a/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/JohnzonDataFormat.java b/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/JohnzonDataFormat.java
new file mode 100644
index 0000000..cdaaa27
--- /dev/null
+++ b/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/JohnzonDataFormat.java
@@ -0,0 +1,220 @@
+/**
+ * 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.johnzon;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Comparator;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.CamelContextAware;
+import org.apache.camel.Exchange;
+import org.apache.camel.spi.DataFormat;
+import org.apache.camel.spi.DataFormatName;
+import org.apache.camel.support.ServiceSupport;
+import org.apache.camel.util.ObjectHelper;
+import org.apache.johnzon.mapper.Mapper;
+import org.apache.johnzon.mapper.MapperBuilder;
+import org.apache.johnzon.mapper.reflection.JohnzonParameterizedType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * A <a href="http://camel.apache.org/data-format.html">data format</a> ({@link DataFormat})
+ * using <a href="http://johnzon.apache.org/">Johnzon</a> to marshal to and from JSON.
+ */
+public class JohnzonDataFormat extends ServiceSupport implements DataFormat, DataFormatName, CamelContextAware {
+
+ private static final Logger LOG = LoggerFactory.getLogger(JohnzonDataFormat.class);
+
+ private CamelContext camelContext;
+ private Mapper objectMapper;
+ private Class<?> unmarshalType;
+ private JohnzonParameterizedType parameterizedType;
+ private Comparator<String> attributeOrder;
+ private boolean pretty;
+ private String encoding;
+ private boolean skipEmptyArray;
+ private boolean skipNull;
+
+ public JohnzonDataFormat() {
+ this(Object.class);
+ }
+
+ /**
+ * Use the default Johnzon {@link Mapper} and with a custom
+ * unmarshal type
+ *
+ * @param unmarshalType the custom unmarshal type
+ */
+ public JohnzonDataFormat(Class<?> unmarshalType) {
+ this(null, unmarshalType);
+ }
+
+ /**
+ * Use the default Johnzon {@link Mapper} and with a custom
+ * unmarshal type
+ *
+ * @param unmarshalType the custom unmarshal type
+ */
+ public JohnzonDataFormat(JohnzonParameterizedType parameterizedType) {
+ this(null, parameterizedType);
+ }
+
+ /**
+ * Use a custom Johnzon mapper and unmarshal type
+ *
+ * @param mapper the custom mapper
+ * @param unmarshalType the custom unmarshal type
+ */
+ public JohnzonDataFormat(Mapper mapper, Class<?> unmarshalType) {
+ this.objectMapper = mapper;
+ this.unmarshalType = unmarshalType;
+ }
+
+ /**
+ * Use a custom Johnzon mapper and unmarshal type
+ *
+ * @param mapper the custom mapper
+ * @param parameterizedType the JohnzonParameterizedType type
+ */
+ public JohnzonDataFormat(Mapper mapper, JohnzonParameterizedType parameterizedType) {
+ this.objectMapper = mapper;
+ this.parameterizedType = parameterizedType;
+ }
+
+ @Override
+ public void setCamelContext(CamelContext camelContext) {
+ this.camelContext = camelContext;
+ }
+
+ @Override
+ public CamelContext getCamelContext() {
+ return camelContext;
+ }
+
+ @Override
+ public String getDataFormatName() {
+ return "json-johnzon";
+ }
+
+ public Mapper getObjectMapper() {
+ return objectMapper;
+ }
+
+ public void setObjectMapper(Mapper objectMapper) {
+ this.objectMapper = objectMapper;
+ }
+
+ public Class<?> getUnmarshalType() {
+ return unmarshalType;
+ }
+
+ public void setUnmarshalType(Class<?> unmarshalType) {
+ this.unmarshalType = unmarshalType;
+ }
+
+ public JohnzonParameterizedType getParameterizedType() {
+ return parameterizedType;
+ }
+
+ public void setParameterizedType(JohnzonParameterizedType parameterizedType) {
+ this.parameterizedType = parameterizedType;
+ }
+
+ public boolean isPretty() {
+ return pretty;
+ }
+
+ public void setPretty(boolean pretty) {
+ this.pretty = pretty;
+ }
+
+ public String getEncoding() {
+ return encoding;
+ }
+
+ public void setEncoding(String encoding) {
+ this.encoding = encoding;
+ }
+
+ public boolean isSkipEmptyArray() {
+ return skipEmptyArray;
+ }
+
+ public void setSkipEmptyArray(boolean skipEmptyArray) {
+ this.skipEmptyArray = skipEmptyArray;
+ }
+
+ public boolean isSkipNull() {
+ return skipNull;
+ }
+
+ public void setSkipNull(boolean skipNull) {
+ this.skipNull = skipNull;
+ }
+
+ public Comparator<String> getAttributeOrder() {
+ return attributeOrder;
+ }
+
+ public void setAttributeOrder(Comparator<String> attributeOrder) {
+ this.attributeOrder = attributeOrder;
+ }
+
+ @Override
+ public void marshal(Exchange exchange, Object graph, OutputStream stream) throws Exception {
+ objectMapper.writeObject(graph, stream);
+ }
+
+ @Override
+ public Object unmarshal(Exchange exchange, InputStream stream) throws Exception {
+ // is there a header with the unmarshal type?
+ Class<?> clazz = unmarshalType;
+ String type = exchange.getIn().getHeader(JohnzonConstants.UNMARSHAL_TYPE, String.class);
+ if (type != null) {
+ clazz = exchange.getContext().getClassResolver().resolveMandatoryClass(type);
+ }
+ if (parameterizedType != null) {
+ return this.objectMapper.readCollection(stream, parameterizedType);
+ } else {
+ return this.objectMapper.readObject(stream, clazz);
+ }
+ }
+
+ @Override
+ protected void doStart() throws Exception {
+ if (objectMapper == null) {
+ MapperBuilder builder = new MapperBuilder();
+ builder.setPretty(pretty);
+ builder.setSkipNull(skipNull);
+ builder.setSkipEmptyArray(skipEmptyArray);
+ if (ObjectHelper.isNotEmpty(encoding)) {
+ builder.setEncoding(encoding);
+ }
+ if (ObjectHelper.isNotEmpty(attributeOrder)) {
+ builder.setAttributeOrder(attributeOrder);
+ }
+ objectMapper = new MapperBuilder().build();
+ }
+ }
+
+ @Override
+ protected void doStop() throws Exception {
+ // noop
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/8200174c/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatAutoConfiguration.java b/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatAutoConfiguration.java
new file mode 100644
index 0000000..0c50878
--- /dev/null
+++ b/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatAutoConfiguration.java
@@ -0,0 +1,55 @@
+/**
+ * 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.johnzon.springboot;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.camel.CamelContext;
+import org.apache.camel.CamelContextAware;
+import org.apache.camel.component.johnzon.JohnzonDataFormat;
+import org.apache.camel.util.IntrospectionSupport;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Generated by camel-package-maven-plugin - do not edit this file!
+ */
+@Configuration
+@EnableConfigurationProperties(JohnzonDataFormatConfiguration.class)
+public class JohnzonDataFormatAutoConfiguration {
+
+ @Bean
+ @ConditionalOnClass(CamelContext.class)
+ @ConditionalOnMissingBean(JohnzonDataFormat.class)
+ public JohnzonDataFormat configureJohnzonDataFormat(
+ CamelContext camelContext,
+ JohnzonDataFormatConfiguration configuration) throws Exception {
+ JohnzonDataFormat dataformat = new JohnzonDataFormat();
+ if (dataformat instanceof CamelContextAware) {
+ ((CamelContextAware) dataformat).setCamelContext(camelContext);
+ }
+ Map<String, Object> parameters = new HashMap<>();
+ IntrospectionSupport.getProperties(configuration, parameters, null,
+ false);
+ IntrospectionSupport.setProperties(camelContext,
+ camelContext.getTypeConverter(), dataformat, parameters);
+ return dataformat;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/8200174c/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatConfiguration.java b/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatConfiguration.java
new file mode 100644
index 0000000..1e81633
--- /dev/null
+++ b/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatConfiguration.java
@@ -0,0 +1,245 @@
+/**
+ * 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.johnzon.springboot;
+
+import org.apache.camel.component.johnzon.JohnzonDataFormat;
+import org.apache.camel.model.dataformat.JsonLibrary;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * Camel Johnzon support
+ *
+ * Generated by camel-package-maven-plugin - do not edit this file!
+ */
+@ConfigurationProperties(prefix = "camel.dataformat.json")
+public class JohnzonDataFormatConfiguration {
+
+ /**
+ * Lookup and use the existing ObjectMapper with the given id when using
+ * Jackson.
+ */
+ private String objectMapper;
+ /**
+ * To enable pretty printing output nicely formatted. Is by default false.
+ */
+ private Boolean prettyPrint = false;
+ /**
+ * Which json library to use such.
+ */
+ private JsonLibrary library = JsonLibrary.XStream;
+ /**
+ * Class name of the java type to use when unarmshalling
+ */
+ private String unmarshalTypeName;
+ /**
+ * When marshalling a POJO to JSON you might want to exclude certain fields
+ * from the JSON output. With Jackson you can use JSON views to accomplish
+ * this. This option is to refer to the class which has JsonView annotations
+ */
+ private Class jsonView;
+ /**
+ * If you want to marshal a pojo to JSON and the pojo has some fields with
+ * null values. And you want to skip these null values you can set this
+ * option to NOT_NULL
+ */
+ private String include;
+ /**
+ * Used for JMS users to allow the JMSType header from the JMS spec to
+ * specify a FQN classname to use to unmarshal to.
+ */
+ private Boolean allowJmsType = false;
+ /**
+ * Refers to a custom collection type to lookup in the registry to use. This
+ * option should rarely be used but allows to use different collection types
+ * than java.util.Collection based as default.
+ */
+ private String collectionTypeName;
+ /**
+ * To unarmshal to a List of Map or a List of Pojo.
+ */
+ private Boolean useList = false;
+ /**
+ * Whether to enable the JAXB annotations module when using jackson. When
+ * enabled then JAXB annotations can be used by Jackson.
+ */
+ private Boolean enableJaxbAnnotationModule = false;
+ /**
+ * To use custom Jackson modules com.fasterxml.jackson.databind.Module
+ * specified as a String with FQN class names. Multiple classes can be
+ * separated by comma.
+ */
+ private String moduleClassNames;
+ /**
+ * To use custom Jackson modules referred from the Camel registry. Multiple
+ * modules can be separated by comma.
+ */
+ private String moduleRefs;
+ /**
+ * Set of features to enable on the Jackson
+ * com.fasterxml.jackson.databind.ObjectMapper. The features should be a
+ * name that matches a enum from
+ * com.fasterxml.jackson.databind.SerializationFeature
+ * com.fasterxml.jackson.databind.DeserializationFeature or
+ * com.fasterxml.jackson.databind.MapperFeature Multiple features can be
+ * separated by comma
+ */
+ private String enableFeatures;
+ /**
+ * Set of features to disable on the Jackson
+ * com.fasterxml.jackson.databind.ObjectMapper. The features should be a
+ * name that matches a enum from
+ * com.fasterxml.jackson.databind.SerializationFeature
+ * com.fasterxml.jackson.databind.DeserializationFeature or
+ * com.fasterxml.jackson.databind.MapperFeature Multiple features can be
+ * separated by comma
+ */
+ private String disableFeatures;
+ /**
+ * Adds permissions that controls which Java packages and classes XStream is
+ * allowed to use during unmarshal from xml/json to Java beans. A permission
+ * must be configured either here or globally using a JVM system property.
+ * The permission can be specified in a syntax where a plus sign is allow
+ * and minus sign is deny. Wildcards is supported by using . as prefix. For
+ * example to allow com.foo and all subpackages then specfy com.foo..
+ * Multiple permissions can be configured separated by comma such as
+ * com.foo.-com.foo.bar.MySecretBean. The following default permission is
+ * always included: -java.lang.java.util. unless its overridden by
+ * specifying a JVM system property with they key
+ * org.apache.camel.xstream.permissions.
+ */
+ private String permissions;
+
+ public String getObjectMapper() {
+ return objectMapper;
+ }
+
+ public void setObjectMapper(String objectMapper) {
+ this.objectMapper = objectMapper;
+ }
+
+ public Boolean getPrettyPrint() {
+ return prettyPrint;
+ }
+
+ public void setPrettyPrint(Boolean prettyPrint) {
+ this.prettyPrint = prettyPrint;
+ }
+
+ public JsonLibrary getLibrary() {
+ return library;
+ }
+
+ public void setLibrary(JsonLibrary library) {
+ this.library = library;
+ }
+
+ public String getUnmarshalTypeName() {
+ return unmarshalTypeName;
+ }
+
+ public void setUnmarshalTypeName(String unmarshalTypeName) {
+ this.unmarshalTypeName = unmarshalTypeName;
+ }
+
+ public Class getJsonView() {
+ return jsonView;
+ }
+
+ public void setJsonView(Class jsonView) {
+ this.jsonView = jsonView;
+ }
+
+ public String getInclude() {
+ return include;
+ }
+
+ public void setInclude(String include) {
+ this.include = include;
+ }
+
+ public Boolean getAllowJmsType() {
+ return allowJmsType;
+ }
+
+ public void setAllowJmsType(Boolean allowJmsType) {
+ this.allowJmsType = allowJmsType;
+ }
+
+ public String getCollectionTypeName() {
+ return collectionTypeName;
+ }
+
+ public void setCollectionTypeName(String collectionTypeName) {
+ this.collectionTypeName = collectionTypeName;
+ }
+
+ public Boolean getUseList() {
+ return useList;
+ }
+
+ public void setUseList(Boolean useList) {
+ this.useList = useList;
+ }
+
+ public Boolean getEnableJaxbAnnotationModule() {
+ return enableJaxbAnnotationModule;
+ }
+
+ public void setEnableJaxbAnnotationModule(Boolean enableJaxbAnnotationModule) {
+ this.enableJaxbAnnotationModule = enableJaxbAnnotationModule;
+ }
+
+ public String getModuleClassNames() {
+ return moduleClassNames;
+ }
+
+ public void setModuleClassNames(String moduleClassNames) {
+ this.moduleClassNames = moduleClassNames;
+ }
+
+ public String getModuleRefs() {
+ return moduleRefs;
+ }
+
+ public void setModuleRefs(String moduleRefs) {
+ this.moduleRefs = moduleRefs;
+ }
+
+ public String getEnableFeatures() {
+ return enableFeatures;
+ }
+
+ public void setEnableFeatures(String enableFeatures) {
+ this.enableFeatures = enableFeatures;
+ }
+
+ public String getDisableFeatures() {
+ return disableFeatures;
+ }
+
+ public void setDisableFeatures(String disableFeatures) {
+ this.disableFeatures = disableFeatures;
+ }
+
+ public String getPermissions() {
+ return permissions;
+ }
+
+ public void setPermissions(String permissions) {
+ this.permissions = permissions;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/8200174c/components/camel-johnzon/src/main/resources/META-INF/LICENSE.txt
----------------------------------------------------------------------
diff --git a/components/camel-johnzon/src/main/resources/META-INF/LICENSE.txt b/components/camel-johnzon/src/main/resources/META-INF/LICENSE.txt
new file mode 100755
index 0000000..6b0b127
--- /dev/null
+++ b/components/camel-johnzon/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
+
http://git-wip-us.apache.org/repos/asf/camel/blob/8200174c/components/camel-johnzon/src/main/resources/META-INF/NOTICE.txt
----------------------------------------------------------------------
diff --git a/components/camel-johnzon/src/main/resources/META-INF/NOTICE.txt b/components/camel-johnzon/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000..2e215bf
--- /dev/null
+++ b/components/camel-johnzon/src/main/resources/META-INF/NOTICE.txt
@@ -0,0 +1,11 @@
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for the Apache Camel distribution. ==
+ =========================================================================
+
+ This product includes software developed by
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Please read the different LICENSE files present in the licenses directory of
+ this distribution.
http://git-wip-us.apache.org/repos/asf/camel/blob/8200174c/components/camel-johnzon/src/main/resources/META-INF/services/org/apache/camel/dataformat/json-johnzon
----------------------------------------------------------------------
diff --git a/components/camel-johnzon/src/main/resources/META-INF/services/org/apache/camel/dataformat/json-johnzon b/components/camel-johnzon/src/main/resources/META-INF/services/org/apache/camel/dataformat/json-johnzon
new file mode 100644
index 0000000..02493ea
--- /dev/null
+++ b/components/camel-johnzon/src/main/resources/META-INF/services/org/apache/camel/dataformat/json-johnzon
@@ -0,0 +1,18 @@
+#
+# 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.
+#
+
+class=org.apache.camel.component.johnzon.JohnzonDataFormat
http://git-wip-us.apache.org/repos/asf/camel/blob/8200174c/components/camel-johnzon/src/main/resources/META-INF/spring.factories
----------------------------------------------------------------------
diff --git a/components/camel-johnzon/src/main/resources/META-INF/spring.factories b/components/camel-johnzon/src/main/resources/META-INF/spring.factories
new file mode 100644
index 0000000..902da72
--- /dev/null
+++ b/components/camel-johnzon/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+org.apache.camel.component.johnzon.springboot.JohnzonDataFormatAutoConfiguration
http://git-wip-us.apache.org/repos/asf/camel/blob/8200174c/components/camel-johnzon/src/test/java/org/apache/camel/component/johnzon/JohnzonAttributeOrderTest.java
----------------------------------------------------------------------
diff --git a/components/camel-johnzon/src/test/java/org/apache/camel/component/johnzon/JohnzonAttributeOrderTest.java b/components/camel-johnzon/src/test/java/org/apache/camel/component/johnzon/JohnzonAttributeOrderTest.java
new file mode 100644
index 0000000..231374c
--- /dev/null
+++ b/components/camel-johnzon/src/test/java/org/apache/camel/component/johnzon/JohnzonAttributeOrderTest.java
@@ -0,0 +1,76 @@
+/**
+ * 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.johnzon;
+
+import java.math.BigDecimal;
+import java.util.Comparator;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+public class JohnzonAttributeOrderTest extends CamelTestSupport {
+
+ final String expectedJson = "{\"bool\":true,\"bg\":123.123,\"doubleNumber\":123.123,\"intNumber\":123,\"floatNumber\":123.0,\"longNumber\":123}";
+
+ @Test
+ public void testMarshalAndUnmarshalMap() throws Exception {
+ NumberPojo nc = new NumberPojo();
+ nc.setBg(new BigDecimal("123.123"));
+ nc.setDoubleNumber(123.123);
+ nc.setBool(true);
+ nc.setFloatNumber(123);
+ nc.setLongNumber(123L);
+ nc.setIntNumber(123);
+
+ MockEndpoint mock = getMockEndpoint("mock:reverse");
+ mock.expectedMessageCount(1);
+ mock.message(0).body().isInstanceOf(NumberPojo.class);
+ mock.message(0).body().isEqualTo(nc);
+
+ Object marshalled = template.requestBody("direct:in", nc);
+ String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled);
+ assertEquals(expectedJson, marshalledAsString);
+
+ template.sendBody("direct:back", marshalled);
+
+ mock.assertIsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+
+ @Override
+ public void configure() throws Exception {
+ final Comparator<String> attributeOrder = new Comparator<String>() {
+ @Override
+ public int compare(final String o1, final String o2) {
+ return expectedJson.indexOf(o1) - expectedJson.indexOf(o2);
+ }
+ };
+ JohnzonDataFormat format = new JohnzonDataFormat(NumberPojo.class);
+ format.setAttributeOrder(attributeOrder);
+
+ from("direct:in").marshal(format);
+ from("direct:back").unmarshal(format).to("mock:reverse");
+ }
+ };
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/8200174c/components/camel-johnzon/src/test/java/org/apache/camel/component/johnzon/JohnzonDataFormatTest.java
----------------------------------------------------------------------
diff --git a/components/camel-johnzon/src/test/java/org/apache/camel/component/johnzon/JohnzonDataFormatTest.java b/components/camel-johnzon/src/test/java/org/apache/camel/component/johnzon/JohnzonDataFormatTest.java
new file mode 100644
index 0000000..341f3dd
--- /dev/null
+++ b/components/camel-johnzon/src/test/java/org/apache/camel/component/johnzon/JohnzonDataFormatTest.java
@@ -0,0 +1,80 @@
+/**
+ * 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.johnzon;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.impl.DefaultExchange;
+import org.apache.johnzon.mapper.reflection.JohnzonParameterizedType;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class JohnzonDataFormatTest {
+
+ @Test
+ public void testString() throws Exception {
+ testJson("\"A string\"", "A string", String.class, null);
+ }
+
+ @Test
+ public void testMap() throws Exception {
+ testJson("{\"value\":123}", Collections.singletonMap("value", 123), Map.class, null);
+ }
+
+ @Test
+ public void testList() throws Exception {
+ JohnzonParameterizedType type = new JohnzonParameterizedType(List.class, Map.class);
+ testJson("[{\"value\":123}]",
+ new ArrayList<>(Collections.singletonList(Collections.singletonMap("value", 123))), null, type);
+ }
+
+ @Test
+ public void testArray() throws Exception {
+ testJson("{}", new ArrayList<>(), ArrayList.class, null);
+ }
+
+ @Test
+ public void testSkipEmptyArray() throws Exception {
+ JohnzonParameterizedType type = new JohnzonParameterizedType(ArrayList.class, ArrayList.class);
+ testJson("[{\"value\":123}]",
+ new ArrayList<>(Collections.singletonList(Collections.emptyList())), null, type);
+ }
+
+ private void testJson(String json, Object expected, Class<?> unmarshalType,
+ JohnzonParameterizedType parameterizedType) throws Exception {
+ Object unmarshalled;
+ JohnzonDataFormat johnzonDataFormat;
+ if (unmarshalType != null) {
+ johnzonDataFormat = new JohnzonDataFormat(unmarshalType);
+ } else {
+ johnzonDataFormat = new JohnzonDataFormat(parameterizedType);
+ }
+ johnzonDataFormat.setSkipEmptyArray(true);
+ johnzonDataFormat.doStart();
+ try (InputStream in = new ByteArrayInputStream(json.getBytes())) {
+ unmarshalled = johnzonDataFormat.unmarshal(new DefaultExchange(new DefaultCamelContext()), in);
+ }
+ assertEquals(expected, unmarshalled);
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/8200174c/components/camel-johnzon/src/test/java/org/apache/camel/component/johnzon/JohnzonJsonDataFormatTest.java
----------------------------------------------------------------------
diff --git a/components/camel-johnzon/src/test/java/org/apache/camel/component/johnzon/JohnzonJsonDataFormatTest.java b/components/camel-johnzon/src/test/java/org/apache/camel/component/johnzon/JohnzonJsonDataFormatTest.java
new file mode 100644
index 0000000..d0d1616
--- /dev/null
+++ b/components/camel-johnzon/src/test/java/org/apache/camel/component/johnzon/JohnzonJsonDataFormatTest.java
@@ -0,0 +1,38 @@
+/**
+ * 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.johnzon;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.dataformat.JsonLibrary;
+
+public class JohnzonJsonDataFormatTest extends JohnzonMarshalTest {
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:in").marshal().json(JsonLibrary.Johnzon);
+ from("direct:back").unmarshal().json(JsonLibrary.Johnzon).to("mock:reverse");
+
+ from("direct:inPojo").marshal().json(JsonLibrary.Johnzon);
+ from("direct:backPojo").unmarshal().json(JsonLibrary.Johnzon, TestPojo.class).to("mock:reversePojo");
+ }
+ };
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/8200174c/components/camel-johnzon/src/test/java/org/apache/camel/component/johnzon/JohnzonMarshalTest.java
----------------------------------------------------------------------
diff --git a/components/camel-johnzon/src/test/java/org/apache/camel/component/johnzon/JohnzonMarshalTest.java b/components/camel-johnzon/src/test/java/org/apache/camel/component/johnzon/JohnzonMarshalTest.java
new file mode 100644
index 0000000..08ee823
--- /dev/null
+++ b/components/camel-johnzon/src/test/java/org/apache/camel/component/johnzon/JohnzonMarshalTest.java
@@ -0,0 +1,86 @@
+/**
+ * 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.johnzon;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+public class JohnzonMarshalTest extends CamelTestSupport {
+
+ @Test
+ public void testMarshalAndUnmarshalMap() throws Exception {
+ Map<String, Object> in = new HashMap<String, Object>();
+ in.put("name", "Camel");
+
+ MockEndpoint mock = getMockEndpoint("mock:reverse");
+ mock.expectedMessageCount(1);
+ mock.message(0).body().isInstanceOf(Map.class);
+ mock.message(0).body().isEqualTo(in);
+
+ Object marshalled = template.requestBody("direct:in", in);
+ String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled);
+ assertEquals("{\"name\":\"Camel\"}", marshalledAsString);
+
+ template.sendBody("direct:back", marshalled);
+
+ mock.assertIsSatisfied();
+ }
+
+ @Test
+ public void testMarshalAndUnmarshalPojo() throws Exception {
+ TestPojo in = new TestPojo();
+ in.setName("Camel");
+
+ MockEndpoint mock = getMockEndpoint("mock:reversePojo");
+ mock.expectedMessageCount(1);
+ mock.message(0).body().isInstanceOf(TestPojo.class);
+ mock.message(0).body().isEqualTo(in);
+
+ Object marshalled = template.requestBody("direct:inPojo", in);
+ String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled);
+ assertEquals("{\"name\":\"Camel\"}", marshalledAsString);
+
+ template.sendBody("direct:backPojo", marshalled);
+
+ mock.assertIsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+
+ @Override
+ public void configure() throws Exception {
+ JohnzonDataFormat format = new JohnzonDataFormat();
+
+ from("direct:in").marshal(format);
+ from("direct:back").unmarshal(format).to("mock:reverse");
+
+ JohnzonDataFormat formatPojo = new JohnzonDataFormat(TestPojo.class);
+
+ from("direct:inPojo").marshal(formatPojo);
+ from("direct:backPojo").unmarshal(formatPojo).to("mock:reversePojo");
+ }
+ };
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/8200174c/components/camel-johnzon/src/test/java/org/apache/camel/component/johnzon/JohnzonSkipNullTest.java
----------------------------------------------------------------------
diff --git a/components/camel-johnzon/src/test/java/org/apache/camel/component/johnzon/JohnzonSkipNullTest.java b/components/camel-johnzon/src/test/java/org/apache/camel/component/johnzon/JohnzonSkipNullTest.java
new file mode 100644
index 0000000..3a0b241
--- /dev/null
+++ b/components/camel-johnzon/src/test/java/org/apache/camel/component/johnzon/JohnzonSkipNullTest.java
@@ -0,0 +1,55 @@
+/**
+ * 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.johnzon;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+public class JohnzonSkipNullTest extends CamelTestSupport {
+
+ @Test
+ public void testMmarshalPojo() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:marshal");
+ mock.expectedMessageCount(1);
+ mock.message(0).body(String.class).isEqualTo("{\"name\":\"Camel\"}");
+
+ TestOtherPojo pojo = new TestOtherPojo();
+ pojo.setName("Camel");
+ pojo.setCountry(null);
+
+ template.sendBody("direct:marshal", pojo);
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+
+ @Override
+ public void configure() throws Exception {
+ JohnzonDataFormat format = new JohnzonDataFormat();
+ format.setSkipNull(true);
+
+ from("direct:marshal").marshal(format).to("mock:marshal");
+ }
+ };
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/8200174c/components/camel-johnzon/src/test/java/org/apache/camel/component/johnzon/NumberPojo.java
----------------------------------------------------------------------
diff --git a/components/camel-johnzon/src/test/java/org/apache/camel/component/johnzon/NumberPojo.java b/components/camel-johnzon/src/test/java/org/apache/camel/component/johnzon/NumberPojo.java
new file mode 100644
index 0000000..2721806
--- /dev/null
+++ b/components/camel-johnzon/src/test/java/org/apache/camel/component/johnzon/NumberPojo.java
@@ -0,0 +1,134 @@
+/**
+ * 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.johnzon;
+
+import java.math.BigDecimal;
+
+public class NumberPojo {
+ private BigDecimal bg;
+ private int intNumber;
+ private long longNumber;
+ private double doubleNumber;
+ private float floatNumber;
+ private boolean bool;
+
+ public BigDecimal getBg() {
+ return bg;
+ }
+
+ public void setBg(final BigDecimal bg) {
+ this.bg = bg;
+ }
+
+ public int getIntNumber() {
+ return intNumber;
+ }
+
+ public void setIntNumber(final int intNumber) {
+ this.intNumber = intNumber;
+ }
+
+ public long getLongNumber() {
+ return longNumber;
+ }
+
+ public void setLongNumber(final long longNumber) {
+ this.longNumber = longNumber;
+ }
+
+ public double getDoubleNumber() {
+ return doubleNumber;
+ }
+
+ public void setDoubleNumber(final double doubleNumber) {
+ this.doubleNumber = doubleNumber;
+ }
+
+ public float getFloatNumber() {
+ return floatNumber;
+ }
+
+ public void setFloatNumber(final float floatNumber) {
+ this.floatNumber = floatNumber;
+ }
+
+ public boolean isBool() {
+ return bool;
+ }
+
+ public void setBool(final boolean bool) {
+ this.bool = bool;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((bg == null) ? 0 : bg.hashCode());
+ result = prime * result + (bool ? 1231 : 1237);
+ long temp;
+ temp = Double.doubleToLongBits(doubleNumber);
+ result = prime * result + (int) (temp ^ (temp >>> 32));
+ result = prime * result + Float.floatToIntBits(floatNumber);
+ result = prime * result + intNumber;
+ result = prime * result + (int) (longNumber ^ (longNumber >>> 32));
+ return result;
+ }
+
+ @Override
+ public boolean equals(final Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ final NumberPojo other = (NumberPojo) obj;
+ if (bg == null) {
+ if (other.bg != null) {
+ return false;
+ }
+ } else if (!bg.equals(other.bg)) {
+ return false;
+ }
+ if (bool != other.bool) {
+ return false;
+ }
+ if (Double.doubleToLongBits(doubleNumber) != Double.doubleToLongBits(other.doubleNumber)) {
+ return false;
+ }
+ if (Float.floatToIntBits(floatNumber) != Float.floatToIntBits(other.floatNumber)) {
+ return false;
+ }
+ if (intNumber != other.intNumber) {
+ return false;
+ }
+ if (longNumber != other.longNumber) {
+ return false;
+ }
+ return true;
+ }
+
+ @Override
+ public String toString() {
+ return "NumberPojo [bg=" + bg + ", intNumber=" + intNumber + ", longNumber=" + longNumber + ", doubleNumber="
+ + doubleNumber + ", floatNumber=" + floatNumber + ", bool=" + bool + "]";
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/8200174c/components/camel-johnzon/src/test/java/org/apache/camel/component/johnzon/SpringJohnzonJsonDataFormatTest.java
----------------------------------------------------------------------
diff --git a/components/camel-johnzon/src/test/java/org/apache/camel/component/johnzon/SpringJohnzonJsonDataFormatTest.java b/components/camel-johnzon/src/test/java/org/apache/camel/component/johnzon/SpringJohnzonJsonDataFormatTest.java
new file mode 100644
index 0000000..b96d73b
--- /dev/null
+++ b/components/camel-johnzon/src/test/java/org/apache/camel/component/johnzon/SpringJohnzonJsonDataFormatTest.java
@@ -0,0 +1,76 @@
+/**
+ * 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.johnzon;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.component.mock.MockEndpoint;
+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 SpringJohnzonJsonDataFormatTest extends CamelSpringTestSupport {
+
+ @Test
+ public void testMarshalAndUnmarshalMap() throws Exception {
+ Map<String, Object> in = new HashMap<String, Object>();
+ in.put("name", "Camel");
+
+ MockEndpoint mock = getMockEndpoint("mock:reverse");
+ mock.expectedMessageCount(1);
+ mock.message(0).body().isInstanceOf(Map.class);
+ mock.message(0).body().isEqualTo(in);
+
+ Object marshalled = template.requestBody("direct:in", in);
+ String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled);
+ assertEquals("{\"name\":\"Camel\"}", marshalledAsString);
+
+ template.sendBody("direct:back", marshalled);
+
+ mock.assertIsSatisfied();
+ }
+
+ @Test
+ public void testMarshalAndUnmarshalPojo() throws Exception {
+ TestPojo in = new TestPojo();
+ in.setName("Camel");
+
+ MockEndpoint mock = getMockEndpoint("mock:reversePojo");
+ mock.expectedMessageCount(1);
+ mock.message(0).body().isInstanceOf(TestPojo.class);
+ mock.message(0).body().isEqualTo(in);
+
+ Object marshalled = template.requestBody("direct:inPojo", in);
+ String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled);
+ assertEquals("{\"name\":\"Camel\"}", marshalledAsString);
+
+ template.sendBody("direct:backPojo", marshalled);
+
+ mock.assertIsSatisfied();
+ }
+
+ @Override
+ protected AbstractXmlApplicationContext createApplicationContext() {
+ return new ClassPathXmlApplicationContext("org/apache/camel/component/johnzon/SpringJohnzonJsonDataFormatTest.xml");
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/8200174c/components/camel-johnzon/src/test/java/org/apache/camel/component/johnzon/TestOtherPojo.java
----------------------------------------------------------------------
diff --git a/components/camel-johnzon/src/test/java/org/apache/camel/component/johnzon/TestOtherPojo.java b/components/camel-johnzon/src/test/java/org/apache/camel/component/johnzon/TestOtherPojo.java
new file mode 100644
index 0000000..3e1fa7d
--- /dev/null
+++ b/components/camel-johnzon/src/test/java/org/apache/camel/component/johnzon/TestOtherPojo.java
@@ -0,0 +1,40 @@
+/**
+ * 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.johnzon;
+
+public class TestOtherPojo {
+
+ private String name;
+ private String country;
+
+ public String getName() {
+ return this.name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getCountry() {
+ return country;
+ }
+
+ public void setCountry(String country) {
+ this.country = country;
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/8200174c/components/camel-johnzon/src/test/java/org/apache/camel/component/johnzon/TestPojo.java
----------------------------------------------------------------------
diff --git a/components/camel-johnzon/src/test/java/org/apache/camel/component/johnzon/TestPojo.java b/components/camel-johnzon/src/test/java/org/apache/camel/component/johnzon/TestPojo.java
new file mode 100644
index 0000000..bc0c6a4
--- /dev/null
+++ b/components/camel-johnzon/src/test/java/org/apache/camel/component/johnzon/TestPojo.java
@@ -0,0 +1,45 @@
+/**
+ * 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.johnzon;
+
+public class TestPojo {
+
+ private String name;
+
+ public String getName() {
+ return this.name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ return this.name.equals(((TestPojo) obj).getName());
+ }
+
+ @Override
+ public int hashCode() {
+ return name != null ? name.hashCode() : 0;
+ }
+
+ @Override
+ public String toString() {
+ return "TestPojo[" + name + "]";
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/8200174c/components/camel-johnzon/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/components/camel-johnzon/src/test/resources/log4j.properties b/components/camel-johnzon/src/test/resources/log4j.properties
new file mode 100644
index 0000000..310c447
--- /dev/null
+++ b/components/camel-johnzon/src/test/resources/log4j.properties
@@ -0,0 +1,36 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+
+#
+# The logging properties used during tests..
+#
+log4j.rootLogger=INFO, file
+
+# uncomment this to turn on debug of camel
+#log4j.logger.org.apache.camel=DEBUG
+
+# CONSOLE appender not used by default
+log4j.appender.out=org.apache.log4j.ConsoleAppender
+log4j.appender.out.layout=org.apache.log4j.PatternLayout
+log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+
+# File appender
+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-johnzon-test.log
+log4j.appender.file.append=true
http://git-wip-us.apache.org/repos/asf/camel/blob/8200174c/components/camel-johnzon/src/test/resources/org/apache/camel/component/johnzon/SpringJohnzonJsonDataFormatTest.xml
----------------------------------------------------------------------
diff --git a/components/camel-johnzon/src/test/resources/org/apache/camel/component/johnzon/SpringJohnzonJsonDataFormatTest.xml b/components/camel-johnzon/src/test/resources/org/apache/camel/component/johnzon/SpringJohnzonJsonDataFormatTest.xml
new file mode 100644
index 0000000..90e6756
--- /dev/null
+++ b/components/camel-johnzon/src/test/resources/org/apache/camel/component/johnzon/SpringJohnzonJsonDataFormatTest.xml
@@ -0,0 +1,61 @@
+<?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
+ ">
+
+ <!-- START SNIPPET: e1 -->
+ <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
+
+ <!-- we define the json johnzon data formats to be used -->
+ <dataFormats>
+ <!-- this uses the default unmarshal type that is a Map based -->
+ <json id="johnzon" library="Johnzon"/>
+ <!-- and this one uses our own TestPojo class as unmarshal type -->
+ <json id="pojo" library="Johnzon" unmarshalTypeName="org.apache.camel.component.johnzon.TestPojo"/>
+ </dataFormats>
+
+ <route>
+ <from uri="direct:in"/>
+ <marshal ref="johnzon"/>
+ </route>
+
+ <route>
+ <from uri="direct:back"/>
+ <unmarshal ref="johnzon"/>
+ <to uri="mock:reverse"/>
+ </route>
+
+ <route>
+ <from uri="direct:inPojo"/>
+ <marshal ref="pojo"/>
+ </route>
+
+ <route>
+ <from uri="direct:backPojo"/>
+ <unmarshal ref="pojo"/>
+ <to uri="mock:reversePojo"/>
+ </route>
+
+ </camelContext>
+ <!-- END SNIPPET: e1 -->
+
+</beans>
http://git-wip-us.apache.org/repos/asf/camel/blob/8200174c/components/pom.xml
----------------------------------------------------------------------
diff --git a/components/pom.xml b/components/pom.xml
index 09c56aa..41ad249 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -169,6 +169,7 @@
<module>camel-jira</module>
<module>camel-jmx</module>
<module>camel-jolt</module>
+ <module>camel-johnzon</module>
<module>camel-josql</module>
<module>camel-jpa</module>
<module>camel-jsonpath</module>
http://git-wip-us.apache.org/repos/asf/camel/blob/8200174c/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index f2fd5c0..885ddbd 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1227,6 +1227,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-johnzon</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-josql</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/8200174c/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
index 6edae6f..6ae8d39 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
@@ -303,7 +303,7 @@ public class PackageDataFormatMojo extends AbstractMojo {
private static String asModelName(String name) {
// special for some data formats
- if ("json-gson".equals(name) || "json-jackson".equals(name) || "json-xstream".equals(name)) {
+ if ("json-gson".equals(name) || "json-jackson".equals(name) || "json-xstream".equals(name) || "json-johnzon".equals(name)) {
return "json";
} else if ("bindy-csv".equals(name) || "bindy-fixed".equals(name) || "bindy-kvp".equals(name)) {
return "bindy";
@@ -324,6 +324,8 @@ public class PackageDataFormatMojo extends AbstractMojo {
return "JSon Jackson";
} else if ("json-xstream".equals(name)) {
return "JSon XStream";
+ } else if ("json-johnzon".equals(name)) {
+ return "JSon Johnzon";
} else if ("bindy-csv".equals(name)) {
return "Bindy CSV";
} else if ("bindy-fixed".equals(name)) {
[3/3] camel git commit: CAMEL-10061: Add JSON Johnzon DataFormat -
Added Karaf feature and test
Posted by ac...@apache.org.
CAMEL-10061: Add JSON Johnzon DataFormat - Added Karaf feature and test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d30d7842
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d30d7842
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d30d7842
Branch: refs/heads/master
Commit: d30d78429ca367f2dbbb64d7a31463d2312d5b67
Parents: bcd145a
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri Jun 17 09:55:23 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Jun 17 09:55:23 2016 +0200
----------------------------------------------------------------------
.../features/src/main/resources/features.xml | 7 ++++
.../camel/itest/karaf/CamelJohnzonTest.java | 34 ++++++++++++++++++++
2 files changed, 41 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d30d7842/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 3b85470..c0ef0a1 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -941,6 +941,13 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bazaarvoice-jolt/${jolt-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-jolt/${project.version}</bundle>
</feature>
+ <feature name='camel-johnzon' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
+ <bundle dependency='true'>mvn:org.apache.johnzon/johnzon-core/${johnzon-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.johnzon/johnzon-mapper/${johnzon-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-json_1.0_spec/${geronimo-json-spec-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-johnzon/${project.version}</bundle>
+ </feature>
<feature name='camel-josql' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.josql/${josql-bundle-version}</bundle>
http://git-wip-us.apache.org/repos/asf/camel/blob/d30d7842/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJohnzonTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJohnzonTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJohnzonTest.java
new file mode 100644
index 0000000..af939be
--- /dev/null
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJohnzonTest.java
@@ -0,0 +1,34 @@
+/**
+ * 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.itest.karaf;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.junit.PaxExam;
+
+@RunWith(PaxExam.class)
+public class CamelJohnzonTest extends BaseKarafTest {
+
+ public static final String COMPONENT = extractName(CamelJohnzonTest.class);
+
+ @Test
+ public void test() throws Exception {
+ testDataFormat(COMPONENT, "json-johnzon");
+ }
+
+
+}
\ No newline at end of file
[2/3] camel git commit: CAMEL-10061: Add JSON Johnzon DataFormat -
Added versions properties
Posted by ac...@apache.org.
CAMEL-10061: Add JSON Johnzon DataFormat - Added versions properties
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bcd145ac
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bcd145ac
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bcd145ac
Branch: refs/heads/master
Commit: bcd145acb3002beb0df7276e64687494c8a12c99
Parents: 8200174
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri Jun 17 09:47:56 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Jun 17 09:47:56 2016 +0200
----------------------------------------------------------------------
components/camel-johnzon/pom.xml | 17 +++++++++--------
parent/pom.xml | 2 ++
2 files changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/bcd145ac/components/camel-johnzon/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-johnzon/pom.xml b/components/camel-johnzon/pom.xml
index a15b9f6..7709e53 100644
--- a/components/camel-johnzon/pom.xml
+++ b/components/camel-johnzon/pom.xml
@@ -43,19 +43,20 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-core</artifactId>
- <version>0.9.3-incubating</version>
+ <version>${johnzon-version}</version>
</dependency>
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-mapper</artifactId>
- <version>0.9.3-incubating</version>
+ <version>${johnzon-version}</version>
</dependency>
-<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-json_1.0_spec</artifactId>
- <version>1.0-alpha-1</version>
- <scope>compile</scope> <!-- or compile if your environment doesn't provide it -->
-</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-json_1.0_spec</artifactId>
+ <version>${geronimo-json-spec-version}</version>
+ <scope>compile</scope>
+ </dependency>
+
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/bcd145ac/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 885ddbd..59adf9e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -202,6 +202,7 @@
<geronimo-jms-spec-version>1.1.1</geronimo-jms-spec-version>
<geronimo-jpa2-spec-version>1.1</geronimo-jpa2-spec-version>
<geronimo-jsp-spec-version>1.1</geronimo-jsp-spec-version>
+ <geronimo-json-spec-version>1.0-alpha-1</geronimo-json-spec-version>
<geronimo-jta-spec-version>1.1.1</geronimo-jta-spec-version>
<geronimo-servlet-spec-version>1.0</geronimo-servlet-spec-version>
<geronimo-servlet-2.5-spec-version>1.2</geronimo-servlet-2.5-spec-version>
@@ -324,6 +325,7 @@
<jolokia-version>1.3.3</jolokia-version>
<jolt-version>0.0.21</jolt-version>
<jolt-bundle-version>0.0.21_1</jolt-bundle-version>
+ <johnzon-version>0.9.3-incubating</johnzon-version>
<josql-bundle-version>1.5_5</josql-bundle-version>
<josql-version>1.5</josql-version>
<jruby-version>1.7.18</jruby-version>