[camel] branch camel-3.7.x updated: CAMEL-16045: rest-dsl - xml or json binding should create new instance of data formats

[da...@apache.org]

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

davsclaus pushed a commit to branch camel-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/camel-3.7.x by this push:
     new a4221cd  CAMEL-16045: rest-dsl - xml or json binding should create new instance of data formats
a4221cd is described below

commit a4221cd159b0735c89f833f10b95fe88644e2382
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Jan 15 15:59:15 2021 +0100

    CAMEL-16045: rest-dsl - xml or json binding should create new instance of data formats
---
 core/camel-api/src/main/java/org/apache/camel/CamelContext.java   | 6 +++---
 .../java/org/apache/camel/reifier/rest/RestBindingReifier.java    | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/camel-api/src/main/java/org/apache/camel/CamelContext.java b/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
index 29904d4..854ab6a 100644
--- a/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
+++ b/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
@@ -863,7 +863,7 @@ public interface CamelContext extends CamelContextLifecycle, RuntimeConfiguratio
     ConsumerTemplate createConsumerTemplate(int maximumCacheSize);
 
     /**
-     * Resolve a data format given its name
+     * Resolve an existing data format, or creates a new by the given its name
      *
      * @param  name the data format name or a reference to it in the {@link Registry}
      * @return      the resolved data format, or <tt>null</tt> if not found
@@ -871,10 +871,10 @@ public interface CamelContext extends CamelContextLifecycle, RuntimeConfiguratio
     DataFormat resolveDataFormat(String name);
 
     /**
-     * Creates the given data format given its name.
+     * Creates a new instance of the given data format given its name.
      *
      * @param  name the data format name or a reference to a data format factory in the {@link Registry}
-     * @return      the resolved data format, or <tt>null</tt> if not found
+     * @return      the created data format, or <tt>null</tt> if not found
      */
     DataFormat createDataFormat(String name);
 
diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/rest/RestBindingReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/rest/RestBindingReifier.java
index 06d4595..6b47d4f 100644
--- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/rest/RestBindingReifier.java
+++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/rest/RestBindingReifier.java
@@ -90,8 +90,8 @@ public class RestBindingReifier extends AbstractReifier {
             }
             // this will create a new instance as the name was not already
             // pre-created
-            json = camelContext.resolveDataFormat(name);
-            outJson = camelContext.resolveDataFormat(name);
+            json = camelContext.createDataFormat(name);
+            outJson = camelContext.createDataFormat(name);
 
             if (json != null) {
                 setupJson(
@@ -119,8 +119,8 @@ public class RestBindingReifier extends AbstractReifier {
             }
             // this will create a new instance as the name was not already
             // pre-created
-            jaxb = camelContext.resolveDataFormat(name);
-            outJaxb = camelContext.resolveDataFormat(name);
+            jaxb = camelContext.createDataFormat(name);
+            outJaxb = camelContext.createDataFormat(name);
 
             // is xml binding required?
             if (mode.contains("xml") && jaxb == null) {