[camel] branch main updated: CAMEL-16545: camel-core - ModelDumper to XML output is with doubling empty lines

[davsclaus]

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

davsclaus 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 065d17a  CAMEL-16545: camel-core - ModelDumper to XML output is with 
doubling empty lines
065d17a is described below

commit 065d17a61f493049df48ce34824f58a75fa600c9
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Apr 22 15:55:06 2021 +0200

    CAMEL-16545: camel-core - ModelDumper to XML output is with doubling empty 
lines
---
 .../camel/util/DumpModelAsXmlChoiceFilterRouteTest.java   | 15 +++++++++++++++
 .../org/apache/camel/xml/jaxb/JaxbModelToXMLDumper.java   |  4 +---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git 
a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlChoiceFilterRouteTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlChoiceFilterRouteTest.java
index 1dbc4e5..738f810 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlChoiceFilterRouteTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlChoiceFilterRouteTest.java
@@ -21,6 +21,7 @@ import org.apache.camel.ExtendedCamelContext;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -30,6 +31,20 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 public class DumpModelAsXmlChoiceFilterRouteTest extends ContextTestSupport {
 
     @Test
+    public void testDumpModelAsXmlNoEmptyLines() throws Exception {
+        ExtendedCamelContext ecc = context.adapt(ExtendedCamelContext.class);
+        String xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, 
context.getRouteDefinition("myRoute"));
+        assertNotNull(xml);
+        log.info(xml);
+
+        // should not contain empty lines
+        for (String line : xml.split("\n")) {
+            line = line.trim();
+            assertFalse(line.isEmpty(), "Should not contain empty lines");
+        }
+    }
+
+    @Test
     public void testDumpModelAsXml() throws Exception {
         ExtendedCamelContext ecc = context.adapt(ExtendedCamelContext.class);
         String xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, 
context.getRouteDefinition("myRoute"));
diff --git 
a/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbModelToXMLDumper.java
 
b/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbModelToXMLDumper.java
index cadcddf..e99c236 100644
--- 
a/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbModelToXMLDumper.java
+++ 
b/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbModelToXMLDumper.java
@@ -104,7 +104,6 @@ public class JaxbModelToXMLDumper implements 
ModelToXMLDumper {
         Element documentElement = dom.getDocumentElement();
         for (Map.Entry<String, String> entry : namespaces.entrySet()) {
             String nsPrefix = entry.getKey();
-
             String prefix = nsPrefix.equals("xmlns") ? nsPrefix : "xmlns:" + 
nsPrefix;
             documentElement.setAttribute(prefix, entry.getValue());
         }
@@ -112,8 +111,7 @@ public class JaxbModelToXMLDumper implements 
ModelToXMLDumper {
         // We invoke the type converter directly because we need to pass some
         // custom XML output options
         Properties outputProperties = new Properties();
-        outputProperties.put(OutputKeys.INDENT, "yes");
-        outputProperties.put(OutputKeys.STANDALONE, "yes");
+        outputProperties.put(OutputKeys.OMIT_XML_DECLARATION, "yes");
         outputProperties.put(OutputKeys.ENCODING, "UTF-8");
         try {
             return xmlConverter.toStringFromDocument(dom, outputProperties);