[camel] branch master updated: Fix additional dataformat related tests

[gnodet]

This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 8d3dd89  Fix additional dataformat related tests
8d3dd89 is described below

commit 8d3dd899e2a274a1f5fe7581df28f0abc58e41ef
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Fri Apr 26 11:07:27 2019 +0200

    Fix additional dataformat related tests
---
 .../fhir/dataformat/spring/FhirDataformatConfigSpringTest.java    | 4 ++--
 .../component/jackson/SpringJacksonObjectMapperRegistryTest.java  | 3 ++-
 .../org/apache/camel/impl/transformer/DataFormatTransformer.java  | 8 ++------
 .../org/apache/camel/reifier/dataformat/DataFormatReifier.java    | 3 ---
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git 
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirDataformatConfigSpringTest.java
 
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirDataformatConfigSpringTest.java
index 0ff010d..394576c 100644
--- 
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirDataformatConfigSpringTest.java
+++ 
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirDataformatConfigSpringTest.java
@@ -24,7 +24,7 @@ import ca.uhn.fhir.context.ParserOptions;
 import ca.uhn.fhir.parser.LenientErrorHandler;
 import org.apache.camel.CamelContext;
 import org.apache.camel.component.fhir.FhirDataFormat;
-import org.apache.camel.model.dataformat.FhirDataformat;
+import org.apache.camel.reifier.dataformat.DataFormatReifier;
 import org.apache.camel.test.spring.CamelSpringTestSupport;
 import org.hl7.fhir.dstu3.model.IdType;
 import org.junit.Before;
@@ -86,7 +86,7 @@ public class FhirDataformatConfigSpringTest extends 
CamelSpringTestSupport {
 
     private FhirDataFormat getDataformat(String name) {
         CamelContext camelContext = context();
-        return (FhirDataFormat) ((FhirDataformat) 
camelContext.getRegistry().lookupByName(name)).getDataFormat();
+        return (FhirDataFormat) DataFormatReifier.getDataFormat(camelContext, 
null, name);
     }
 
     @Override
diff --git 
a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonObjectMapperRegistryTest.java
 
b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonObjectMapperRegistryTest.java
index e0bad72..bf22c7d 100644
--- 
a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonObjectMapperRegistryTest.java
+++ 
b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonObjectMapperRegistryTest.java
@@ -20,6 +20,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.reifier.dataformat.DataFormatReifier;
 import org.apache.camel.test.spring.CamelSpringTestSupport;
 import org.junit.Test;
 import org.springframework.context.support.AbstractApplicationContext;
@@ -53,7 +54,7 @@ public class SpringJacksonObjectMapperRegistryTest extends 
CamelSpringTestSuppor
         MyJsonObjectMapper mapper = (MyJsonObjectMapper) 
context.getRegistry().lookupByName("myJsonObjectMapper");
         assertNotNull(mapper);
 
-        JacksonDataFormat df = (JacksonDataFormat) 
context.getDataFormats().get("jack").getDataFormat();
+        JacksonDataFormat df = (JacksonDataFormat) 
DataFormatReifier.getDataFormat(context, null, "jack");
         assertNotNull(df);
         assertSame(mapper, df.getObjectMapper());
     }
diff --git 
a/core/camel-core/src/main/java/org/apache/camel/impl/transformer/DataFormatTransformer.java
 
b/core/camel-core/src/main/java/org/apache/camel/impl/transformer/DataFormatTransformer.java
index acde9c5..9493f47 100644
--- 
a/core/camel-core/src/main/java/org/apache/camel/impl/transformer/DataFormatTransformer.java
+++ 
b/core/camel-core/src/main/java/org/apache/camel/impl/transformer/DataFormatTransformer.java
@@ -133,13 +133,9 @@ public class DataFormatTransformer extends Transformer {
     @Override
     public void doStart() throws Exception {
         if (dataFormat == null) {
-            if (dataFormatRef != null) {
-                dataFormat = 
getCamelContext().resolveDataFormat(dataFormatRef);
-            } else if (dataFormatType != null) {
-                dataFormat = 
DataFormatReifier.reifier(dataFormatType).createDataFormat(getCamelContext());
-                getCamelContext().addService(dataFormat, false);
-            }
+            dataFormat = DataFormatReifier.getDataFormat(getCamelContext(), 
dataFormatType, dataFormatRef);
         }
+        getCamelContext().addService(dataFormat, false);
     }
 
     @Override
diff --git 
a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java
 
b/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java
index bd0cba3..93ffa52 100644
--- 
a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java
+++ 
b/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java
@@ -157,9 +157,6 @@ public abstract class DataFormatReifier<T extends 
DataFormatDefinition> {
                 return dataFormat;
             }
         }
-        if (type.getDataFormat() != null) {
-            return type.getDataFormat();
-        }
         return reifier(type).createDataFormat(camelContext);
     }