(camel) 04/08: CAMEL-21391: Add support for in model to yaml dumper

[davsclaus]

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

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

commit 5fac209cacb8c048c08214b5e1443374262c43ef
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue Oct 29 13:25:34 2024 +0100

    CAMEL-21391: Add support for <dataFormats> in model to yaml dumper
---
 .../org/apache/camel/yaml/LwModelToYAMLDumper.java   | 20 --------------------
 .../java/org/apache/camel/yaml/io/YamlWriter.java    |  8 ++------
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git 
a/core/camel-yaml-io/src/main/java/org/apache/camel/yaml/LwModelToYAMLDumper.java
 
b/core/camel-yaml-io/src/main/java/org/apache/camel/yaml/LwModelToYAMLDumper.java
index b6069a76388..8a253e73379 100644
--- 
a/core/camel-yaml-io/src/main/java/org/apache/camel/yaml/LwModelToYAMLDumper.java
+++ 
b/core/camel-yaml-io/src/main/java/org/apache/camel/yaml/LwModelToYAMLDumper.java
@@ -450,24 +450,4 @@ public class LwModelToYAMLDumper implements 
ModelToYAMLDumper {
         }
     }
 
-    public static void main(String[] args) throws Exception {
-        StringWriter sw = new StringWriter();
-        DataFormatModelWriter w = new DataFormatModelWriter(sw);
-
-        BeanioDataFormat d = new BeanioDataFormat();
-        d.setId("df1");
-        d.setEncoding("abc");
-        d.setIgnoreUnexpectedRecords("true");
-        d.setMapping("myMapping");
-
-        CamelContext context = new DefaultCamelContext();
-        context.start();
-        w.setCamelContext(context);
-        w.start();
-        w.writeDataFormats(Map.of("myDF", d));
-        w.stop();
-
-        System.out.println(sw.toString());
-    }
-
 }
diff --git 
a/core/camel-yaml-io/src/main/java/org/apache/camel/yaml/io/YamlWriter.java 
b/core/camel-yaml-io/src/main/java/org/apache/camel/yaml/io/YamlWriter.java
index 91c83763bd6..7e7eb3121b2 100644
--- a/core/camel-yaml-io/src/main/java/org/apache/camel/yaml/io/YamlWriter.java
+++ b/core/camel-yaml-io/src/main/java/org/apache/camel/yaml/io/YamlWriter.java
@@ -61,7 +61,6 @@ public class YamlWriter extends ServiceSupport implements 
CamelContextAware {
     private final DefaultRuntimeCamelCatalog catalog;
     private final List<EipModel> roots = new ArrayList<>();
     private boolean routesIsRoot;
-    private boolean dataFormatsIsRoot;
     private final ArrayDeque<EipModel> models = new ArrayDeque<>();
     private String expression;
     private boolean uriAsParameters;
@@ -100,14 +99,11 @@ public class YamlWriter extends ServiceSupport implements 
CamelContextAware {
     }
 
     public void startElement(String name) throws IOException {
-        if ("routes".equals(name)) {
+        if ("routes".equals(name) || "dataFormats".equals(name)) {
+            // special for routes or dataFormats
             routesIsRoot = true;
             return;
         }
-        if ("dataFormats".equals(name)) {
-            dataFormatsIsRoot = true;
-            return;
-        }
 
         EipModel model = catalog.eipModel(name);
         if (model == null) {