[camel] branch main updated: CAMEL-19837: let the converter decide the appropriate datatype for conversion (#11305)

[orpiske]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 1d2f5b6d4c1 CAMEL-19837: let the converter decide the appropriate 
datatype for conversion (#11305)
1d2f5b6d4c1 is described below

commit 1d2f5b6d4c19099e33b82cf8458712125fbb65e7
Author: Otavio Rodolfo Piske <orpi...@users.noreply.github.com>
AuthorDate: Wed Sep 6 10:01:50 2023 +0200

    CAMEL-19837: let the converter decide the appropriate datatype for 
conversion (#11305)
---
 .../camel/component/flatpack/FlatpackConverterLoader.java  |  2 --
 .../apache/camel/component/flatpack/FlatpackConverter.java | 14 ++++++--------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git 
a/components/camel-flatpack/src/generated/java/org/apache/camel/component/flatpack/FlatpackConverterLoader.java
 
b/components/camel-flatpack/src/generated/java/org/apache/camel/component/flatpack/FlatpackConverterLoader.java
index 82c920463e1..dbec24c25bc 100644
--- 
a/components/camel-flatpack/src/generated/java/org/apache/camel/component/flatpack/FlatpackConverterLoader.java
+++ 
b/components/camel-flatpack/src/generated/java/org/apache/camel/component/flatpack/FlatpackConverterLoader.java
@@ -45,8 +45,6 @@ public final class FlatpackConverterLoader implements 
TypeConverterLoader, Camel
             (type, exchange, value) -> 
org.apache.camel.component.flatpack.FlatpackConverter.toString((net.sf.flatpack.DataSet)
 value));
         addTypeConverter(registry, java.util.List.class, 
net.sf.flatpack.DataSet.class, false,
             (type, exchange, value) -> 
org.apache.camel.component.flatpack.FlatpackConverter.toList((net.sf.flatpack.DataSet)
 value));
-        addTypeConverter(registry, java.util.Map.class, 
net.sf.flatpack.DataSet.class, false,
-            (type, exchange, value) -> 
org.apache.camel.component.flatpack.FlatpackConverter.toMap((net.sf.flatpack.DataSet)
 value));
         addTypeConverter(registry, java.util.Map.class, 
net.sf.flatpack.Record.class, false,
             (type, exchange, value) -> 
org.apache.camel.component.flatpack.FlatpackConverter.toMap((net.sf.flatpack.Record)
 value));
         addTypeConverter(registry, org.w3c.dom.Document.class, 
net.sf.flatpack.DataSet.class, false,
diff --git 
a/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackConverter.java
 
b/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackConverter.java
index 30409ce029c..12ff3c4b7d9 100644
--- 
a/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackConverter.java
+++ 
b/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackConverter.java
@@ -39,17 +39,15 @@ public final class FlatpackConverter {
         // helper class
     }
 
-    @Converter
-    public static Map<String, Object> toMap(DataSet dataSet) {
-        Map<String, Object> map = new HashMap<>();
-        putValues(map, dataSet);
-        return map;
-    }
-
     @Converter
     public static Map<String, Object> toMap(Record record) {
         Map<String, Object> map = new HashMap<>();
-        putValues(map, record);
+        if (record instanceof DataSet dataSet) {
+            putValues(map, dataSet);
+        } else {
+            putValues(map, record);
+        }
+
         return map;
     }