You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2020/03/06 13:51:19 UTC
[camel] 01/07: Improve a bit the error message when a custom
dataformat is not specified, see CAMEL-14656
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
commit ec41b8a9b770802b54c16af4e1161e401591f294
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Wed Mar 4 23:51:24 2020 +0100
Improve a bit the error message when a custom dataformat is not specified, see CAMEL-14656
---
.../fhir/dataformat/spring/FhirDataformatConfigSpringTest.java | 2 +-
.../component/jackson/SpringJacksonObjectMapperRegistryTest.java | 2 +-
.../src/main/java/org/apache/camel/reifier/MarshalReifier.java | 2 +-
.../src/main/java/org/apache/camel/reifier/UnmarshalReifier.java | 2 +-
.../apache/camel/reifier/dataformat/CustomDataFormatReifier.java | 2 +-
.../org/apache/camel/reifier/dataformat/DataFormatReifier.java | 8 ++++++++
6 files changed, 13 insertions(+), 5 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 ef2fb23..ee45ce6 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
@@ -83,7 +83,7 @@ public class FhirDataformatConfigSpringTest extends CamelSpringTestSupport {
private FhirDataFormat getDataformat(String name) {
CamelContext camelContext = context();
- return (FhirDataFormat) DataFormatReifier.getDataFormat(camelContext, null, name);
+ return (FhirDataFormat) DataFormatReifier.getDataFormat(camelContext, 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 62dd876..0e45248 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
@@ -54,7 +54,7 @@ public class SpringJacksonObjectMapperRegistryTest extends CamelSpringTestSuppor
MyJsonObjectMapper mapper = (MyJsonObjectMapper)context.getRegistry().lookupByName("myJsonObjectMapper");
assertNotNull(mapper);
- JacksonDataFormat df = (JacksonDataFormat)DataFormatReifier.getDataFormat(context, null, "jack");
+ JacksonDataFormat df = (JacksonDataFormat)DataFormatReifier.getDataFormat(context, "jack");
assertNotNull(df);
assertSame(mapper, df.getObjectMapper());
}
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/MarshalReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/MarshalReifier.java
index 367137b..dc79f71 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/MarshalReifier.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/MarshalReifier.java
@@ -32,7 +32,7 @@ public class MarshalReifier extends ProcessorReifier<MarshalDefinition> {
@Override
public Processor createProcessor() {
- DataFormat dataFormat = DataFormatReifier.getDataFormat(camelContext, definition.getDataFormatType(), null);
+ DataFormat dataFormat = DataFormatReifier.getDataFormat(camelContext, definition.getDataFormatType());
return new MarshalProcessor(dataFormat);
}
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/UnmarshalReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/UnmarshalReifier.java
index cb678ca..cb41528 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/UnmarshalReifier.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/UnmarshalReifier.java
@@ -32,7 +32,7 @@ public class UnmarshalReifier extends ProcessorReifier<UnmarshalDefinition> {
@Override
public Processor createProcessor() {
- DataFormat dataFormat = DataFormatReifier.getDataFormat(camelContext, definition.getDataFormatType(), null);
+ DataFormat dataFormat = DataFormatReifier.getDataFormat(camelContext, definition.getDataFormatType());
return new UnmarshalProcessor(dataFormat);
}
}
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/CustomDataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/CustomDataFormatReifier.java
index 9ecbdb9..32776e1 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/CustomDataFormatReifier.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/CustomDataFormatReifier.java
@@ -31,7 +31,7 @@ public class CustomDataFormatReifier extends DataFormatReifier<CustomDataFormat>
@Override
protected DataFormat doCreateDataFormat() {
- return DataFormatReifier.getDataFormat(camelContext, null, definition.getRef());
+ return DataFormatReifier.getDataFormat(camelContext, definition.getRef());
}
@Override
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java
index 02fb328..85a1521 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java
@@ -150,6 +150,14 @@ public abstract class DataFormatReifier<T extends DataFormatDefinition> extends
DATAFORMATS.clear();
}
+ public static DataFormat getDataFormat(CamelContext camelContext, DataFormatDefinition type) {
+ return getDataFormat(camelContext, ObjectHelper.notNull(type, "type"), null);
+ }
+
+ public static DataFormat getDataFormat(CamelContext camelContext, String ref) {
+ return getDataFormat(camelContext, null, ObjectHelper.notNull(ref, "ref"));
+ }
+
/**
* Factory method to create the data format
*