You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by on...@apache.org on 2018/07/27 21:53:44 UTC
[camel] branch master updated (1a2dc4f -> 0df9a3c)
This is an automated email from the ASF dual-hosted git repository.
onders pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 1a2dc4f CAMEL-12692: Add camel-as2 to camel-parent POM
add 7b9a14d [CAMEL-12693] Upgraded camel-dozer to dozer v6.3.0
new 34191fa CAMEL-12693 - Upgraded camel-dozer to dozer v6.3.0
new 0df9a3c CAMEL-12693 - Fix CS
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../camel/component/dozer/BaseConverter.java | 2 +-
.../camel/component/dozer/DozerConfiguration.java | 2 +-
.../camel/component/dozer/DozerEndpoint.java | 6 ++++--
.../dozer/DozerBeanMapperConfiguration.java | 14 ++++++-------
.../dozer/DozerThreadContextClassLoader.java | 6 ++++--
.../camel/converter/dozer/DozerTypeConverter.java | 6 ++++--
.../converter/dozer/DozerTypeConverterLoader.java | 14 +++++++------
.../camel/converter/dozer/MapperFactory.java | 24 ++++++++++++++--------
.../converter/dozer/DozerTestArtifactsFactory.java | 3 ++-
.../converter/dozer/DozerTypeConverterDTOTest.java | 4 +++-
.../converter/dozer/DozerTypeConverterTest.java | 4 +++-
.../test/resources/application-context-map-id.xml | 2 +-
.../src/test/resources/application-context.xml | 2 +-
parent/pom.xml | 2 +-
14 files changed, 55 insertions(+), 36 deletions(-)
[camel] 01/02: CAMEL-12693 - Upgraded camel-dozer to dozer v6.3.0
Posted by on...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
onders pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 34191facaea40176faaff5d2bfc0bad8b0bcfd44
Merge: 1a2dc4f 7b9a14d
Author: onders <on...@apache.org>
AuthorDate: Sat Jul 28 00:32:21 2018 +0300
CAMEL-12693 - Upgraded camel-dozer to dozer v6.3.0
.../camel/component/dozer/BaseConverter.java | 2 +-
.../camel/component/dozer/DozerConfiguration.java | 2 +-
.../camel/component/dozer/DozerEndpoint.java | 4 ++--
.../dozer/DozerBeanMapperConfiguration.java | 14 +++++++-------
.../dozer/DozerThreadContextClassLoader.java | 4 ++--
.../camel/converter/dozer/DozerTypeConverter.java | 4 ++--
.../converter/dozer/DozerTypeConverterLoader.java | 12 ++++++------
.../camel/converter/dozer/MapperFactory.java | 22 +++++++++++++---------
.../converter/dozer/DozerTestArtifactsFactory.java | 2 +-
.../converter/dozer/DozerTypeConverterDTOTest.java | 2 +-
.../converter/dozer/DozerTypeConverterTest.java | 2 +-
.../test/resources/application-context-map-id.xml | 2 +-
.../src/test/resources/application-context.xml | 2 +-
parent/pom.xml | 2 +-
14 files changed, 40 insertions(+), 36 deletions(-)
[camel] 02/02: CAMEL-12693 - Fix CS
Posted by on...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
onders pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0df9a3c8cb6d185c508802c86472675b09446ddc
Author: onders <on...@apache.org>
AuthorDate: Sat Jul 28 00:46:01 2018 +0300
CAMEL-12693 - Fix CS
---
.../java/org/apache/camel/component/dozer/DozerEndpoint.java | 6 ++++--
.../camel/converter/dozer/DozerThreadContextClassLoader.java | 6 ++++--
.../org/apache/camel/converter/dozer/DozerTypeConverter.java | 6 ++++--
.../apache/camel/converter/dozer/DozerTypeConverterLoader.java | 10 ++++++----
.../java/org/apache/camel/converter/dozer/MapperFactory.java | 6 ++++--
.../camel/converter/dozer/DozerTestArtifactsFactory.java | 3 ++-
.../camel/converter/dozer/DozerTypeConverterDTOTest.java | 4 +++-
.../apache/camel/converter/dozer/DozerTypeConverterTest.java | 4 +++-
8 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerEndpoint.java b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerEndpoint.java
index 0ca6dcb..3c0aee3 100644
--- a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerEndpoint.java
+++ b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerEndpoint.java
@@ -21,6 +21,9 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
+import com.github.dozermapper.core.CustomConverter;
+import com.github.dozermapper.core.Mapper;
+
import org.apache.camel.Component;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
@@ -31,8 +34,7 @@ import org.apache.camel.impl.DefaultEndpoint;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.util.ResourceHelper;
-import com.github.dozermapper.core.CustomConverter;
-import com.github.dozermapper.core.Mapper;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerThreadContextClassLoader.java b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerThreadContextClassLoader.java
index 5c95911..642dec4 100644
--- a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerThreadContextClassLoader.java
+++ b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerThreadContextClassLoader.java
@@ -19,10 +19,12 @@ package org.apache.camel.converter.dozer;
import java.net.MalformedURLException;
import java.net.URL;
-import org.apache.commons.lang3.ClassUtils;
-import org.apache.commons.lang3.StringUtils;
import com.github.dozermapper.core.util.DozerClassLoader;
import com.github.dozermapper.core.util.MappingUtils;
+
+import org.apache.commons.lang3.ClassUtils;
+import org.apache.commons.lang3.StringUtils;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverter.java b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverter.java
index 63a50bb..98f5df4 100644
--- a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverter.java
+++ b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverter.java
@@ -16,13 +16,15 @@
*/
package org.apache.camel.converter.dozer;
+import com.github.dozermapper.core.Mapper;
+import com.github.dozermapper.core.metadata.ClassMappingMetadata;
+
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.TypeConversionException;
import org.apache.camel.TypeConverter;
import org.apache.camel.support.TypeConverterSupport;
-import com.github.dozermapper.core.Mapper;
-import com.github.dozermapper.core.metadata.ClassMappingMetadata;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverterLoader.java b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverterLoader.java
index 0a8fa13..40a2fe7 100644
--- a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverterLoader.java
+++ b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverterLoader.java
@@ -22,6 +22,11 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import com.github.dozermapper.core.Mapper;
+import com.github.dozermapper.core.metadata.ClassMappingMetadata;
+import com.github.dozermapper.core.metadata.MappingMetadata;
+import com.github.dozermapper.core.util.DozerClassLoader;
+
import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
import org.apache.camel.TypeConverter;
@@ -30,10 +35,7 @@ import org.apache.camel.spi.TypeConverterRegistry;
import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ResourceHelper;
-import com.github.dozermapper.core.Mapper;
-import com.github.dozermapper.core.metadata.ClassMappingMetadata;
-import com.github.dozermapper.core.metadata.MappingMetadata;
-import com.github.dozermapper.core.util.DozerClassLoader;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/MapperFactory.java b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/MapperFactory.java
index 3149654..f9f90f4 100644
--- a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/MapperFactory.java
+++ b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/MapperFactory.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.converter.dozer;
-import org.apache.camel.CamelContext;
-import org.apache.camel.component.dozer.DozerEndpoint;
import com.github.dozermapper.core.DozerBeanMapperBuilder;
import com.github.dozermapper.core.Mapper;
import com.github.dozermapper.core.config.SettingsKeys;
@@ -27,6 +25,10 @@ import com.github.dozermapper.core.el.ELExpressionFactory;
import com.github.dozermapper.core.el.NoopELEngine;
import com.github.dozermapper.core.el.TcclELEngine;
import com.github.dozermapper.core.util.RuntimeUtils;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.component.dozer.DozerEndpoint;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTestArtifactsFactory.java b/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTestArtifactsFactory.java
index 93925b3..6895770 100644
--- a/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTestArtifactsFactory.java
+++ b/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTestArtifactsFactory.java
@@ -18,12 +18,13 @@ package org.apache.camel.converter.dozer;
import java.util.Arrays;
+import com.github.dozermapper.core.Mapper;
+
import org.apache.camel.CamelContext;
import org.apache.camel.converter.dozer.dto.AddressDTO;
import org.apache.camel.converter.dozer.dto.CustomerDTO;
import org.apache.camel.converter.dozer.model.Address;
import org.apache.camel.converter.dozer.service.Customer;
-import com.github.dozermapper.core.Mapper;
public final class DozerTestArtifactsFactory {
diff --git a/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTypeConverterDTOTest.java b/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTypeConverterDTOTest.java
index db4550d..248ab4d 100644
--- a/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTypeConverterDTOTest.java
+++ b/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTypeConverterDTOTest.java
@@ -18,12 +18,14 @@ package org.apache.camel.converter.dozer;
import java.util.Arrays;
+import com.github.dozermapper.core.loader.api.BeanMappingBuilder;
+
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.dozer.dto.CustomerDTO;
import org.apache.camel.converter.dozer.model.Customer;
import org.apache.camel.test.junit4.CamelTestSupport;
-import com.github.dozermapper.core.loader.api.BeanMappingBuilder;
+
import org.junit.Test;
import static org.apache.camel.converter.dozer.DozerTestArtifactsFactory.createDtoCustomer;
diff --git a/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTypeConverterTest.java b/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTypeConverterTest.java
index 2f0b05a..434d13a 100644
--- a/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTypeConverterTest.java
+++ b/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTypeConverterTest.java
@@ -18,11 +18,13 @@ package org.apache.camel.converter.dozer;
import java.util.Arrays;
+import com.github.dozermapper.core.Mapper;
+
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.dozer.service.Customer;
import org.apache.camel.test.junit4.CamelTestSupport;
-import com.github.dozermapper.core.Mapper;
+
import org.junit.Test;
import static org.apache.camel.converter.dozer.DozerTestArtifactsFactory.createServiceCustomer;